- Remove NTSYSAPI/NTSYSCALLAPI definitions from NDK, they are already in winnt.h...
authorAlex Ionescu <aionescu@gmail.com>
Wed, 30 Nov 2005 07:36:08 +0000 (07:36 +0000)
committerAlex Ionescu <aionescu@gmail.com>
Wed, 30 Nov 2005 07:36:08 +0000 (07:36 +0000)
- Add the generic RTL definitions to rtl.xml instead of the rtl.h
- Don't define min again, it's already in the SDK headers.

svn path=/trunk/; revision=19771

reactos/include/ndk/umtypes.h
reactos/lib/rtl/qsort.c
reactos/lib/rtl/rtl.h
reactos/lib/rtl/rtl.xml
reactos/w32api/include/winnt.h

index b479bc5..35e22c0 100644 (file)
@@ -48,18 +48,6 @@ Author:
 #define NTAPI_INLINE
 #endif
 
-#if !defined(_NTSYSTEM_)
-#define NTSYSAPI                DECLSPEC_IMPORT
-#define NTSYSCALLAPI            DECLSPEC_IMPORT
-#else
-#define NTSYSAPI
-#if defined(_NTDLLBUILD_)
-#define NTSYSCALLAPI
-#else
-#define NTSYSCALLAPI            DECLSPEC_ADDRSAFE
-#endif
-#endif
-
 //
 // Alignment Macros
 //
index cfbbb91..5bdddfc 100644 (file)
@@ -43,8 +43,6 @@
 
 typedef int (*         _pfunccmp_t) (const void *, const void *);
 
-#define min(a,b) ((a)<(b)?(a):(b))
-
 /*
  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
  */
index 78b9390..1d991f4 100644 (file)
@@ -8,13 +8,9 @@
 
 /* INCLUDES ******************************************************************/
 
-/* We're a core NT DLL, we don't import syscalls */
-#define _NTSYSTEM_
-#define _NTDLLBUILD_
+/* Definitions */
 #define WIN32_NO_STATUS
 #define _INC_SWPRINTF_INL_
-#define _CRT_SECURE_NO_DEPRECATE
-#define NO_RTL_INLINES
 
 /* C Headers */
 #include <stdio.h>
index 50ecc6a..afd3c18 100644 (file)
@@ -2,6 +2,10 @@
        <define name="__USE_W32API" />
        <define name="_NTOSKRNL_" />
        <define name="__NO_CTYPE_INLINES" />
+       <define name="NO_RTL_INLINES" />
+       <define name="_CRTIMP=" />
+       <define name="_NTDLLBUILD_" />
+       <define name="_NTSYSTEM_" />
        <include base="rtl">.</include>
        <if property="ARCH" value="i386">
                <directory name="i386">
index 249ba72..32ff434 100644 (file)
@@ -65,6 +65,18 @@ extern "C" {
 #endif
 #endif
 
+#if !defined(_NTSYSTEM_)
+#define NTSYSAPI     DECLSPEC_IMPORT
+#define NTSYSCALLAPI DECLSPEC_IMPORT
+#else
+#define NTSYSAPI
+#if defined(_NTDLLBUILD_)
+#define NTSYSCALLAPI
+#else
+#define NTSYSCALLAPI DECLSPEC_ADDRSAFE
+#endif
+#endif
+
 #ifndef VOID
 #define VOID void
 #endif