From 13277fb2961d13140185b53f697644667a9964c6 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Wed, 15 Dec 2004 03:00:33 +0000
Subject: [PATCH] change a few #ifdefs to allow loading of SYM files for user
 modules in DBG builds

svn path=/trunk/; revision=12129
---
 reactos/lib/ntdll/ldr/startup.c | 10 +++++-----
 reactos/lib/ntdll/ldr/utils.c   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/reactos/lib/ntdll/ldr/startup.c b/reactos/lib/ntdll/ldr/startup.c
index 4e55e83931e..a88701ea3f5 100644
--- a/reactos/lib/ntdll/ldr/startup.c
+++ b/reactos/lib/ntdll/ldr/startup.c
@@ -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 @@ __true_LdrInitializeThunk (ULONG Unknown1,
        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 @@ __true_LdrInitializeThunk (ULONG Unknown1,
 
        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;
diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index 885be3c726b..c6dcf4a9c96 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -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 @@ static VOID LdrpDetachProcess(BOOL UnloadAll);
 
 /* FUNCTIONS *****************************************************************/
 
-#ifdef KDBG
+#if defined(DBG) || defined(KDBG)
 
 VOID
 LdrpLoadUserModuleSymbols(PLDR_MODULE LdrModule)
@@ -82,7 +82,7 @@ LdrpLoadUserModuleSymbols(PLDR_MODULE LdrModule)
     NULL);
 }
 
-#endif /* DBG */
+#endif /* DBG || KDBG */
 
 static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOL Locked)
 {
@@ -2085,9 +2085,9 @@ LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
             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);
-- 
2.17.1