[ros-diffs] [reactos] 03/05: [SDK:RTL] Don't copy-paste rtl.h into rtl_vista.h; just include it instead.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab827f522568f84964544…

commit ab827f522568f8496454462936c2024cb160db3c
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Mon Mar 21 21:07:38 2022 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Fri Mar 25 18:54:20 2022 +0100

    [SDK:RTL] Don't copy-paste rtl.h into rtl_vista.h; just include it instead.
---
 sdk/lib/rtl/rtl_vista.h | 46 ++--------------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/sdk/lib/rtl/rtl_vista.h b/sdk/lib/rtl/rtl_vista.h
index ef887b77681..af14ef4fcb6 100644
--- a/sdk/lib/rtl/rtl_vista.h
+++ b/sdk/lib/rtl/rtl_vista.h
@@ -14,49 +14,7 @@
 #define _WIN32_WINNT 0x600
 #define WINVER 0x600
 
-/* We're a core NT DLL, we don't import syscalls */
-#define _INC_SWPRINTF_INL_
-#undef __MSVCRT__
-
-/* C Headers */
-#include <stdlib.h>
-#include <stdio.h>
-
-/* PSDK/NDK Headers */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-#define COBJMACROS
-#define CONST_VTABLE
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <objbase.h>
-#include <ntintsafe.h>
-#include <ndk/exfuncs.h>
-#include <ndk/iofuncs.h>
-#include <ndk/kefuncs.h>
-#include <ndk/ldrfuncs.h>
-#include <ndk/mmfuncs.h>
-#include <ndk/obfuncs.h>
-#include <ndk/psfuncs.h>
-#include <ndk/rtlfuncs.h>
-#include <ndk/setypes.h>
-#include <ndk/sefuncs.h>
-#include <ndk/umfuncs.h>
-
-/* SEH support with PSEH */
-#include <pseh/pseh2.h>
-
-/* Use intrinsics for x86 and x64 */
-#if defined(_M_IX86) || defined(_M_AMD64)
-#define InterlockedCompareExchange _InterlockedCompareExchange
-#define InterlockedIncrement _InterlockedIncrement
-#define InterlockedDecrement _InterlockedDecrement
-#define InterlockedExchangeAdd _InterlockedExchangeAdd
-#define InterlockedExchange _InterlockedExchange
-#define InterlockedBitTestAndSet _interlockedbittestandset
-#define InterlockedBitTestAndSet64 _interlockedbittestandset64
-#endif
+/* Main RTL Header */
+#include "rtl.h"
 
 #endif /* RTL_VISTA_H */