6 modified files
reactos/include/ntdll
diff -u -r1.27 -r1.28
--- ldr.h 19 Nov 2004 01:30:34 -0000 1.27
+++ ldr.h 9 Dec 2004 14:20:06 -0000 1.28
@@ -68,7 +68,7 @@
HANDLE SectionHandle;
ULONG CheckSum;
ULONG TimeDateStamp;
-#ifdef KDBG
+#if defined(DBG) || defined(KDBG)
IMAGE_SYMBOL_INFO SymbolInfo;
#endif /* KDBG */
} LDR_MODULE, *PLDR_MODULE;
@@ -85,7 +85,7 @@
#define RVA(m, b) ((ULONG)b + m)
-#ifdef KDBG
+#if defined(KDBG) || defined(DBG)
VOID
LdrpLoadUserModuleSymbols(PLDR_MODULE LdrModule);
reactos/ntoskrnl
diff -u -r1.157 -r1.158
--- Makefile 3 Dec 2004 23:37:43 -0000 1.157
+++ Makefile 9 Dec 2004 14:20:06 -0000 1.158
@@ -16,6 +16,13 @@
CONFIG :=
+ifeq ($(DBG), 1)
+DBG_OR_KDBG := 1
+endif
+ifeq ($(KDBG), 1)
+DBG_OR_KDBG := 1
+endif
+
LINKER_SCRIPT := ntoskrnl.lnk
STRIP_FLAGS := -Wl,-s
@@ -27,7 +34,7 @@
ifeq ($(KDBG), 1)
OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \
- dbg/i386/kdb_help.o dbg/kdb_stabs.o dbg/kdb_symbols.o dbg/profile.o \
+ dbg/i386/kdb_help.o dbg/profile.o \
../dk/w32/lib/libkjs.a dbg/i386/i386-dis.o
CFLAGS_KDBG := -I../lib/kjs/include
preall: all
@@ -37,6 +44,9 @@
else
OBJECTS_KDBG :=
endif
+ifeq ($(DBG_OR_KDBG), 1)
+OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_stabs.o dbg/kdb_symbols.o
+endif
TARGET_ASFLAGS = -I./include
TARGET_CFLAGS = -I./include $(CFLAGS_KDBG) -Wall -Werror $(CFLAGS_OPT)
reactos/ntoskrnl/include/internal
diff -u -r1.28 -r1.29
--- kd.h 20 Nov 2004 22:21:35 -0000 1.28
+++ kd.h 9 Dec 2004 14:20:06 -0000 1.29
@@ -1,4 +1,4 @@
-/* $Id: kd.h,v 1.28 2004/11/20 22:21:35 arty Exp $
+/* $Id: kd.h,v 1.29 2004/12/09 14:20:06 royce Exp $
*
* kernel debugger prototypes
*/
@@ -108,7 +108,7 @@
VOID KdInitializeMda(VOID);
VOID KdPrintMda(PCH pch);
-#ifndef KDBG
+#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)
@@ -160,7 +160,7 @@
PKTRAP_FRAME TrapFrame,
BOOLEAN HandleAlways);
-#endif /* KDBG */
+#endif /* KDBG || DBG */
VOID
DebugLogDumpMessages(VOID);
reactos/ntoskrnl/include/internal
diff -u -r1.16 -r1.17
--- module.h 8 Sep 2002 10:23:23 -0000 1.16
+++ module.h 9 Dec 2004 14:20:06 -0000 1.17
@@ -14,7 +14,7 @@
LIST_ENTRY ListEntry;
PWCH Name;
PIMAGE_OPTIONAL_HEADER OptionalHeader;
-#ifdef KDBG
+#if defined(DBG) || defined(KDBG)
IMAGE_SYMBOL_INFO SymbolInfo;
#endif /* KDBG */
} MODULE_TEXT_SECTION, *PMODULE_TEXT_SECTION;
reactos/ntoskrnl/io
diff -u -r1.55 -r1.56
--- driver.c 7 Nov 2004 21:20:51 -0000 1.55
+++ driver.c 9 Dec 2004 14:20:06 -0000 1.56
@@ -1,4 +1,4 @@
-/* $Id: driver.c,v 1.55 2004/11/07 21:20:51 navaraf Exp $
+/* $Id: driver.c,v 1.56 2004/12/09 14:20:06 royce Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -1237,7 +1237,7 @@
* and symbol files, if the kernel debugger is active
*/
if (_stricmp(Extension, ".exe") && _stricmp(Extension, ".dll")
-#ifdef KDBG
+#if defined(DBG) || defined(KDBG)
&& _stricmp(Extension, ".sym")
#endif
)
reactos/ntoskrnl/ke/i386
diff -u -r1.96 -r1.97
--- exp.c 4 Dec 2004 22:13:09 -0000 1.96
+++ exp.c 9 Dec 2004 14:20:06 -0000 1.97
@@ -124,7 +124,7 @@
/* FUNCTIONS ****************************************************************/
-#ifdef KDBG
+#if defined(DBG) || defined(KDBG)
BOOLEAN STDCALL
KeRosPrintAddress(PVOID address)
{
CVSspam 0.2.8