Use NTDLL Common Header. Modified: trunk/reactos/lib/ntdll/csr/capture.c Modified: trunk/reactos/lib/ntdll/csr/lpc.c Modified: trunk/reactos/lib/ntdll/csr/probe.c Modified: trunk/reactos/lib/ntdll/csr/thread.c Modified: trunk/reactos/lib/ntdll/dbg/brkpoint.c Modified: trunk/reactos/lib/ntdll/dbg/debug.c Modified: trunk/reactos/lib/ntdll/dbg/print.c Modified: trunk/reactos/lib/ntdll/ldr/elf.c Modified: trunk/reactos/lib/ntdll/ldr/res.c Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/lib/ntdll/main/dllmain.c Modified: trunk/reactos/lib/ntdll/rtl/apc.c Modified: trunk/reactos/lib/ntdll/rtl/atom.c Modified: trunk/reactos/lib/ntdll/rtl/callback.c Modified: trunk/reactos/lib/ntdll/rtl/crc32.c Modified: trunk/reactos/lib/ntdll/rtl/critical.c Modified: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c Modified: trunk/reactos/lib/ntdll/rtl/exception.c Modified: trunk/reactos/lib/ntdll/rtl/handle.c Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Modified: trunk/reactos/lib/ntdll/rtl/math.c Modified: trunk/reactos/lib/ntdll/rtl/message.c Modified: trunk/reactos/lib/ntdll/rtl/misc.c Modified: trunk/reactos/lib/ntdll/rtl/path.c Modified: trunk/reactos/lib/ntdll/rtl/process.c Modified: trunk/reactos/lib/ntdll/rtl/propvar.c Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c Modified: trunk/reactos/lib/ntdll/rtl/resource.c Modified: trunk/reactos/lib/ntdll/rtl/teb.c Modified: trunk/reactos/lib/ntdll/rtl/timerqueue.c Modified: trunk/reactos/lib/ntdll/rtl/trace.c Modified: trunk/reactos/lib/ntdll/stdio/sprintf.c Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c Modified: trunk/reactos/lib/ntdll/stdio/swprintf.c Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c Modified: trunk/reactos/lib/ntdll/string/wstring.c _____
Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -8,14 +8,8 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> -#include <ntdll/csr.h> -#include <string.h> - -#include <csrss/csrss.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* GLOBALS *******************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/csr/lpc.c --- trunk/reactos/lib/ntdll/csr/lpc.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/csr/lpc.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -13,15 +13,8 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> -#include <ntdll/csr.h> -#include <string.h> -#include <rosrtl/string.h> - -#include <csrss/csrss.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* GLOBALS *******************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/csr/probe.c --- trunk/reactos/lib/ntdll/csr/probe.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/csr/probe.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -7,11 +7,9 @@
* AUTHOR: Eric Kohl * DATE: 2001-06-17 */ -#define NTOS_MODE_USER -#include <ntos.h> - + #define NDEBUG -#include <ntdll/rtl.h> +#include <ntdll.h>
/* * @implemented _____
Modified: trunk/reactos/lib/ntdll/csr/thread.c --- trunk/reactos/lib/ntdll/csr/thread.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/csr/thread.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -5,16 +5,9 @@
* FILE: lib/ntdll/csr/propvar.c * PURPOSE: CSRSS threads API */ -#define NTOS_MODE_USER -#include <ntos.h>
-#include <ntdll/csr.h> -#include <string.h> - -#include <csrss/csrss.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* * @implemented _____
Modified: trunk/reactos/lib/ntdll/dbg/brkpoint.c --- trunk/reactos/lib/ntdll/dbg/brkpoint.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/dbg/brkpoint.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,8 +11,8 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> -#include <debug.h> +#define NDEBUG +#include <ntdll.h>
/* FUNCTIONS *****************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/dbg/debug.c --- trunk/reactos/lib/ntdll/dbg/debug.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/dbg/debug.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,12 +11,8 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> -#include <ntos.h> -#include <ntdll/rtl.h> -#include <rosrtl/string.h> -#include <rosrtl/thread.h> -#include <ntdll/dbg.h> +#define NDEBUG +#include <ntdll.h>
/* FUNCTIONS *****************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/dbg/print.c --- trunk/reactos/lib/ntdll/dbg/print.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/dbg/print.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -9,12 +9,9 @@
* Created 28/12/1999 */
-#include <ddk/ntddk.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> +#define NDEBUG +#include <ntdll.h>
- /* FUNCTIONS ***************************************************************/
ULONG DbgService (ULONG Service, PVOID Context1, PVOID Context2); _____
Modified: trunk/reactos/lib/ntdll/ldr/elf.c --- trunk/reactos/lib/ntdll/ldr/elf.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/ldr/elf.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -42,6 +42,9 @@
* John Polstra jdp@polstra.com. */
+#define NDEBUG +#include <ntdll.h> + #if 0
#ifndef __GNUC__ _____
Modified: trunk/reactos/lib/ntdll/ldr/res.c --- trunk/reactos/lib/ntdll/ldr/res.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/ldr/res.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -23,17 +23,8 @@
/* INCLUDES *****************************************************************/
-#include <reactos/config.h> -#include <ddk/ntddk.h> -#include <ntos.h> -#include <ntos/ldrtypes.h> -#include <windows.h> -#include <string.h> -#include <wchar.h> -#include <ntdll/ldr.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* PROTOTYPES ****************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -10,20 +10,10 @@
/* INCLUDES *****************************************************************/
-#include <reactos/config.h> -#include <ddk/ntddk.h> -#include <windows.h> -#include <ntdll/ldr.h> -#include <ntdll/rtl.h> -#include <csrss/csrss.h> -#include <ntdll/csr.h> +#define NDEBUG +#include <ntdll.h> #include <user32/callback.h> -#include <rosrtl/string.h>
-#define NDEBUG -#include <ntdll/ntdll.h> - - VOID RtlInitializeHeapManager (VOID); VOID LdrpInitLoader(VOID);
_____
Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -19,22 +19,11 @@
/* INCLUDES *****************************************************************/
-#include <reactos/config.h> -#include <ddk/ntddk.h> -#include <ntos.h> -#include <windows.h> -#include <string.h> -#include <wchar.h> -#include <ntdll/ldr.h> -#include <ntdll/rtl.h> +#define NDEBUG +#include <ntdll.h>
#define LDRP_PROCESS_CREATION_TIME 0x8000000
-#ifdef DBG_NTDLL_LDR_UTILS -#define NDEBUG -#endif -#include <ntdll/ntdll.h> - /* GLOBALS *******************************************************************/
typedef struct _TLS_DATA _____
Modified: trunk/reactos/lib/ntdll/main/dllmain.c --- trunk/reactos/lib/ntdll/main/dllmain.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/main/dllmain.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -7,11 +7,8 @@
* PROGRAMMER: */
-#include <ddk/ntddk.h> -#include <stdarg.h> -#include <stdio.h> -#include <ntdll/ntdll.h> -#include <windows.h> +#define NDEBUG +#include <ntdll.h>
BOOL WINAPI DllMainCRTStartup(HINSTANCE hinstDll, DWORD fdwReason, _____
Modified: trunk/reactos/lib/ntdll/rtl/apc.c --- trunk/reactos/lib/ntdll/rtl/apc.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/apc.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -26,9 +26,8 @@
/* INCLUDES *****************************************************************/
-#include <ntos.h> -#include <string.h> -#include <debug.h> +#define NDEBUG +#include <ntdll.h>
/* FUNCTIONS ***************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/rtl/atom.c --- trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,14 +11,9 @@
/* INCLUDES *****************************************************************/
-#include <ntos.h> -#include <ntdll/rtl.h> -#include <ntos/heap.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
- /* LOCAL TYPES ***************************************************************/
typedef struct _RTL_ATOM_ENTRY _____
Modified: trunk/reactos/lib/ntdll/rtl/callback.c --- trunk/reactos/lib/ntdll/rtl/callback.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/callback.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -9,11 +9,8 @@
/* INCLUDES *****************************************************************/
-#include <ntos.h> -#include <string.h> -#include <napi/teb.h> - - +#define NDEBUG +#include <ntdll.h> /* TYPES *********************************************************************/
typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument, _____
Modified: trunk/reactos/lib/ntdll/rtl/crc32.c --- trunk/reactos/lib/ntdll/rtl/crc32.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/crc32.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -17,9 +17,8 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> -#include <ntdll/rtl.h> - +#define NDEBUG +#include <ntdll.h> /* FUNCTIONS ****************************************************************/
/* CRC polynomial 0xedb88320 */ _____
Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -12,12 +12,9 @@
/* INCLUDES ******************************************************************/
-#include <windows.h> -#include <ntos.h> #include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* FUNCTIONS *****************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c --- trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -31,17 +31,8 @@
/* INCLUDES *****************************************************************/
-#include <windows.h> -#include <ntos/types.h> -#include <napi/teb.h> -#include <ntdll/rtl.h> -#include <ntdll/ldr.h> -#include <ntos.h> - -#include <rosrtl/thread.h> - #define NDEBUG -#include <debug.h> +#include <ntdll.h>
/* FUNCTIONS ***************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/rtl/exception.c --- trunk/reactos/lib/ntdll/rtl/exception.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/exception.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -14,14 +14,8 @@
/* INCLUDES *****************************************************************/
-#include <ntos.h> -#include <windows.h> -#include <string.h> -#include <ntdll/rtl.h> -#include <napi/teb.h> - #define NDEBUG -#include <debug.h> +#include <ntdll.h>
static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock; static LIST_ENTRY RtlpVectoredExceptionHead; _____
Modified: trunk/reactos/lib/ntdll/rtl/handle.c --- trunk/reactos/lib/ntdll/rtl/handle.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/handle.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -9,11 +9,8 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* FUNCTIONS *****************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -9,13 +9,8 @@
* */
-#include <ntos.h> -#include <ntdll/rtl.h> -#include <ctype.h> -#include <ntos/minmax.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* FUNCTIONS ***************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/rtl/math.c --- trunk/reactos/lib/ntdll/rtl/math.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/math.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -17,8 +17,9 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define NDEBUG +#include <ntdll.h>
- double atan (double __x); double ceil (double __x); double cos (double __x); _____
Modified: trunk/reactos/lib/ntdll/rtl/message.c --- trunk/reactos/lib/ntdll/rtl/message.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/message.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,14 +11,10 @@
/* INCLUDES *****************************************************************/
-#include <ntos.h> -#include <ntos/ldrtypes.h> +#define NDEBUG +#include <ntdll.h> #include <ddk/ldrfuncs.h>
-#define NDEBUG -#include <ntdll/ntdll.h> - - /* FUNCTIONS *****************************************************************/
/* _____
Modified: trunk/reactos/lib/ntdll/rtl/misc.c --- trunk/reactos/lib/ntdll/rtl/misc.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/misc.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,12 +11,8 @@
/* INCLUDES *****************************************************************/
-#include <windows.h> -#include <ntos.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/********************************************************************** * NAME EXPORTED _____
Modified: trunk/reactos/lib/ntdll/rtl/path.c --- trunk/reactos/lib/ntdll/rtl/path.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/path.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -10,15 +10,8 @@
/* INCLUDES ******************************************************************/
-#include <ntos.h> -#include <ntdll/rtl.h> -#include <ntos/minmax.h> -#include <string.h> -#include <stdio.h> -#include <ctype.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* DEFINITONS and MACROS ******************************************************/
_____
Modified: trunk/reactos/lib/ntdll/rtl/process.c --- trunk/reactos/lib/ntdll/rtl/process.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/process.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,15 +11,8 @@
/* INCLUDES ****************************************************************/
-#include <ntos.h> -#include <windows.h> -#include <napi/i386/segment.h> -#include <ntdll/ldr.h> -#include <ntdll/base.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* FUNCTIONS ****************************************************************/
_____
Modified: trunk/reactos/lib/ntdll/rtl/propvar.c --- trunk/reactos/lib/ntdll/rtl/propvar.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/propvar.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -5,8 +5,8 @@
* FILE: lib/ntdll/csr/propvar.c * PURPOSE: CSRSS properties and variants API */ -#define NTOS_MODE_USER -#include <ntos.h> +#define NDEBUG +#include <ntdll.h>
/* * @unimplemented _____
Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c --- trunk/reactos/lib/ntdll/rtl/rangelist.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/rangelist.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -26,14 +26,9 @@
/* INCLUDES ****************************************************************/
-#include <ntos.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - typedef struct _RTL_RANGE_ENTRY { LIST_ENTRY Entry; _____
Modified: trunk/reactos/lib/ntdll/rtl/resource.c --- trunk/reactos/lib/ntdll/rtl/resource.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/resource.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -18,11 +18,8 @@
* The code is based on information published in WDJ January 1999 issue. */
-#include <ntos.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
/* FUNCTIONS ****************************************************************/ _____
Modified: trunk/reactos/lib/ntdll/rtl/teb.c --- trunk/reactos/lib/ntdll/rtl/teb.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/teb.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -6,8 +6,8 @@
* PURPOSE: */
-#include <ddk/ntddk.h> -#include <napi/teb.h> +#define NDEBUG +#include <ntdll.h>
PTEB STDCALL _____
Modified: trunk/reactos/lib/ntdll/rtl/timerqueue.c --- trunk/reactos/lib/ntdll/rtl/timerqueue.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/timerqueue.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -26,10 +26,8 @@
/* INCLUDES ****************************************************************/
-#include <ddk/ntddk.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
_____
Modified: trunk/reactos/lib/ntdll/rtl/trace.c --- trunk/reactos/lib/ntdll/rtl/trace.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/trace.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -26,11 +26,7 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> -#include <ntdll/trace.h> -#include <string.h> -#include <stdarg.h> - +#define NDEBUG #include <ntdll.h>
/* GLOBALS *******************************************************************/ _____
Modified: trunk/reactos/lib/ntdll/stdio/sprintf.c --- trunk/reactos/lib/ntdll/stdio/sprintf.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdio/sprintf.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -20,16 +20,12 @@
* Wirzenius wrote this portably, Torvalds fucked it up :-) */
-#include <ddk/ntddk.h> -#include <stdarg.h> -#include <stdlib.h> #define __NO_CTYPE_INLINES #include <ctype.h> -#include <string.h> #include <limits.h>
#define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h>
#define ZEROPAD 1 /* pad with zero */ _____
Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c --- trunk/reactos/lib/ntdll/stdio/sscanf.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdio/sscanf.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -1,13 +1,9 @@
/**/
+#define NDEBUG +#include <ntdll.h> #include <stdio.h> -#include <ntos.h> -#include <ntdll/rtl.h>
-#define NDEBUG -#include <ntdll/ntdll.h> - - /* helper function for *scanf. Returns the value of character c in the * given base, or -1 if the given character is not a digit of the base. */ _____
Modified: trunk/reactos/lib/ntdll/stdio/swprintf.c --- trunk/reactos/lib/ntdll/stdio/swprintf.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdio/swprintf.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -22,17 +22,11 @@
* Wirzenius wrote this portably, Torvalds fucked it up :-) */
-#include <ddk/ntddk.h> -#include <stdarg.h> -#include <stdlib.h> -#include <ctype.h> +#define NDEBUG +#include <ntdll.h> #include <wchar.h> #include <limits.h>
-#define NDEBUG -#include <ntdll/ntdll.h> - - #define ZEROPAD 1 /* pad with zero */ #define SIGN 2 /* unsigned/signed long */ #define PLUS 4 /* show plus */ _____
Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c --- trunk/reactos/lib/ntdll/stdlib/mbstowcs.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdlib/mbstowcs.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -6,10 +6,10 @@
* PURPOSE: converts a multi byte string to a unicode string */
-#include <ntos.h> +#define NDEBUG +#include <ntdll.h> #include <stdlib.h> #include <string.h> - /* * @implemented */ _____
Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c --- trunk/reactos/lib/ntdll/stdlib/wcstombs.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdlib/wcstombs.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -6,7 +6,8 @@
* PURPOSE: converts a unicode string to a multi byte string */
-#include <ntos.h> +#define NDEBUG +#include <ntdll.h> #include <stdlib.h> #include <string.h>
_____
Modified: trunk/reactos/lib/ntdll/string/wstring.c --- trunk/reactos/lib/ntdll/string/wstring.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/string/wstring.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -12,7 +12,6 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> #include <wchar.h>
-
ion＠svn.reactos.com