From bdbf7cd306f8565750e995094c20d84d6e5028a8 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 20 Jan 2014 12:59:27 +0000 Subject: [PATCH] [NTDLL] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 svn path=/trunk/; revision=61728 --- reactos/dll/ntdll/csr/api.c | 1 + reactos/dll/ntdll/csr/capture.c | 1 + reactos/dll/ntdll/csr/connect.c | 4 ++++ reactos/dll/ntdll/dbg/dbgui.c | 3 +++ reactos/dll/ntdll/dispatch/dispatch.c | 1 + reactos/dll/ntdll/include/ntdll.h | 5 ----- reactos/dll/ntdll/include/ntdllp.h | 2 +- reactos/dll/ntdll/ldr/ldrapi.c | 1 + reactos/dll/ntdll/ldr/ldrinit.c | 2 ++ reactos/dll/ntdll/ldr/ldrpe.c | 1 + reactos/dll/ntdll/ldr/ldrutils.c | 1 + reactos/dll/ntdll/rtl/libsupp.c | 1 + reactos/dll/ntdll/rtl/version.c | 1 + 13 files changed, 18 insertions(+), 6 deletions(-) diff --git a/reactos/dll/ntdll/csr/api.c b/reactos/dll/ntdll/csr/api.c index 4e3556c9071..fd0687e3b7f 100644 --- a/reactos/dll/ntdll/csr/api.c +++ b/reactos/dll/ntdll/csr/api.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/dll/ntdll/csr/capture.c b/reactos/dll/ntdll/csr/capture.c index 1ab781d8990..d22644b5992 100644 --- a/reactos/dll/ntdll/csr/capture.c +++ b/reactos/dll/ntdll/csr/capture.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/dll/ntdll/csr/connect.c b/reactos/dll/ntdll/csr/connect.c index c2d2ac8f969..cef68d9a60c 100644 --- a/reactos/dll/ntdll/csr/connect.c +++ b/reactos/dll/ntdll/csr/connect.c @@ -9,6 +9,10 @@ /* INCLUDES *******************************************************************/ #include + +#include +#include + #define NDEBUG #include diff --git a/reactos/dll/ntdll/dbg/dbgui.c b/reactos/dll/ntdll/dbg/dbgui.c index b65e06c5d70..e745374eb6a 100644 --- a/reactos/dll/ntdll/dbg/dbgui.c +++ b/reactos/dll/ntdll/dbg/dbgui.c @@ -9,6 +9,9 @@ /* INCLUDES *****************************************************************/ #include + +#include + #define NDEBUG #include diff --git a/reactos/dll/ntdll/dispatch/dispatch.c b/reactos/dll/ntdll/dispatch/dispatch.c index 50a9ee88f67..37f59d2c0f0 100644 --- a/reactos/dll/ntdll/dispatch/dispatch.c +++ b/reactos/dll/ntdll/dispatch/dispatch.c @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/dll/ntdll/include/ntdll.h b/reactos/dll/ntdll/include/ntdll.h index afd6a2acc8a..1121c9f916d 100644 --- a/reactos/dll/ntdll/include/ntdll.h +++ b/reactos/dll/ntdll/include/ntdll.h @@ -23,18 +23,14 @@ #include #include #include -#include -#include #include #define NTOS_MODE_USER #include -#include #include #include #include #include #include -#include #include #include #include @@ -45,7 +41,6 @@ #include "ntdllp.h" /* CSRSS Headers */ -#include #include /* PSEH */ diff --git a/reactos/dll/ntdll/include/ntdllp.h b/reactos/dll/ntdll/include/ntdllp.h index 606b5fc4546..d8b6e217243 100644 --- a/reactos/dll/ntdll/include/ntdllp.h +++ b/reactos/dll/ntdll/include/ntdllp.h @@ -6,7 +6,7 @@ * PROGRAMMER: Alex Ionescu (alex@relsoft.net) */ -/* INCLUDES ******************************************************************/ +#pragma once #define LDR_HASH_TABLE_ENTRIES 32 #define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES - 1)) diff --git a/reactos/dll/ntdll/ldr/ldrapi.c b/reactos/dll/ntdll/ldr/ldrapi.c index 5107649a716..a7b25f032d4 100644 --- a/reactos/dll/ntdll/ldr/ldrapi.c +++ b/reactos/dll/ntdll/ldr/ldrapi.c @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/dll/ntdll/ldr/ldrinit.c b/reactos/dll/ntdll/ldr/ldrinit.c index 8aa9e74668e..2c7094d7873 100644 --- a/reactos/dll/ntdll/ldr/ldrinit.c +++ b/reactos/dll/ntdll/ldr/ldrinit.c @@ -10,6 +10,8 @@ /* INCLUDES *****************************************************************/ #include + +#include #include #define NDEBUG diff --git a/reactos/dll/ntdll/ldr/ldrpe.c b/reactos/dll/ntdll/ldr/ldrpe.c index 6b351aeecc1..a127e5798a1 100644 --- a/reactos/dll/ntdll/ldr/ldrpe.c +++ b/reactos/dll/ntdll/ldr/ldrpe.c @@ -9,6 +9,7 @@ /* INCLUDES *****************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/dll/ntdll/ldr/ldrutils.c b/reactos/dll/ntdll/ldr/ldrutils.c index b042ee852e0..12d487c7936 100644 --- a/reactos/dll/ntdll/ldr/ldrutils.c +++ b/reactos/dll/ntdll/ldr/ldrutils.c @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/dll/ntdll/rtl/libsupp.c b/reactos/dll/ntdll/rtl/libsupp.c index c2cbf25c302..9ceb2b0bda2 100644 --- a/reactos/dll/ntdll/rtl/libsupp.c +++ b/reactos/dll/ntdll/rtl/libsupp.c @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/dll/ntdll/rtl/version.c b/reactos/dll/ntdll/rtl/version.c index 66193febb70..94e1caab2b7 100644 --- a/reactos/dll/ntdll/rtl/version.c +++ b/reactos/dll/ntdll/rtl/version.c @@ -11,6 +11,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include