From ae0da1c1860f45f0ef324ca1949c08bb6102c5a2 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 30 Nov 2005 07:36:08 +0000
Subject: [PATCH] - Remove NTSYSAPI/NTSYSCALLAPI definitions from NDK, they are
 already in winnt.h (add them to w32api). - 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  | 12 ------------
 reactos/lib/rtl/qsort.c        |  2 --
 reactos/lib/rtl/rtl.h          |  6 +-----
 reactos/lib/rtl/rtl.xml        |  4 ++++
 reactos/w32api/include/winnt.h | 12 ++++++++++++
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h
index b479bc51ada..35e22c00ff8 100644
--- a/reactos/include/ndk/umtypes.h
+++ b/reactos/include/ndk/umtypes.h
@@ -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
 //
diff --git a/reactos/lib/rtl/qsort.c b/reactos/lib/rtl/qsort.c
index cfbbb91b0d2..5bdddfc1c8e 100644
--- a/reactos/lib/rtl/qsort.c
+++ b/reactos/lib/rtl/qsort.c
@@ -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".
  */
diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h
index 78b9390f06d..1d991f45bf9 100644
--- a/reactos/lib/rtl/rtl.h
+++ b/reactos/lib/rtl/rtl.h
@@ -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>
diff --git a/reactos/lib/rtl/rtl.xml b/reactos/lib/rtl/rtl.xml
index 50ecc6a6c52..afd3c183b3d 100644
--- a/reactos/lib/rtl/rtl.xml
+++ b/reactos/lib/rtl/rtl.xml
@@ -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">
diff --git a/reactos/w32api/include/winnt.h b/reactos/w32api/include/winnt.h
index 249ba72895b..32ff4349766 100644
--- a/reactos/w32api/include/winnt.h
+++ b/reactos/w32api/include/winnt.h
@@ -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