Fix compilation with DBG := 1 and KDBG := 0

svn path=/trunk/; revision=13849

diff --git a/reactos/ntoskrnl/include/internal/kd.h b/reactos/ntoskrnl/include/internal/kd.h
index f61149d..4e773b4 100644 (file)
--- a/reactos/ntoskrnl/include/internal/kd.h
+++ b/reactos/ntoskrnl/include/internal/kd.h
@@ -107,7 +107,6 @@ VOID KdPrintMda(PCH pch);
 
 #if !defined(KDBG) && !defined(DBG)
 # define KDB_LOADUSERMODULE_HOOK(LDRMOD)       do { } while (0)
-# define KDB_DELETEPROCESS_HOOK(PROCESS)       do { } while (0)
 # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0)
 # define KDB_UNLOADDRIVER_HOOK(MODULE)         do { } while (0)
 # define KDB_LOADERINIT_HOOK(NTOS, HAL)                do { } while (0)
@@ -115,7 +114,6 @@ VOID KdPrintMda(PCH pch);
 # define KDB_CREATE_THREAD_HOOK(CONTEXT)       do { } while (0)
 #else
 # define KDB_LOADUSERMODULE_HOOK(LDRMOD)       KdbSymLoadUserModuleSymbols(LDRMOD)
-# define KDB_DELETEPROCESS_HOOK(PROCESS)       KdbDeleteProcessHook(PROCESS)
 # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE)
 # define KDB_UNLOADDRIVER_HOOK(MODULE)         KdbSymUnloadDriverSymbols(MODULE)
 # define KDB_LOADERINIT_HOOK(NTOS, HAL)                KdbSymInit(NTOS, HAL)
@@ -123,8 +121,6 @@ VOID KdPrintMda(PCH pch);
 /*#define KDB_CREATE_THREAD_HOOK(CONTEXT) \
         KdbCreateThreadHook(CONTEXT)
 */
-VOID
-KdbDeleteProcessHook(IN PEPROCESS Process);
 
 VOID
 KdbSymLoadUserModuleSymbols(IN PLDR_MODULE LdrModule);
@@ -159,6 +155,14 @@ KdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
 
 #endif /* KDBG || DBG */
 
+#if !defined(KDBG)
+# define KDB_DELETEPROCESS_HOOK(PROCESS)       do { } while (0)
+#else
+# define KDB_DELETEPROCESS_HOOK(PROCESS)       KdbDeleteProcessHook(PROCESS)
+VOID
+KdbDeleteProcessHook(IN PEPROCESS Process);
+#endif /* KDBG */
+
 VOID
 DebugLogDumpMessages(VOID);
 

diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c
index 572925d..2545534 100644 (file)
--- a/reactos/ntoskrnl/ke/main.c
+++ b/reactos/ntoskrnl/ke/main.c
@@ -696,10 +696,12 @@ ExpInitializeExecutive(VOID)
     KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE);
   }
 
-#if defined(KDBG) || defined(DBG)
+#if defined(KDBG)
   KdbInit();
-  KdbInitProfiling2();
 #endif /* KDBG */
+#if defined(KDBG) || defined(DBG)
+  KdbInitProfiling2();
+#endif /* KDBG || DBG */
 
   /* On the assumption that we can now access disks start up the debug
    * logger thread */