[ros-diffs] [gvg] 13849: Fix compilation with DBG := 1 and KDBG := 0

Fix compilation with DBG := 1 and KDBG := 0
Modified: trunk/reactos/ntoskrnl/include/internal/kd.h
Modified: trunk/reactos/ntoskrnl/ke/main.c
  _____

Modified: trunk/reactos/ntoskrnl/include/internal/kd.h
--- trunk/reactos/ntoskrnl/include/internal/kd.h	2005-03-06
07:38:54 UTC (rev 13848)
+++ trunk/reactos/ntoskrnl/include/internal/kd.h	2005-03-06
10:44:38 UTC (rev 13849)
@@ -107,7 +107,6 @@

#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 @@
 # 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 @@
 /*#define KDB_CREATE_THREAD_HOOK(CONTEXT) \
         KdbCreateThreadHook(CONTEXT)
 */
-VOID
-KdbDeleteProcessHook(IN PEPROCESS Process);

VOID
 KdbSymLoadUserModuleSymbols(IN PLDR_MODULE LdrModule);
@@ -159,7 +155,15 @@

#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);

#endif /* __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H */
  _____

Modified: trunk/reactos/ntoskrnl/ke/main.c
--- trunk/reactos/ntoskrnl/ke/main.c	2005-03-06 07:38:54 UTC (rev
13848)
+++ trunk/reactos/ntoskrnl/ke/main.c	2005-03-06 10:44:38 UTC (rev
13849)
@@ -696,10 +696,12 @@

KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE);
   }

+#if defined(KDBG)
+  KdbInit();
+#endif /* KDBG */
 #if defined(KDBG) || defined(DBG)
-  KdbInit();
   KdbInitProfiling2();
-#endif /* KDBG */
+#endif /* KDBG || DBG */

/* On the assumption that we can now access disks start up the debug
    * logger thread */