From 5af8e51ad196b86cf4c7504a67771b2e9633d5f9 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Wed, 27 Jul 2005 16:18:06 +0000 Subject: [PATCH] - Use PCH everywhere to increase compile speed - Some PSDK compatibility. svn path=/trunk/; revision=16802 --- reactos/lib/ntdll/inc/ntdll.h | 3 +++ reactos/lib/ntdll/ldr/utils.c | 8 ++++---- reactos/lib/ntdll/rtl/path.c | 2 +- reactos/lib/ntdll/stdlib/abs.c | 2 +- reactos/lib/ntdll/stdlib/atoi.c | 2 +- reactos/lib/ntdll/stdlib/atoi64.c | 4 +--- reactos/lib/ntdll/stdlib/atol.c | 2 +- reactos/lib/ntdll/stdlib/bsearch.c | 2 +- reactos/lib/ntdll/stdlib/itoa.c | 3 +-- reactos/lib/ntdll/stdlib/itow.c | 2 +- reactos/lib/ntdll/stdlib/labs.c | 2 +- reactos/lib/ntdll/stdlib/lfind.c | 3 +-- reactos/lib/ntdll/stdlib/splitp.c | 3 +-- reactos/lib/ntdll/stdlib/strtol.c | 6 +----- reactos/lib/ntdll/stdlib/strtoul.c | 5 +---- reactos/lib/ntdll/stdlib/wcstol.c | 4 +--- reactos/lib/ntdll/stdlib/wcstoul.c | 5 +---- reactos/lib/ntdll/stdlib/wtoi.c | 2 +- reactos/lib/ntdll/stdlib/wtoi64.c | 3 +-- reactos/lib/ntdll/stdlib/wtol.c | 2 +- reactos/lib/ntdll/string/ctype.c | 3 +-- reactos/lib/ntdll/string/memicmp.c | 3 +-- reactos/lib/ntdll/string/stricmp.c | 3 +-- reactos/lib/ntdll/string/strlwr.c | 3 +-- reactos/lib/ntdll/string/strnicmp.c | 3 +-- reactos/lib/ntdll/string/strstr.c | 3 +-- reactos/lib/ntdll/string/strupr.c | 3 +-- reactos/lib/ntdll/string/wstring.c | 2 +- 28 files changed, 33 insertions(+), 55 deletions(-) diff --git a/reactos/lib/ntdll/inc/ntdll.h b/reactos/lib/ntdll/inc/ntdll.h index 2ce97e483d7..7ce2a0f23d4 100644 --- a/reactos/lib/ntdll/inc/ntdll.h +++ b/reactos/lib/ntdll/inc/ntdll.h @@ -9,6 +9,9 @@ /* INCLUDES ******************************************************************/ /* C Headers */ +#define _CTYPE_DISABLE_MACROS +#define _INC_SWPRINTF_INL_ +#include #include #include diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c index 54cf36c935e..aae4079612f 100644 --- a/reactos/lib/ntdll/ldr/utils.c +++ b/reactos/lib/ntdll/ldr/utils.c @@ -96,7 +96,7 @@ LdrMappedAsDataFile(PVOID *BaseAddress) return FALSE; } -static inline LONG LdrpDecrementLoadCount(PLDR_DATA_TABLE_ENTRY Module, BOOLEAN Locked) +static __inline LONG LdrpDecrementLoadCount(PLDR_DATA_TABLE_ENTRY Module, BOOLEAN Locked) { LONG LoadCount; if (!Locked) @@ -115,7 +115,7 @@ static inline LONG LdrpDecrementLoadCount(PLDR_DATA_TABLE_ENTRY Module, BOOLEAN return LoadCount; } -static inline LONG LdrpIncrementLoadCount(PLDR_DATA_TABLE_ENTRY Module, BOOLEAN Locked) +static __inline LONG LdrpIncrementLoadCount(PLDR_DATA_TABLE_ENTRY Module, BOOLEAN Locked) { LONG LoadCount; if (!Locked) @@ -134,7 +134,7 @@ static inline LONG LdrpIncrementLoadCount(PLDR_DATA_TABLE_ENTRY Module, BOOLEAN return LoadCount; } -static inline VOID LdrpAcquireTlsSlot(PLDR_DATA_TABLE_ENTRY Module, ULONG Size, BOOLEAN Locked) +static __inline VOID LdrpAcquireTlsSlot(PLDR_DATA_TABLE_ENTRY Module, ULONG Size, BOOLEAN Locked) { if (!Locked) { @@ -149,7 +149,7 @@ static inline VOID LdrpAcquireTlsSlot(PLDR_DATA_TABLE_ENTRY Module, ULONG Size, } } -static inline VOID LdrpTlsCallback(PLDR_DATA_TABLE_ENTRY Module, ULONG dwReason) +static __inline VOID LdrpTlsCallback(PLDR_DATA_TABLE_ENTRY Module, ULONG dwReason) { PIMAGE_TLS_CALLBACK TlsCallback; if (Module->TlsIndex != 0xFFFF && Module->LoadCount == 0xFFFF) diff --git a/reactos/lib/ntdll/rtl/path.c b/reactos/lib/ntdll/rtl/path.c index 0f1f119e23a..f62a2eef749 100644 --- a/reactos/lib/ntdll/rtl/path.c +++ b/reactos/lib/ntdll/rtl/path.c @@ -406,7 +406,7 @@ RtlSetCurrentDirectory_U(PUNICODE_STRING dir) * 2) Get rid of duplicate backslashes * 3) Get rid of . and .. components in the path. */ -static inline void collapse_path( WCHAR *path, UINT mark ) +static __inline void collapse_path( WCHAR *path, UINT mark ) { WCHAR *p, *next; diff --git a/reactos/lib/ntdll/stdlib/abs.c b/reactos/lib/ntdll/stdlib/abs.c index 24f6351b574..98953c4c2f9 100644 --- a/reactos/lib/ntdll/stdlib/abs.c +++ b/reactos/lib/ntdll/stdlib/abs.c @@ -1,5 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/atoi.c b/reactos/lib/ntdll/stdlib/atoi.c index 094f96f1776..3e2331b2e0b 100644 --- a/reactos/lib/ntdll/stdlib/atoi.c +++ b/reactos/lib/ntdll/stdlib/atoi.c @@ -1,5 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/atoi64.c b/reactos/lib/ntdll/stdlib/atoi64.c index 3daa5f52e49..cd9cba796fa 100644 --- a/reactos/lib/ntdll/stdlib/atoi64.c +++ b/reactos/lib/ntdll/stdlib/atoi64.c @@ -6,9 +6,7 @@ * PURPOSE: converts an ascii string to 64 bit integer */ -#include -#define __NO_CTYPE_INLINES -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/atol.c b/reactos/lib/ntdll/stdlib/atol.c index 60e27e34e35..fca9a312360 100644 --- a/reactos/lib/ntdll/stdlib/atol.c +++ b/reactos/lib/ntdll/stdlib/atol.c @@ -1,5 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/bsearch.c b/reactos/lib/ntdll/stdlib/bsearch.c index e1e4f11e586..08f7d94feee 100644 --- a/reactos/lib/ntdll/stdlib/bsearch.c +++ b/reactos/lib/ntdll/stdlib/bsearch.c @@ -1,5 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/itoa.c b/reactos/lib/ntdll/stdlib/itoa.c index 4bc7999ff3e..0643b3d177e 100644 --- a/reactos/lib/ntdll/stdlib/itoa.c +++ b/reactos/lib/ntdll/stdlib/itoa.c @@ -15,8 +15,7 @@ * Copyright 2003 Thomas Mertes */ -#include -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/itow.c b/reactos/lib/ntdll/stdlib/itow.c index de1e6148f17..eb7aa6132f4 100644 --- a/reactos/lib/ntdll/stdlib/itow.c +++ b/reactos/lib/ntdll/stdlib/itow.c @@ -9,7 +9,7 @@ * 1998: Added ltoa Boudewijn Dekker */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/labs.c b/reactos/lib/ntdll/stdlib/labs.c index 50ad63daf43..52ef2473624 100644 --- a/reactos/lib/ntdll/stdlib/labs.c +++ b/reactos/lib/ntdll/stdlib/labs.c @@ -1,5 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/lfind.c b/reactos/lib/ntdll/stdlib/lfind.c index 3afdc05131e..93b454ababa 100644 --- a/reactos/lib/ntdll/stdlib/lfind.c +++ b/reactos/lib/ntdll/stdlib/lfind.c @@ -1,5 +1,4 @@ -#include -#include +#include /* diff --git a/reactos/lib/ntdll/stdlib/splitp.c b/reactos/lib/ntdll/stdlib/splitp.c index 6314129037e..be123f365cc 100644 --- a/reactos/lib/ntdll/stdlib/splitp.c +++ b/reactos/lib/ntdll/stdlib/splitp.c @@ -1,5 +1,4 @@ -#include -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/strtol.c b/reactos/lib/ntdll/stdlib/strtol.c index bf11453b7ae..b6d4f551ed0 100644 --- a/reactos/lib/ntdll/stdlib/strtol.c +++ b/reactos/lib/ntdll/stdlib/strtol.c @@ -1,9 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include -#define __NO_CTYPE_INLINES -#include -#include - +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/strtoul.c b/reactos/lib/ntdll/stdlib/strtoul.c index ee283b6b44a..cf28c143b60 100644 --- a/reactos/lib/ntdll/stdlib/strtoul.c +++ b/reactos/lib/ntdll/stdlib/strtoul.c @@ -1,8 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include -#define __NO_CTYPE_INLINES -#include -#include +#include /* diff --git a/reactos/lib/ntdll/stdlib/wcstol.c b/reactos/lib/ntdll/stdlib/wcstol.c index 2467c592f37..ae0cab5b81b 100644 --- a/reactos/lib/ntdll/stdlib/wcstol.c +++ b/reactos/lib/ntdll/stdlib/wcstol.c @@ -1,7 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include -#include -#include +#include /* diff --git a/reactos/lib/ntdll/stdlib/wcstoul.c b/reactos/lib/ntdll/stdlib/wcstoul.c index cc35a3bc767..e7c8ce7a417 100644 --- a/reactos/lib/ntdll/stdlib/wcstoul.c +++ b/reactos/lib/ntdll/stdlib/wcstoul.c @@ -1,8 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include -#include -#include - +#include /* * Convert a unicode string to an unsigned long integer. diff --git a/reactos/lib/ntdll/stdlib/wtoi.c b/reactos/lib/ntdll/stdlib/wtoi.c index 394b6cbb983..7368ef8623a 100644 --- a/reactos/lib/ntdll/stdlib/wtoi.c +++ b/reactos/lib/ntdll/stdlib/wtoi.c @@ -1,5 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/wtoi64.c b/reactos/lib/ntdll/stdlib/wtoi64.c index b406c09bac8..a27f9011032 100644 --- a/reactos/lib/ntdll/stdlib/wtoi64.c +++ b/reactos/lib/ntdll/stdlib/wtoi64.c @@ -6,8 +6,7 @@ * PURPOSE: converts a unicode string to 64 bit integer */ -#include -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/stdlib/wtol.c b/reactos/lib/ntdll/stdlib/wtol.c index 2a60cbb90a2..603dd831a02 100644 --- a/reactos/lib/ntdll/stdlib/wtol.c +++ b/reactos/lib/ntdll/stdlib/wtol.c @@ -1,5 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/string/ctype.c b/reactos/lib/ntdll/string/ctype.c index a2dd168c557..d327a836f96 100644 --- a/reactos/lib/ntdll/string/ctype.c +++ b/reactos/lib/ntdll/string/ctype.c @@ -10,8 +10,7 @@ * 29/12/1999: Added missing functions and changed * all functions to use ctype table */ -#undef __MSVCRT__ -#include +#include #undef _pctype diff --git a/reactos/lib/ntdll/string/memicmp.c b/reactos/lib/ntdll/string/memicmp.c index 1597a057d2a..d888264c07d 100644 --- a/reactos/lib/ntdll/string/memicmp.c +++ b/reactos/lib/ntdll/string/memicmp.c @@ -1,6 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/string/stricmp.c b/reactos/lib/ntdll/string/stricmp.c index ecd1afae22b..7edba7a8bcc 100644 --- a/reactos/lib/ntdll/string/stricmp.c +++ b/reactos/lib/ntdll/string/stricmp.c @@ -1,6 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/string/strlwr.c b/reactos/lib/ntdll/string/strlwr.c index e033947748a..f783dc02a7a 100644 --- a/reactos/lib/ntdll/string/strlwr.c +++ b/reactos/lib/ntdll/string/strlwr.c @@ -8,8 +8,7 @@ * Copyright 1997 Uwe Bonnes */ -#include -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/string/strnicmp.c b/reactos/lib/ntdll/string/strnicmp.c index a0d732e883b..5befa7a4231 100644 --- a/reactos/lib/ntdll/string/strnicmp.c +++ b/reactos/lib/ntdll/string/strnicmp.c @@ -1,6 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/string/strstr.c b/reactos/lib/ntdll/string/strstr.c index 6eafaa2310a..77441645823 100644 --- a/reactos/lib/ntdll/string/strstr.c +++ b/reactos/lib/ntdll/string/strstr.c @@ -1,6 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include -//#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/string/strupr.c b/reactos/lib/ntdll/string/strupr.c index 36e41c8737d..0904349e0bd 100644 --- a/reactos/lib/ntdll/string/strupr.c +++ b/reactos/lib/ntdll/string/strupr.c @@ -9,8 +9,7 @@ */ -#include -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/string/wstring.c b/reactos/lib/ntdll/string/wstring.c index 1767e241e61..9390017728a 100644 --- a/reactos/lib/ntdll/string/wstring.c +++ b/reactos/lib/ntdll/string/wstring.c @@ -12,7 +12,7 @@ /* INCLUDES *****************************************************************/ -#include +#include /* FUNCTIONS *****************************************************************/