From d4e71ef096e11f4e32de29da4c3fe6b9113fc82a Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 17 Jun 2005 07:57:37 +0000
Subject: [PATCH] Use W32API.

svn path=/trunk/; revision=15948
---
 reactos/lib/rtl/luid.c    | 1 +
 reactos/lib/rtl/mem.c     | 5 ++++-
 reactos/lib/rtl/rtl.h     | 2 ++
 reactos/lib/rtl/rtl.xml   | 2 ++
 reactos/lib/rtl/unicode.c | 4 ++--
 reactos/lib/rtl/version.c | 2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/rtl/luid.c b/reactos/lib/rtl/luid.c
index 79ff3e0854e..ced7aac2798 100644
--- a/reactos/lib/rtl/luid.c
+++ b/reactos/lib/rtl/luid.c
@@ -50,6 +50,7 @@ RtlCopyLuidAndAttributesArray(ULONG Count,
 }
 
 
+#undef RtlEqualLuid
 /*
  * @implemented
  */
diff --git a/reactos/lib/rtl/mem.c b/reactos/lib/rtl/mem.c
index c00824b6020..315e392fd7b 100644
--- a/reactos/lib/rtl/mem.c
+++ b/reactos/lib/rtl/mem.c
@@ -84,6 +84,7 @@ RtlCompareMemoryUlong (
 }
 
 
+#undef RtlFillMemory
 /*
  * @implemented
  */
@@ -123,7 +124,7 @@ RtlFillMemoryUlong (
 }
 
 
-
+#undef RtlMoveMemory
 /*
  * @implemented
  */
@@ -155,6 +156,8 @@ RtlPrefetchMemoryNonTemporal(
 	UNIMPLEMENTED;
 }
 
+
+#undef RtlZeroMemory
 /*
  * @implemented
  */
diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h
index 2abc9fd51a0..1b4258ea4ac 100644
--- a/reactos/lib/rtl/rtl.h
+++ b/reactos/lib/rtl/rtl.h
@@ -9,6 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <ddk/ntddk.h>
+#include <ddk/ntifs.h>
 #include <windows.h>
 #include <ntdll/rtl.h>
 #include <napi/teb.h>
@@ -20,6 +21,7 @@
 #include <ntdll/rtl.h>
 #include <rosrtl/thread.h>
 #include <winerror.h>
+#include <ntos.h>
 #include <stdio.h>
 
 #define ROUNDUP(a,b)    ((((a)+(b)-1)/(b))*(b))
diff --git a/reactos/lib/rtl/rtl.xml b/reactos/lib/rtl/rtl.xml
index 0e0082fcab9..4dfffa7dd91 100644
--- a/reactos/lib/rtl/rtl.xml
+++ b/reactos/lib/rtl/rtl.xml
@@ -1,4 +1,6 @@
 <module name="rtl" type="staticlibrary">
+	<define name="__USE_W32API" />
+	<define name="_NTOSKRNL_" />
 	<include base="rtl">.</include>
 	<directory name="i386">
 		<file>allshl.s</file>
diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c
index 79aa1d8af9c..699f64ff19b 100644
--- a/reactos/lib/rtl/unicode.c
+++ b/reactos/lib/rtl/unicode.c
@@ -341,8 +341,8 @@ RtlEqualString(
 BOOLEAN
 STDCALL
 RtlEqualUnicodeString(
-   IN PUNICODE_STRING String1,
-   IN PUNICODE_STRING String2,
+   IN CONST UNICODE_STRING *String1,
+   IN CONST UNICODE_STRING *String2,
    IN BOOLEAN  CaseInsensitive)
 {
    ULONG i;
diff --git a/reactos/lib/rtl/version.c b/reactos/lib/rtl/version.c
index 4ce738fd5dc..a2e4e999342 100644
--- a/reactos/lib/rtl/version.c
+++ b/reactos/lib/rtl/version.c
@@ -29,7 +29,7 @@
  */
 
 /* INCLUDES *****************************************************************/
-#define __USE_W32API
+
 #include "rtl.h"
 
 #define NDEBUG