Merging r37048, r37051, r37052, r37055 from the-real-msvc branch

[reactos.git] / reactos / lib / rtl / rtl.h

diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h
index 0c4e4a3..81d8268 100644 (file)
--- a/reactos/lib/rtl/rtl.h
+++ b/reactos/lib/rtl/rtl.h
@@ -8,42 +8,31 @@
 
 /* INCLUDES ******************************************************************/
 
+#ifndef RTL_H
+#define RTL_H
+
 /* We're a core NT DLL, we don't import syscalls */
-#define _NTSYSTEM_
-#define _NTDLLBUILD_
+#define WIN32_NO_STATUS
+#define _INC_SWPRINTF_INL_
+#undef __MSVCRT__
 
 /* C Headers */
+#include <stdlib.h>
 #include <stdio.h>
 
 /* PSDK/NDK Headers */
 #include <windows.h>
-#define NTOS_MODE_USER
 #include <ndk/ntndk.h>
 
-/* Helper Header */
+/* Internal RTL header */
+#include "rtlp.h"
+
+/* PSEH Support */
 #include <reactos/helper.h>
+#include <pseh/pseh.h>
+
+#include <intrin.h>
 
-/* FIXME: Move this somewhere else, maybe */
-#ifdef DBG
-extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line);
-#define PAGED_CODE_RTL() CHECK_PAGED_CODE_RTL(__FILE__, __LINE__)
-#else
-#define PAGED_CODE_RTL()
-#endif
-
-PVOID STDCALL RtlpAllocateMemory(UINT Bytes, ULONG Tag);
-VOID STDCALL RtlpFreeMemory(PVOID Mem, ULONG Tag);
-KPROCESSOR_MODE STDCALL RtlpGetMode();
-NTSTATUS STDCALL RtlDeleteHeapLock(PRTL_CRITICAL_SECTION CriticalSection);
-NTSTATUS STDCALL RtlEnterHeapLock(PRTL_CRITICAL_SECTION CriticalSection);
-NTSTATUS STDCALL RtlInitializeHeapLock(PRTL_CRITICAL_SECTION CriticalSection);
-NTSTATUS STDCALL RtlLeaveHeapLock(PRTL_CRITICAL_SECTION CriticalSection);
-
-#define RtlpAllocateStringMemory RtlpAllocateMemory
-#define RtlpFreeStringMemory RtlpFreeMemory
-
-#define TAG_USTR        TAG('U', 'S', 'T', 'R')
-#define TAG_ASTR        TAG('A', 'S', 'T', 'R')
-#define TAG_OSTR        TAG('O', 'S', 'T', 'R')
+#endif /* RTL_H */
 
 /* EOF */