From 6982b02da4c8a531862d79a42f21c805d0cb1750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 2 Sep 2007 19:42:22 +0000 Subject: [PATCH] Remove local header debug.h, and use the global one svn path=/trunk/; revision=28784 --- reactos/dll/win32/kernel32/debug/debugger.c | 2 +- reactos/dll/win32/kernel32/except/except.c | 2 +- reactos/dll/win32/kernel32/file/backup.c | 2 +- reactos/dll/win32/kernel32/file/bintype.c | 2 +- reactos/dll/win32/kernel32/file/cnotify.c | 2 +- reactos/dll/win32/kernel32/file/copy.c | 2 +- reactos/dll/win32/kernel32/file/create.c | 2 +- reactos/dll/win32/kernel32/file/curdir.c | 2 +- reactos/dll/win32/kernel32/file/delete.c | 2 +- reactos/dll/win32/kernel32/file/deviceio.c | 2 +- reactos/dll/win32/kernel32/file/dir.c | 2 +- reactos/dll/win32/kernel32/file/dosdev.c | 2 +- reactos/dll/win32/kernel32/file/file.c | 2 +- reactos/dll/win32/kernel32/file/find.c | 2 +- reactos/dll/win32/kernel32/file/hardlink.c | 2 +- reactos/dll/win32/kernel32/file/iocompl.c | 2 +- reactos/dll/win32/kernel32/file/lfile.c | 2 +- reactos/dll/win32/kernel32/file/lock.c | 2 +- reactos/dll/win32/kernel32/file/mailslot.c | 2 +- reactos/dll/win32/kernel32/file/move.c | 2 +- reactos/dll/win32/kernel32/file/npipe.c | 2 +- reactos/dll/win32/kernel32/file/pipe.c | 2 +- reactos/dll/win32/kernel32/file/rw.c | 2 +- reactos/dll/win32/kernel32/file/tape.c | 2 +- reactos/dll/win32/kernel32/file/volume.c | 2 +- reactos/dll/win32/kernel32/include/debug.h | 25 ------------------- reactos/dll/win32/kernel32/mem/global.c | 2 +- reactos/dll/win32/kernel32/mem/heap.c | 2 +- reactos/dll/win32/kernel32/mem/isbad.c | 2 +- reactos/dll/win32/kernel32/mem/local.c | 2 +- reactos/dll/win32/kernel32/mem/procmem.c | 2 +- reactos/dll/win32/kernel32/mem/resnotify.c | 2 +- reactos/dll/win32/kernel32/mem/section.c | 2 +- reactos/dll/win32/kernel32/mem/virtual.c | 2 +- reactos/dll/win32/kernel32/misc/actctx.c | 2 +- reactos/dll/win32/kernel32/misc/atom.c | 2 +- reactos/dll/win32/kernel32/misc/chartype.c | 2 +- reactos/dll/win32/kernel32/misc/comm.c | 2 +- .../dll/win32/kernel32/misc/computername.c | 2 +- reactos/dll/win32/kernel32/misc/console.c | 2 +- reactos/dll/win32/kernel32/misc/dllmain.c | 2 +- reactos/dll/win32/kernel32/misc/env.c | 2 +- reactos/dll/win32/kernel32/misc/error.c | 2 +- reactos/dll/win32/kernel32/misc/errormsg.c | 2 +- reactos/dll/win32/kernel32/misc/handle.c | 2 +- reactos/dll/win32/kernel32/misc/lang.c | 2 +- reactos/dll/win32/kernel32/misc/ldr.c | 2 +- .../dll/win32/kernel32/misc/lzexpand_main.c | 2 +- reactos/dll/win32/kernel32/misc/nls.c | 2 +- reactos/dll/win32/kernel32/misc/perfcnt.c | 2 +- reactos/dll/win32/kernel32/misc/profile.c | 2 +- reactos/dll/win32/kernel32/misc/recovery.c | 2 +- reactos/dll/win32/kernel32/misc/res.c | 2 +- reactos/dll/win32/kernel32/misc/stubs.c | 2 +- reactos/dll/win32/kernel32/misc/sysinfo.c | 2 +- reactos/dll/win32/kernel32/misc/time.c | 2 +- reactos/dll/win32/kernel32/misc/timerqueue.c | 2 +- reactos/dll/win32/kernel32/misc/toolhelp.c | 2 +- reactos/dll/win32/kernel32/misc/utils.c | 2 +- reactos/dll/win32/kernel32/misc/version.c | 2 +- reactos/dll/win32/kernel32/process/cmdline.c | 2 +- reactos/dll/win32/kernel32/process/job.c | 2 +- reactos/dll/win32/kernel32/process/proc.c | 2 +- reactos/dll/win32/kernel32/process/procsup.c | 2 +- reactos/dll/win32/kernel32/synch/condvar.c | 2 +- reactos/dll/win32/kernel32/synch/critical.c | 2 +- reactos/dll/win32/kernel32/synch/event.c | 2 +- reactos/dll/win32/kernel32/synch/mutex.c | 2 +- reactos/dll/win32/kernel32/synch/sem.c | 2 +- reactos/dll/win32/kernel32/synch/timer.c | 2 +- reactos/dll/win32/kernel32/synch/wait.c | 2 +- reactos/dll/win32/kernel32/thread/fiber.c | 2 +- reactos/dll/win32/kernel32/thread/fls.c | 2 +- reactos/dll/win32/kernel32/thread/thread.c | 2 +- reactos/dll/win32/kernel32/thread/tls.c | 2 +- 75 files changed, 74 insertions(+), 99 deletions(-) delete mode 100644 reactos/dll/win32/kernel32/include/debug.h diff --git a/reactos/dll/win32/kernel32/debug/debugger.c b/reactos/dll/win32/kernel32/debug/debugger.c index 3a719c8ae4e..9d2de50e1cc 100644 --- a/reactos/dll/win32/kernel32/debug/debugger.c +++ b/reactos/dll/win32/kernel32/debug/debugger.c @@ -10,7 +10,7 @@ #include #define NDEBUG -#include "debug.h" +#include typedef struct _DBGSS_THREAD_DATA { diff --git a/reactos/dll/win32/kernel32/except/except.c b/reactos/dll/win32/kernel32/except/except.c index 117003cfb96..5691f53f7a7 100644 --- a/reactos/dll/win32/kernel32/except/except.c +++ b/reactos/dll/win32/kernel32/except/except.c @@ -13,7 +13,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = UnhandledExceptionFilter; diff --git a/reactos/dll/win32/kernel32/file/backup.c b/reactos/dll/win32/kernel32/file/backup.c index eefa89a7d74..4ee43abd9df 100644 --- a/reactos/dll/win32/kernel32/file/backup.c +++ b/reactos/dll/win32/kernel32/file/backup.c @@ -13,7 +13,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/bintype.c b/reactos/dll/win32/kernel32/file/bintype.c index 38915ee538e..210cb981492 100644 --- a/reactos/dll/win32/kernel32/file/bintype.c +++ b/reactos/dll/win32/kernel32/file/bintype.c @@ -15,7 +15,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/cnotify.c b/reactos/dll/win32/kernel32/file/cnotify.c index 6dd6a9cc56c..0315d1044f1 100644 --- a/reactos/dll/win32/kernel32/file/cnotify.c +++ b/reactos/dll/win32/kernel32/file/cnotify.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* * @implemented diff --git a/reactos/dll/win32/kernel32/file/copy.c b/reactos/dll/win32/kernel32/file/copy.c index 82b547f3947..7c58babb2ad 100644 --- a/reactos/dll/win32/kernel32/file/copy.c +++ b/reactos/dll/win32/kernel32/file/copy.c @@ -15,7 +15,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/create.c b/reactos/dll/win32/kernel32/file/create.c index e7e67769d18..cead6ec10de 100644 --- a/reactos/dll/win32/kernel32/file/create.c +++ b/reactos/dll/win32/kernel32/file/create.c @@ -17,7 +17,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include #define SYMLINK_FLAG_RELATIVE 1 diff --git a/reactos/dll/win32/kernel32/file/curdir.c b/reactos/dll/win32/kernel32/file/curdir.c index 59a6d03c318..041d96380be 100644 --- a/reactos/dll/win32/kernel32/file/curdir.c +++ b/reactos/dll/win32/kernel32/file/curdir.c @@ -19,7 +19,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBAL VARIABLES **********************************************************/ diff --git a/reactos/dll/win32/kernel32/file/delete.c b/reactos/dll/win32/kernel32/file/delete.c index e9b1f902d2d..1de7ecff58e 100644 --- a/reactos/dll/win32/kernel32/file/delete.c +++ b/reactos/dll/win32/kernel32/file/delete.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/deviceio.c b/reactos/dll/win32/kernel32/file/deviceio.c index 03e21d0157a..11d7f52e5f5 100644 --- a/reactos/dll/win32/kernel32/file/deviceio.c +++ b/reactos/dll/win32/kernel32/file/deviceio.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* diff --git a/reactos/dll/win32/kernel32/file/dir.c b/reactos/dll/win32/kernel32/file/dir.c index 43f86509d55..11bbeb2811c 100644 --- a/reactos/dll/win32/kernel32/file/dir.c +++ b/reactos/dll/win32/kernel32/file/dir.c @@ -18,7 +18,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include UNICODE_STRING DllDirectory = {0, 0, NULL}; diff --git a/reactos/dll/win32/kernel32/file/dosdev.c b/reactos/dll/win32/kernel32/file/dosdev.c index 781b1570866..6d37aabaec4 100644 --- a/reactos/dll/win32/kernel32/file/dosdev.c +++ b/reactos/dll/win32/kernel32/file/dosdev.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/file.c b/reactos/dll/win32/kernel32/file/file.c index 3f2f4e8eaec..4f33b8e98c2 100644 --- a/reactos/dll/win32/kernel32/file/file.c +++ b/reactos/dll/win32/kernel32/file/file.c @@ -15,7 +15,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBALS ******************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/find.c b/reactos/dll/win32/kernel32/file/find.c index 64a6ccb1357..75efdfd5439 100644 --- a/reactos/dll/win32/kernel32/file/find.c +++ b/reactos/dll/win32/kernel32/file/find.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* TYPES ********************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/hardlink.c b/reactos/dll/win32/kernel32/file/hardlink.c index 22a90003aa7..4a0f82dedfe 100644 --- a/reactos/dll/win32/kernel32/file/hardlink.c +++ b/reactos/dll/win32/kernel32/file/hardlink.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/iocompl.c b/reactos/dll/win32/kernel32/file/iocompl.c index 229a54e511e..2f55462fad1 100644 --- a/reactos/dll/win32/kernel32/file/iocompl.c +++ b/reactos/dll/win32/kernel32/file/iocompl.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* diff --git a/reactos/dll/win32/kernel32/file/lfile.c b/reactos/dll/win32/kernel32/file/lfile.c index e973d513d09..2f93f79cdab 100644 --- a/reactos/dll/win32/kernel32/file/lfile.c +++ b/reactos/dll/win32/kernel32/file/lfile.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* diff --git a/reactos/dll/win32/kernel32/file/lock.c b/reactos/dll/win32/kernel32/file/lock.c index 1ced1b12e8c..157fae6265d 100644 --- a/reactos/dll/win32/kernel32/file/lock.c +++ b/reactos/dll/win32/kernel32/file/lock.c @@ -16,7 +16,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/mailslot.c b/reactos/dll/win32/kernel32/file/mailslot.c index e4aca216a71..2cad61d0743 100644 --- a/reactos/dll/win32/kernel32/file/mailslot.c +++ b/reactos/dll/win32/kernel32/file/mailslot.c @@ -13,7 +13,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/move.c b/reactos/dll/win32/kernel32/file/move.c index 4c8959e8d70..b1ff047e6da 100644 --- a/reactos/dll/win32/kernel32/file/move.c +++ b/reactos/dll/win32/kernel32/file/move.c @@ -19,7 +19,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBALS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/npipe.c b/reactos/dll/win32/kernel32/file/npipe.c index ef867a74c02..f7678420d38 100644 --- a/reactos/dll/win32/kernel32/file/npipe.c +++ b/reactos/dll/win32/kernel32/file/npipe.c @@ -13,7 +13,7 @@ #define NDEBUG //#define USING_PROPER_NPFS_WAIT_SEMANTICS -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/pipe.c b/reactos/dll/win32/kernel32/file/pipe.c index fac8693ad59..c6254501ec1 100644 --- a/reactos/dll/win32/kernel32/file/pipe.c +++ b/reactos/dll/win32/kernel32/file/pipe.c @@ -13,7 +13,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBALS ******************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/rw.c b/reactos/dll/win32/kernel32/file/rw.c index 8b85f572303..91bed98e1ba 100644 --- a/reactos/dll/win32/kernel32/file/rw.c +++ b/reactos/dll/win32/kernel32/file/rw.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/tape.c b/reactos/dll/win32/kernel32/file/tape.c index 33204674f9a..90b7461a91c 100644 --- a/reactos/dll/win32/kernel32/file/tape.c +++ b/reactos/dll/win32/kernel32/file/tape.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/volume.c b/reactos/dll/win32/kernel32/file/volume.c index 138b6de3b55..4966ac2f1de 100644 --- a/reactos/dll/win32/kernel32/file/volume.c +++ b/reactos/dll/win32/kernel32/file/volume.c @@ -22,7 +22,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include #define MAX_DOS_DRIVES 26 diff --git a/reactos/dll/win32/kernel32/include/debug.h b/reactos/dll/win32/kernel32/include/debug.h deleted file mode 100644 index a2e52aaba9d..00000000000 --- a/reactos/dll/win32/kernel32/include/debug.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _KERNEL32_INCLUDE_DEBUG_H -#define _KERNEL32_INCLUDE_DEBUG_H - -#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented\n",__FUNCTION__,__FILE__,__LINE__); - -#ifdef NDEBUG -#ifdef __GNUC__ -#define DPRINT(args...) -#else -#define DPRINT -#endif -#define CHECKPOINT -#else -#define DPRINT(...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(__VA_ARGS__); } while(0); -#define CHECKPOINT do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0); -#endif - -#ifdef ASSERT -#undef ASSERT -#define ASSERT(x) do { if(!x) RtlAssert("#x", __FILE__,__LINE__, ""); } while(0); -#endif -#define DPRINT1(...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(__VA_ARGS__); } while(0); -#define CHECKPOINT1 do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0); - -#endif /* ndef _KERNEL32_INCLUDE_DEBUG_H */ diff --git a/reactos/dll/win32/kernel32/mem/global.c b/reactos/dll/win32/kernel32/mem/global.c index f52f8c6f9c5..22e09be808c 100644 --- a/reactos/dll/win32/kernel32/mem/global.c +++ b/reactos/dll/win32/kernel32/mem/global.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* TYPES *********************************************************************/ diff --git a/reactos/dll/win32/kernel32/mem/heap.c b/reactos/dll/win32/kernel32/mem/heap.c index 00af58dfd5e..0ab63f255bf 100644 --- a/reactos/dll/win32/kernel32/mem/heap.c +++ b/reactos/dll/win32/kernel32/mem/heap.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS ***************************************************************/ diff --git a/reactos/dll/win32/kernel32/mem/isbad.c b/reactos/dll/win32/kernel32/mem/isbad.c index c3780aad9bf..7472ec842b5 100644 --- a/reactos/dll/win32/kernel32/mem/isbad.c +++ b/reactos/dll/win32/kernel32/mem/isbad.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "debug.h" +#include extern SYSTEM_BASIC_INFORMATION BaseCachedSysInfo; diff --git a/reactos/dll/win32/kernel32/mem/local.c b/reactos/dll/win32/kernel32/mem/local.c index 4cef262b1ac..1e9ce729c03 100644 --- a/reactos/dll/win32/kernel32/mem/local.c +++ b/reactos/dll/win32/kernel32/mem/local.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* TYPES *********************************************************************/ diff --git a/reactos/dll/win32/kernel32/mem/procmem.c b/reactos/dll/win32/kernel32/mem/procmem.c index 28539c708ed..15466f16e39 100644 --- a/reactos/dll/win32/kernel32/mem/procmem.c +++ b/reactos/dll/win32/kernel32/mem/procmem.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/mem/resnotify.c b/reactos/dll/win32/kernel32/mem/resnotify.c index 0be8294910e..68b11c6c38f 100644 --- a/reactos/dll/win32/kernel32/mem/resnotify.c +++ b/reactos/dll/win32/kernel32/mem/resnotify.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/mem/section.c b/reactos/dll/win32/kernel32/mem/section.c index 6f944b8ca4d..43ece5687cc 100644 --- a/reactos/dll/win32/kernel32/mem/section.c +++ b/reactos/dll/win32/kernel32/mem/section.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/mem/virtual.c b/reactos/dll/win32/kernel32/mem/virtual.c index 39e1a7ff7b2..6caf2573bad 100644 --- a/reactos/dll/win32/kernel32/mem/virtual.c +++ b/reactos/dll/win32/kernel32/mem/virtual.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/actctx.c b/reactos/dll/win32/kernel32/misc/actctx.c index db46c9b59b9..71adc6b9bf3 100644 --- a/reactos/dll/win32/kernel32/misc/actctx.c +++ b/reactos/dll/win32/kernel32/misc/actctx.c @@ -1,7 +1,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include #define ACTCTX_FLAGS_ALL (\ ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID |\ diff --git a/reactos/dll/win32/kernel32/misc/atom.c b/reactos/dll/win32/kernel32/misc/atom.c index c88a4ca66dc..f719af5ef88 100644 --- a/reactos/dll/win32/kernel32/misc/atom.c +++ b/reactos/dll/win32/kernel32/misc/atom.c @@ -10,7 +10,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBALS *******************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/chartype.c b/reactos/dll/win32/kernel32/misc/chartype.c index da917c45fa6..a4d61117806 100644 --- a/reactos/dll/win32/kernel32/misc/chartype.c +++ b/reactos/dll/win32/kernel32/misc/chartype.c @@ -13,7 +13,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ diff --git a/reactos/dll/win32/kernel32/misc/comm.c b/reactos/dll/win32/kernel32/misc/comm.c index f7af83a0c8f..f48d4fc36f6 100644 --- a/reactos/dll/win32/kernel32/misc/comm.c +++ b/reactos/dll/win32/kernel32/misc/comm.c @@ -41,7 +41,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* BUILDCOMMDCB & BUILDCOMMDCBANDTIMEOUTS */ diff --git a/reactos/dll/win32/kernel32/misc/computername.c b/reactos/dll/win32/kernel32/misc/computername.c index b2cd61f34f7..94b69d6bd22 100644 --- a/reactos/dll/win32/kernel32/misc/computername.c +++ b/reactos/dll/win32/kernel32/misc/computername.c @@ -29,7 +29,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/console.c b/reactos/dll/win32/kernel32/misc/console.c index 22b9215d55e..fb8df7b31fa 100644 --- a/reactos/dll/win32/kernel32/misc/console.c +++ b/reactos/dll/win32/kernel32/misc/console.c @@ -17,7 +17,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); diff --git a/reactos/dll/win32/kernel32/misc/dllmain.c b/reactos/dll/win32/kernel32/misc/dllmain.c index 8ad2e057edb..c886f706d61 100644 --- a/reactos/dll/win32/kernel32/misc/dllmain.c +++ b/reactos/dll/win32/kernel32/misc/dllmain.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBALS *******************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/env.c b/reactos/dll/win32/kernel32/misc/env.c index 5ecc235d3d2..b5aa8c5e6cb 100644 --- a/reactos/dll/win32/kernel32/misc/env.c +++ b/reactos/dll/win32/kernel32/misc/env.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ******************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/error.c b/reactos/dll/win32/kernel32/misc/error.c index 22bce08cc56..654300d6676 100644 --- a/reactos/dll/win32/kernel32/misc/error.c +++ b/reactos/dll/win32/kernel32/misc/error.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* diff --git a/reactos/dll/win32/kernel32/misc/errormsg.c b/reactos/dll/win32/kernel32/misc/errormsg.c index e9b6c332e9f..a1f336a6a46 100644 --- a/reactos/dll/win32/kernel32/misc/errormsg.c +++ b/reactos/dll/win32/kernel32/misc/errormsg.c @@ -28,7 +28,7 @@ #define NDEBUG -#include "../include/debug.h" +#include #include "wine/unicode.h" #define TRACE DPRINT diff --git a/reactos/dll/win32/kernel32/misc/handle.c b/reactos/dll/win32/kernel32/misc/handle.c index f32fd094a7b..1a61ba19043 100644 --- a/reactos/dll/win32/kernel32/misc/handle.c +++ b/reactos/dll/win32/kernel32/misc/handle.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBALS *******************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/lang.c b/reactos/dll/win32/kernel32/misc/lang.c index f1912e0cc84..ecc2784aa1f 100644 --- a/reactos/dll/win32/kernel32/misc/lang.c +++ b/reactos/dll/win32/kernel32/misc/lang.c @@ -18,7 +18,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FIXME: these are included in winnls.h, however including this file causes alot of conflicting type errors. */ diff --git a/reactos/dll/win32/kernel32/misc/ldr.c b/reactos/dll/win32/kernel32/misc/ldr.c index cb8f32d1f56..c0a773d5373 100644 --- a/reactos/dll/win32/kernel32/misc/ldr.c +++ b/reactos/dll/win32/kernel32/misc/ldr.c @@ -10,7 +10,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include typedef struct tagLOADPARMS32 { LPSTR lpEnvAddress; diff --git a/reactos/dll/win32/kernel32/misc/lzexpand_main.c b/reactos/dll/win32/kernel32/misc/lzexpand_main.c index 13487290938..dd3d70d85ee 100644 --- a/reactos/dll/win32/kernel32/misc/lzexpand_main.c +++ b/reactos/dll/win32/kernel32/misc/lzexpand_main.c @@ -26,7 +26,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include #include "lzexpand.h" #define HFILE_ERROR ((HFILE)-1) diff --git a/reactos/dll/win32/kernel32/misc/nls.c b/reactos/dll/win32/kernel32/misc/nls.c index 607cf8d97e4..22c28f22a8b 100644 --- a/reactos/dll/win32/kernel32/misc/nls.c +++ b/reactos/dll/win32/kernel32/misc/nls.c @@ -16,7 +16,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBAL VARIABLES ***********************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/perfcnt.c b/reactos/dll/win32/kernel32/misc/perfcnt.c index 184a3ee64e4..e60abbc1234 100644 --- a/reactos/dll/win32/kernel32/misc/perfcnt.c +++ b/reactos/dll/win32/kernel32/misc/perfcnt.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/profile.c b/reactos/dll/win32/kernel32/misc/profile.c index c9ec9377cb3..82caaba3236 100644 --- a/reactos/dll/win32/kernel32/misc/profile.c +++ b/reactos/dll/win32/kernel32/misc/profile.c @@ -22,7 +22,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include static const char bom_utf8[] = {0xEF,0xBB,0xBF}; diff --git a/reactos/dll/win32/kernel32/misc/recovery.c b/reactos/dll/win32/kernel32/misc/recovery.c index eb5500d9b5d..723a0d240d0 100644 --- a/reactos/dll/win32/kernel32/misc/recovery.c +++ b/reactos/dll/win32/kernel32/misc/recovery.c @@ -13,7 +13,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* PUBLIC FUNCTIONS ***********************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/res.c b/reactos/dll/win32/kernel32/misc/res.c index 3a0eb2d3e54..06fdd280478 100644 --- a/reactos/dll/win32/kernel32/misc/res.c +++ b/reactos/dll/win32/kernel32/misc/res.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include #define STUB \ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ diff --git a/reactos/dll/win32/kernel32/misc/stubs.c b/reactos/dll/win32/kernel32/misc/stubs.c index 8a6c29c5814..835b24d8534 100644 --- a/reactos/dll/win32/kernel32/misc/stubs.c +++ b/reactos/dll/win32/kernel32/misc/stubs.c @@ -6,7 +6,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include #define STUB \ diff --git a/reactos/dll/win32/kernel32/misc/sysinfo.c b/reactos/dll/win32/kernel32/misc/sysinfo.c index 20986fd1031..1a1f020008f 100644 --- a/reactos/dll/win32/kernel32/misc/sysinfo.c +++ b/reactos/dll/win32/kernel32/misc/sysinfo.c @@ -15,7 +15,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include #define PV_NT351 0x00030033 diff --git a/reactos/dll/win32/kernel32/misc/time.c b/reactos/dll/win32/kernel32/misc/time.c index 90733f0e591..8cbbb95b1af 100644 --- a/reactos/dll/win32/kernel32/misc/time.c +++ b/reactos/dll/win32/kernel32/misc/time.c @@ -15,7 +15,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* TYPES *********************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/timerqueue.c b/reactos/dll/win32/kernel32/misc/timerqueue.c index 0803f572033..894524744de 100644 --- a/reactos/dll/win32/kernel32/misc/timerqueue.c +++ b/reactos/dll/win32/kernel32/misc/timerqueue.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/toolhelp.c b/reactos/dll/win32/kernel32/misc/toolhelp.c index 0244be95e90..1cac914d34a 100644 --- a/reactos/dll/win32/kernel32/misc/toolhelp.c +++ b/reactos/dll/win32/kernel32/misc/toolhelp.c @@ -21,7 +21,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* INTERNAL DEFINITIONS *******************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/utils.c b/reactos/dll/win32/kernel32/misc/utils.c index 75876a6adcc..6048b15fb76 100644 --- a/reactos/dll/win32/kernel32/misc/utils.c +++ b/reactos/dll/win32/kernel32/misc/utils.c @@ -14,7 +14,7 @@ #endif #define NDEBUG -#include "../include/debug.h" +#include /* GLOBALS ******************************************************************/ diff --git a/reactos/dll/win32/kernel32/misc/version.c b/reactos/dll/win32/kernel32/misc/version.c index 2f8db0815cb..a56eea9f574 100644 --- a/reactos/dll/win32/kernel32/misc/version.c +++ b/reactos/dll/win32/kernel32/misc/version.c @@ -13,7 +13,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ******************************************************************/ diff --git a/reactos/dll/win32/kernel32/process/cmdline.c b/reactos/dll/win32/kernel32/process/cmdline.c index deb5d4e2bac..1803cbdfc75 100644 --- a/reactos/dll/win32/kernel32/process/cmdline.c +++ b/reactos/dll/win32/kernel32/process/cmdline.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBALS ******************************************************************/ diff --git a/reactos/dll/win32/kernel32/process/job.c b/reactos/dll/win32/kernel32/process/job.c index a054222e199..853c408328a 100644 --- a/reactos/dll/win32/kernel32/process/job.c +++ b/reactos/dll/win32/kernel32/process/job.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/process/proc.c b/reactos/dll/win32/kernel32/process/proc.c index f98f15c0c3e..06e5f21a35e 100644 --- a/reactos/dll/win32/kernel32/process/proc.c +++ b/reactos/dll/win32/kernel32/process/proc.c @@ -14,7 +14,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* GLOBALS *******************************************************************/ diff --git a/reactos/dll/win32/kernel32/process/procsup.c b/reactos/dll/win32/kernel32/process/procsup.c index bff53b778ca..a0b02184ddc 100644 --- a/reactos/dll/win32/kernel32/process/procsup.c +++ b/reactos/dll/win32/kernel32/process/procsup.c @@ -12,7 +12,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include #define CMD_STRING L"cmd /c " diff --git a/reactos/dll/win32/kernel32/synch/condvar.c b/reactos/dll/win32/kernel32/synch/condvar.c index 62bb676bcfb..6eebbccff90 100644 --- a/reactos/dll/win32/kernel32/synch/condvar.c +++ b/reactos/dll/win32/kernel32/synch/condvar.c @@ -7,7 +7,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FIXME: Move these RTL declarations to the NDK */ NTSTATUS diff --git a/reactos/dll/win32/kernel32/synch/critical.c b/reactos/dll/win32/kernel32/synch/critical.c index a853180acec..474a5d6c543 100644 --- a/reactos/dll/win32/kernel32/synch/critical.c +++ b/reactos/dll/win32/kernel32/synch/critical.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/synch/event.c b/reactos/dll/win32/kernel32/synch/event.c index b629d087ff7..6a02b469cc1 100644 --- a/reactos/dll/win32/kernel32/synch/event.c +++ b/reactos/dll/win32/kernel32/synch/event.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/synch/mutex.c b/reactos/dll/win32/kernel32/synch/mutex.c index ec4e8c86c34..69dca56555c 100644 --- a/reactos/dll/win32/kernel32/synch/mutex.c +++ b/reactos/dll/win32/kernel32/synch/mutex.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/synch/sem.c b/reactos/dll/win32/kernel32/synch/sem.c index 89cf6149b14..6b859311f4f 100644 --- a/reactos/dll/win32/kernel32/synch/sem.c +++ b/reactos/dll/win32/kernel32/synch/sem.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/synch/timer.c b/reactos/dll/win32/kernel32/synch/timer.c index f4610a315e3..fd21a1be57f 100644 --- a/reactos/dll/win32/kernel32/synch/timer.c +++ b/reactos/dll/win32/kernel32/synch/timer.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/synch/wait.c b/reactos/dll/win32/kernel32/synch/wait.c index af61473bcc3..93957107cff 100644 --- a/reactos/dll/win32/kernel32/synch/wait.c +++ b/reactos/dll/win32/kernel32/synch/wait.c @@ -11,7 +11,7 @@ #include #define NDEBUG -#include "debug.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/kernel32/thread/fiber.c b/reactos/dll/win32/kernel32/thread/fiber.c index f8f0edc55cf..56fe5898b49 100644 --- a/reactos/dll/win32/kernel32/thread/fiber.c +++ b/reactos/dll/win32/kernel32/thread/fiber.c @@ -10,7 +10,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include typedef struct _FIBER /* Field offsets: */ { /* 32 bit 64 bit */ diff --git a/reactos/dll/win32/kernel32/thread/fls.c b/reactos/dll/win32/kernel32/thread/fls.c index 619a5fc04b4..255707ad4cf 100644 --- a/reactos/dll/win32/kernel32/thread/fls.c +++ b/reactos/dll/win32/kernel32/thread/fls.c @@ -13,7 +13,7 @@ #include -#include "../include/debug.h" +#include /* * @unimplemented diff --git a/reactos/dll/win32/kernel32/thread/thread.c b/reactos/dll/win32/kernel32/thread/thread.c index c10db83b9f4..2a819aa5e2c 100644 --- a/reactos/dll/win32/kernel32/thread/thread.c +++ b/reactos/dll/win32/kernel32/thread/thread.c @@ -13,7 +13,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FIXME: NDK */ #define HIGH_PRIORITY 31 diff --git a/reactos/dll/win32/kernel32/thread/tls.c b/reactos/dll/win32/kernel32/thread/tls.c index 404af6046a0..f09a2f60931 100644 --- a/reactos/dll/win32/kernel32/thread/tls.c +++ b/reactos/dll/win32/kernel32/thread/tls.c @@ -15,7 +15,7 @@ #include #define NDEBUG -#include "../include/debug.h" +#include /* FUNCTIONS *****************************************************************/