Author: tkreuzer
Date: Sun Jan 13 15:02:38 2013
New Revision: 58165
URL: http://svn.reactos.org/svn/reactos?rev=58165&view=rev
Log:
[NDK] Revert accidental changes.
Modified:
trunk/reactos/include/ndk/lgpl.txt
trunk/reactos/include/ndk/ndk.txt
trunk/reactos/include/ndk/readme.txt
Modified: trunk/reactos/include/ndk/lgpl.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lgpl.txt?rev=58165&r1=58164&r2=58165&view=diff
==============================================================================
--- trunk/reactos/include/ndk/lgpl.txt [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/lgpl.txt [iso-8859-1] Sun Jan 13 15:02:38 2013
@@ -436,7 +436,7 @@
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED _In_ WRITING THE COPYRIGHT HOLDERS AND/OR
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -444,11 +444,11 @@
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- 16. _In_ NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING _Out_ OF THE USE OR INABILITY TO USE THE
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
@@ -499,4 +499,4 @@
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
-That's all there is to it!
+That's all there is to it!
Modified: trunk/reactos/include/ndk/ndk.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ndk.txt?rev=58165&r1=58164&r2=58165&view=diff
==============================================================================
--- trunk/reactos/include/ndk/ndk.txt [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/ndk.txt [iso-8859-1] Sun Jan 13 15:02:38 2013
@@ -14,16 +14,16 @@
THIS SOFTWARE IS PROVIDED BY ALEX IONESCU ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. _In_ NO EVENT SHALL ALEX IONESCU OR THE NDK CONTRIBUTORS
+ARE DISCLAIMED. IN NO EVENT SHALL ALEX IONESCU OR THE NDK CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER _In_ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING _In_ ANY WAY _Out_ OF THE USE OF THIS SOFTWARE,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation
are those of the authors and should not be interpreted as representing
official policies, either expressed or implied, of Alex Ionescu or
-the NDK Project Contributors.
+the NDK Project Contributors.
Modified: trunk/reactos/include/ndk/readme.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/readme.txt?rev=58165&r1=58164&r2=58165&view=diff
==============================================================================
--- trunk/reactos/include/ndk/readme.txt [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/readme.txt [iso-8859-1] Sun Jan 13 15:02:38 2013
@@ -42,7 +42,7 @@
You MUST read GPL.TXT or LGPL.TXT after your decision. Violating your chosen
license
voids your usage rights of the NDK and will lead to legal action on the part
of the
author. Using this software with any later version of the GNU GPL or LGPL in
no way
-changes your obligations under the versions listed above. You MUST still
release the
+changes your obligations under the versions listed above. You MUST still
release the
NDK and its changes under the terms of the original licenses (either GPLv2 or
LGPLv2.1)
as listed above. This DOES NOT AFFECT the license of a software package
released under
a later version and ONLY serves to clarify that using the NDK with a later
version is
@@ -152,36 +152,36 @@
3.1 ORGANIZATION
- * The NDK is organized in a main folder (include/ndk) with arch-specific
subfolders (ex: include/ndk/i386).
- * The NDK is structured by NT Subsystem Component (ex: ex, ps, rtl, etc).
+ * The NDK is organized in a main folder (include/ndk) with arch-specific
subfolders (ex: include/ndk/i386).
+ * The NDK is structured by NT Subsystem Component (ex: ex, ps, rtl, etc).
* The NDK can either be included on-demand (#include <ndk/xxxxx.h>) or
globally (#include <ndk/ntndk.h>).
- The former is recommended to reduce compile time.
+ The former is recommended to reduce compile time.
* The NDK is structured by function and type. Every Subsystem Component has
an associated "xxfuncs.h" and
- "xxtypes.h" header, where "xx" is the Subsystem (ex: iofuncs.h, iotypes.h)
+ "xxtypes.h" header, where "xx" is the Subsystem (ex: iofuncs.h, iotypes.h)
* The NDK has a special file called "umtypes.h" which exports to User-Mode
or Native-Mode Applications the
basic NT types which are present in ntdef.h. This file cannot be included
since it would conflict with
winnt.h and/or windef.h. Thus, umtypes.h provides the missing types. This
file is automatically included
- in a User-Mode NDK project.
+ in a User-Mode NDK project.
* The NDK also includes a file called "umfuncs.h" which exports to
User-Mode or Native-Mode Applications
- undocumented functions which can only be accessed from ntdll.dll.
+ undocumented functions which can only be accessed from ntdll.dll.
* The NDK has another special file called "ifssupp.h", which exports to
Kernel-Mode drivers a few types which
are only documented in the IFS kit, and are part of some native
definitions. It will be deprecated next year
- with the release of the WDK.
-
-3.2 USING _In_ YOUR PROJECT
-
- * User Mode Application requiring Native Types:
+ with the release of the WDK.
+
+3.2 USING IN YOUR PROJECT
+
+ * User Mode Application requiring Native Types:
#define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s
from NDK */
#include "windows.h" /* Declare Windows Headers like you normally
would */
#include "ntndk.h" /* Declare the NDK Headers */
- * Native Mode Application:
+ * Native Mode Application:
#include "windows.h" /* Declare Windows Headers for basic types.
NEEDED UNTIL NDK 1.5 */
#include "ntndk.h" /* Declare the NDK Headers */
- * Kernel Mode Driver:
+ * Kernel Mode Driver:
#include "ntddk.h" /* Declare DDK Headers like you normally would
*/
#include "ntndk.h" /* Declare the NDK Headers */
