Modified: trunk/reactos/lib/ntdll/inc/ntdll.h
Modified: trunk/reactos/lib/ntdll/ldr/utils.c
Modified: trunk/reactos/lib/ntdll/rtl/path.c
Modified: trunk/reactos/lib/ntdll/stdlib/abs.c
Modified: trunk/reactos/lib/ntdll/stdlib/atoi.c
Modified: trunk/reactos/lib/ntdll/stdlib/atoi64.c
Modified: trunk/reactos/lib/ntdll/stdlib/atol.c
Modified: trunk/reactos/lib/ntdll/stdlib/bsearch.c
Modified: trunk/reactos/lib/ntdll/stdlib/itoa.c
Modified: trunk/reactos/lib/ntdll/stdlib/itow.c
Modified: trunk/reactos/lib/ntdll/stdlib/labs.c
Modified: trunk/reactos/lib/ntdll/stdlib/lfind.c
Modified: trunk/reactos/lib/ntdll/stdlib/splitp.c
Modified: trunk/reactos/lib/ntdll/stdlib/strtol.c
Modified: trunk/reactos/lib/ntdll/stdlib/strtoul.c
Modified: trunk/reactos/lib/ntdll/stdlib/wcstol.c
Modified: trunk/reactos/lib/ntdll/stdlib/wcstoul.c
Modified: trunk/reactos/lib/ntdll/stdlib/wtoi.c
Modified: trunk/reactos/lib/ntdll/stdlib/wtoi64.c
Modified: trunk/reactos/lib/ntdll/stdlib/wtol.c
Modified: trunk/reactos/lib/ntdll/string/ctype.c
Modified: trunk/reactos/lib/ntdll/string/memicmp.c
Modified: trunk/reactos/lib/ntdll/string/stricmp.c
Modified: trunk/reactos/lib/ntdll/string/strlwr.c
Modified: trunk/reactos/lib/ntdll/string/strnicmp.c
Modified: trunk/reactos/lib/ntdll/string/strstr.c
Modified: trunk/reactos/lib/ntdll/string/strupr.c
Modified: trunk/reactos/lib/ntdll/string/wstring.c
--- trunk/reactos/lib/ntdll/inc/ntdll.h 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/inc/ntdll.h 2005-07-27 16:18:06 UTC (rev 16802)
@@ -9,6 +9,9 @@
/* INCLUDES ******************************************************************/
/* C Headers */
+#define _CTYPE_DISABLE_MACROS
+#define _INC_SWPRINTF_INL_
+#include <limits.h>
#include <stdio.h>
#include <ctype.h>
--- trunk/reactos/lib/ntdll/ldr/utils.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -96,7 +96,7 @@
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 @@
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 @@
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 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)
--- trunk/reactos/lib/ntdll/rtl/path.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/rtl/path.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -406,7 +406,7 @@
* 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;
--- trunk/reactos/lib/ntdll/stdlib/abs.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/abs.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,5 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <stdlib.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/atoi.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/atoi.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,5 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <stdlib.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/atoi64.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/atoi64.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -6,9 +6,7 @@
* PURPOSE: converts an ascii string to 64 bit integer
*/
-#include <stdlib.h>
-#define __NO_CTYPE_INLINES
-#include <ctype.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/atol.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/atol.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,5 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <stdlib.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/bsearch.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/bsearch.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,5 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <stdlib.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/itoa.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/itoa.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -15,8 +15,7 @@
* Copyright 2003 Thomas Mertes
*/
-#include <stdlib.h>
-#include <string.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/itow.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/itow.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -9,7 +9,7 @@
* 1998: Added ltoa Boudewijn Dekker
*/
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
-#include <stdlib.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/labs.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/labs.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,5 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <stdlib.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/lfind.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/lfind.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,5 +1,4 @@
-#include <search.h>
-#include <stdlib.h>
+#include <ntdll.h>
/*
--- trunk/reactos/lib/ntdll/stdlib/splitp.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/splitp.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,5 +1,4 @@
-#include <stdlib.h>
-#include <string.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/strtol.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/strtol.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,10 +1,6 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <limits.h>
-#define __NO_CTYPE_INLINES
-#include <ctype.h>
-#include <stdlib.h>
+#include <ntdll.h>
-
/*
* @implemented
*/
--- trunk/reactos/lib/ntdll/stdlib/strtoul.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/strtoul.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,8 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <limits.h>
-#define __NO_CTYPE_INLINES
-#include <ctype.h>
-#include <stdlib.h>
+#include <ntdll.h>
/*
--- trunk/reactos/lib/ntdll/stdlib/wcstol.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/wcstol.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,7 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <limits.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include <ntdll.h>
/*
--- trunk/reactos/lib/ntdll/stdlib/wcstoul.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/wcstoul.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,9 +1,6 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <limits.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include <ntdll.h>
-
/*
* Convert a unicode string to an unsigned long integer.
*
--- trunk/reactos/lib/ntdll/stdlib/wtoi.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/wtoi.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,5 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <stdlib.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/wtoi64.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/wtoi64.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -6,8 +6,7 @@
* PURPOSE: converts a unicode string to 64 bit integer
*/
-#include <stdlib.h>
-#include <ctype.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/stdlib/wtol.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/stdlib/wtol.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,5 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <stdlib.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/string/ctype.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/string/ctype.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -10,8 +10,7 @@
* 29/12/1999: Added missing functions and changed
* all functions to use ctype table
*/
-#undef __MSVCRT__
-#include <ctype.h>
+#include <ntdll.h>
#undef _pctype
--- trunk/reactos/lib/ntdll/string/memicmp.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/string/memicmp.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,6 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <string.h>
-#include <ctype.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/string/stricmp.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/string/stricmp.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,6 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <string.h>
-#include <ctype.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/string/strlwr.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/string/strlwr.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -8,8 +8,7 @@
* Copyright 1997 Uwe Bonnes
*/
-#include <string.h>
-#include <ctype.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/string/strnicmp.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/string/strnicmp.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,6 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <string.h>
-#include <ctype.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/string/strstr.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/string/strstr.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -1,6 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#include <string.h>
-//#include <unconst.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/string/strupr.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/string/strupr.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -9,8 +9,7 @@
*/
-#include <string.h>
-#include <ctype.h>
+#include <ntdll.h>
/*
* @implemented
--- trunk/reactos/lib/ntdll/string/wstring.c 2005-07-27 16:11:29 UTC (rev 16801)
+++ trunk/reactos/lib/ntdll/string/wstring.c 2005-07-27 16:18:06 UTC (rev 16802)
@@ -12,7 +12,7 @@
/* INCLUDES *****************************************************************/
-#include <wchar.h>
+#include <ntdll.h>
/* FUNCTIONS *****************************************************************/