[ros-diffs] [sginsberg] 56090: - Fix DBG macro AGAIN which got broken during the switch to cmake. Checked build: DBG = 1, free build: DBG = 0. Noobs.

Author: sginsberg
Date: Thu Mar  8 09:18:28 2012
New Revision: 56090

URL: http://svn.reactos.org/svn/reactos?rev=56090&view=rev
Log:
- Fix DBG macro AGAIN which got broken during the switch to cmake. Checked build: DBG = 1,
free build: DBG = 0. Noobs.

Modified:
    trunk/reactos/CMakeLists.txt
    trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp
    trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c
    trunk/reactos/hal/halx86/include/halp.h
    trunk/reactos/ntoskrnl/include/internal/spinlock.h
    trunk/reactos/ntoskrnl/ke/amd64/kiinit.c
    trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c
    trunk/reactos/subsystems/win32/win32k/include/win32.h
    trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h
    trunk/reactos/subsystems/win32/win32k/main/dllmain.c
    trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c
    trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c

Modified: trunk/reactos/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=56090&a…
==============================================================================
--- trunk/reactos/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Mar  8 09:18:28 2012
@@ -105,6 +105,8 @@
 
     if(DBG)
         add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE)
+    else
+        add_definitions(-DDBG=0)
     endif()
 
     if(KDBG)

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1]
(original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Thu Mar
 8 09:18:28 2012
@@ -1312,7 +1312,7 @@
     ULONG   countDMA    = ResourceList->NumberOfDmas();
     ULONG   lengthIO    = ResourceList->FindTranslatedPort(0)->u.Port.Length;
 
-#ifdef DBG
+#if DBG
     DPRINT("Starting MPU401 Port 0x%lx",
ResourceList->FindTranslatedPort(0)->u.Port.Start.LowPart);
 #endif
 

Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] Thu Mar  8
09:18:28 2012
@@ -226,7 +226,7 @@
     IN PCHAR AssertText,
     IN ULONG AssertValue)
 {
-#ifdef DBG
+#if DBG
     DbgBreakPoint();
 #endif
 }
@@ -241,7 +241,7 @@
     IN PCCHAR DebugMessage,
     ...)
 {
-#ifdef DBG
+#if DBG
     va_list ap;
 
     if (DebugPrintLevel <=STREAMDEBUG_LEVEL)

Modified: trunk/reactos/hal/halx86/include/halp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?…
==============================================================================
--- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Thu Mar  8 09:18:28 2012
@@ -22,13 +22,13 @@
 #endif
 
 #ifdef CONFIG_SMP
-#ifdef DBG
+#if DBG
 #define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0)
 #else
 #define HAL_BUILD_TYPE 0
 #endif
 #else
-#ifdef DBG
+#if DBG
 #define HAL_BUILD_TYPE ((DBG ? PRCB_BUILD_DEBUG : 0) | PRCB_BUILD_UNIPROCESSOR)
 #else
 #define HAL_BUILD_TYPE 0 | PRCB_BUILD_UNIPROCESSOR

Modified: trunk/reactos/ntoskrnl/include/internal/spinlock.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] Thu Mar  8 09:18:28
2012
@@ -51,7 +51,7 @@
 VOID
 KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock)
 {
-#ifdef DBG
+#if DBG
     /* Make sure that we don't own the lock already */
     if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock)
     {
@@ -63,7 +63,7 @@
     /* Try to acquire the lock */
     while (InterlockedBitTestAndSet((PLONG)SpinLock, 0))
     {
-#if defined(_M_IX86) && defined(DBG)
+#if defined(_M_IX86) && DBG
         /* On x86 debug builds, we use a much slower but useful routine */
         Kii386SpinOnSpinLock(SpinLock, 5);
 #else

Modified: trunk/reactos/ntoskrnl/ke/amd64/kiinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/kiinit.c…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Thu Mar  8 09:18:28 2012
@@ -114,7 +114,7 @@
 #ifndef CONFIG_SMP
     Pcr->Prcb.BuildType |= PRCB_BUILD_UNIPROCESSOR;
 #endif
-#ifdef DBG
+#if DBG
     Pcr->Prcb.BuildType |= PRCB_BUILD_DEBUG;
 #endif
 

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Thu Mar  8
09:18:28 2012
@@ -506,7 +506,7 @@
     IN PCSR_THREAD ThreadData,
     IN PHARDERROR_MSG Message)
 {
-#ifdef DBG
+#if DBG
     PCSR_PROCESS ProcessData = ThreadData->Process;
 #endif
     ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS];

Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Thu Mar  8 09:18:28
2012
@@ -194,12 +194,12 @@
   struct _GDI_POOL *pPoolBrushAttr;
   struct _GDI_POOL *pPoolRgnAttr;
 
-#ifdef DBG
+#if DBG
   BYTE DbgChannelLevel[DbgChCount];
 #endif
 } PROCESSINFO;
 
-#ifdef DBG
+#if DBG
 void NTAPI UserDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments);
 ULONG_PTR NTAPI UserDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult);
 #endif

Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] Thu Mar  8
09:18:28 2012
@@ -27,7 +27,7 @@
 
 */
 
-#ifdef DBG
+#if DBG
 
     typedef struct
     {

Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Mar  8 09:18:28
2012
@@ -30,7 +30,7 @@
 extern UCHAR Win32kSSPT[];
 extern ULONG Win32kNumberOfSysCalls;
 
-#ifdef DBG
+#if DBG
 void
 NTAPI
 DbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments)
@@ -85,7 +85,7 @@
 
         PsSetProcessWin32Process(Process, ppiCurrent);
 
-#ifdef DBG
+#if DBG
         DbgInitDebugChannels();
 #endif
 
@@ -566,7 +566,7 @@
     PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData);
 
     /* Register service hook callbacks */
-#ifdef DBG
+#if DBG
     KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0,
0, 0);
     KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0,
0, 0, 0);
 #endif

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Thu Mar  8
09:18:28 2012
@@ -8,7 +8,7 @@
 
 /** INCLUDES ******************************************************************/
 
-#ifdef DBG
+#if DBG
 #include <win32k.h>
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Thu Mar  8
09:18:28 2012
@@ -1309,7 +1309,7 @@
         }
     }
 
-#ifdef DBG
+#if DBG
 //#ifdef GDI_DEBUG
 	DbgGdiHTIntegrityCheck();
 //#endif