From c1c6314688c1dd2d1a3e217efaa6e9f9dbc08a6b Mon Sep 17 00:00:00 2001
From: Stefan Ginsberg <stefanginsberg@gmail.com>
Date: Wed, 9 Sep 2015 16:06:38 +0000
Subject: [PATCH] - Consistently check for KDBG via if-def, not if (like we do
 for _WINKD_), everywhere.

svn path=/trunk/; revision=69152
---
 reactos/include/reactos/kdros.h        | 2 +-
 reactos/ntoskrnl/include/internal/kd.h | 2 +-
 reactos/ntoskrnl/kd/kdmain.c           | 2 +-
 reactos/ntoskrnl/mm/ARM3/expool.c      | 8 ++++----
 reactos/win32ss/user/ntuser/main.c     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/reactos/include/reactos/kdros.h b/reactos/include/reactos/kdros.h
index bcc71ff16a4..94aa5adc8fe 100644
--- a/reactos/include/reactos/kdros.h
+++ b/reactos/include/reactos/kdros.h
@@ -45,7 +45,7 @@ KdRosDumpStackFrames(
     KdSystemDebugControl('DsoR', Backtrace, Count, 0, 0, 0, 0);
 }
 
-#if KDBG
+#if defined(KDBG)
 FORCEINLINE
 VOID
 KdRosRegisterCliCallback(
diff --git a/reactos/ntoskrnl/include/internal/kd.h b/reactos/ntoskrnl/include/internal/kd.h
index f1bff1d7274..d3daabfeb7c 100644
--- a/reactos/ntoskrnl/include/internal/kd.h
+++ b/reactos/ntoskrnl/include/internal/kd.h
@@ -36,7 +36,7 @@ KdPortPutByteEx(
 
 #if defined(KDBG) || DBG
 
-#if KDBG
+#if defined(KDBG)
 typedef
 BOOLEAN
 (NTAPI *PKDBG_CLI_ROUTINE)(
diff --git a/reactos/ntoskrnl/kd/kdmain.c b/reactos/ntoskrnl/kd/kdmain.c
index 1b0a0e5ecb6..5d61db4fec8 100644
--- a/reactos/ntoskrnl/kd/kdmain.c
+++ b/reactos/ntoskrnl/kd/kdmain.c
@@ -100,7 +100,7 @@ KdpServiceDispatcher(ULONG Service,
             break;
         }
 
-#if KDBG
+#if defined(KDBG)
         /* Register KDBG CLI callback */
         case 'RbdK':
         {
diff --git a/reactos/ntoskrnl/mm/ARM3/expool.c b/reactos/ntoskrnl/mm/ARM3/expool.c
index cb8f532176d..25d3b41c6d2 100644
--- a/reactos/ntoskrnl/mm/ARM3/expool.c
+++ b/reactos/ntoskrnl/mm/ARM3/expool.c
@@ -464,7 +464,7 @@ ExpComputePartialHashForAddress(IN PVOID BaseAddress)
 
 VOID
 NTAPI
-INIT_FUNCTION
+INIT_SECTION
 ExpSeedHotTags(VOID)
 {
     ULONG i, Key, Hash, Index;
@@ -794,7 +794,7 @@ ExpInsertPoolTracker(IN ULONG Key,
 
 VOID
 NTAPI
-INIT_FUNCTION
+INIT_SECTION
 ExInitializePoolDescriptor(IN PPOOL_DESCRIPTOR PoolDescriptor,
                            IN POOL_TYPE PoolType,
                            IN ULONG PoolIndex,
@@ -845,7 +845,7 @@ ExInitializePoolDescriptor(IN PPOOL_DESCRIPTOR PoolDescriptor,
 
 VOID
 NTAPI
-INIT_FUNCTION
+INIT_SECTION
 InitializePool(IN POOL_TYPE PoolType,
                IN ULONG Threshold)
 {
@@ -2669,7 +2669,7 @@ ExAllocatePoolWithQuotaTag(IN POOL_TYPE PoolType,
     return Buffer;
 }
 
-#if DBG && KDBG
+#if DBG && defined(KDBG)
 
 BOOLEAN
 ExpKdbgExtPool(
diff --git a/reactos/win32ss/user/ntuser/main.c b/reactos/win32ss/user/ntuser/main.c
index f5fa9818178..9dd8cfe2f54 100644
--- a/reactos/win32ss/user/ntuser/main.c
+++ b/reactos/win32ss/user/ntuser/main.c
@@ -255,7 +255,7 @@ InitProcessCallback(PEPROCESS Process)
 
 #if DBG
     DbgInitDebugChannels();
-#if KDBG
+#if defined(KDBG)
     KdRosRegisterCliCallback(DbgGdiKdbgCliCallback);
 #endif
 #endif
-- 
2.17.1