reactos/lib/ntdll/ldr
diff -u -r1.59 -r1.60
--- startup.c 21 Nov 2004 21:09:42 -0000 1.59
+++ startup.c 15 Dec 2004 03:00:33 -0000 1.60
@@ -1,4 +1,4 @@
-/* $Id: startup.c,v 1.59 2004/11/21 21:09:42 weiden Exp $
+/* $Id: startup.c,v 1.60 2004/12/15 03:00:33 royce Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -375,11 +375,11 @@
InsertTailList(&Peb->Ldr->InInitializationOrderModuleList,
&NtModule->InInitializationOrderModuleList);
-#ifdef KDBG
+#if defined(DBG) || defined(KDBG)
LdrpLoadUserModuleSymbols(NtModule);
-#endif /* DBG */
+#endif /* DBG || KDBG */
/* add entry for executable (becomes first list entry) */
ExeModule = (PLDR_MODULE)RtlAllocateHeap (Peb->ProcessHeap,
@@ -423,11 +423,11 @@
LdrpInitLoader();
-#ifdef KDBG
+#if defined(DBG) || defined(KDBG)
LdrpLoadUserModuleSymbols(ExeModule);
-#endif /* DBG */
+#endif /* DBG || KDBG */
EntryPoint = LdrPEStartup((PVOID)ImageBase, NULL, NULL, NULL);
ExeModule->EntryPoint = (ULONG)EntryPoint;
reactos/lib/ntdll/ldr
diff -u -r1.101 -r1.102
--- utils.c 19 Nov 2004 01:30:35 -0000 1.101
+++ utils.c 15 Dec 2004 03:00:33 -0000 1.102
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.101 2004/11/19 01:30:35 weiden Exp $
+/* $Id: utils.c,v 1.102 2004/12/15 03:00:33 royce Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -68,7 +68,7 @@
/* FUNCTIONS *****************************************************************/
-#ifdef KDBG
+#if defined(DBG) || defined(KDBG)
VOID
LdrpLoadUserModuleSymbols(PLDR_MODULE LdrModule)
@@ -82,7 +82,7 @@
NULL);
}
-#endif /* DBG */
+#endif /* DBG || KDBG */
static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOL Locked)
{
@@ -2085,9 +2085,9 @@
DPRINT1("LdrFixupImports failed for %wZ, status=%x\n", &(*Module)->BaseDllName, Status);
return Status;
}
-#ifdef KDBG
+#if defined(DBG) || defined(KDBG)
LdrpLoadUserModuleSymbols(*Module);
-#endif
+#endif /* DBG || KDBG */
RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);
InsertTailList(&NtCurrentPeb()->Ldr->InInitializationOrderModuleList,
&(*Module)->InInitializationOrderModuleList);