From cfbb73479921df36e6dcf1f04f1da98d35c1261f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Tue, 8 Mar 2022 00:42:06 +0100
Subject: [PATCH] [NTOS] Remove ROS-specific __NTOSKRNL__

See https://reactos.org/archives/public/ros-kernel/2004-June/003878.html
> In the source files one set of headers is included if
__NTDLL__ is defines and onother set if __NTOSKRNL__ is defines (dirty
workaround for our messy headers).
---
 ntoskrnl/include/internal/kd.h                | 3 ++-
 ntoskrnl/ntos.cmake                           | 1 -
 sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt | 2 +-
 sdk/lib/drivers/rtlver/CMakeLists.txt         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h
index 6a509de9db0..b7cad5dc8bb 100644
--- a/ntoskrnl/include/internal/kd.h
+++ b/ntoskrnl/include/internal/kd.h
@@ -28,7 +28,8 @@ KdPortPutByteEx(
 );
 
 /* SYMBOL ROUTINES **********************************************************/
-#ifdef __NTOSKRNL__
+
+#ifdef _NTOSKRNL_
 
 #ifdef KDBG
 # define KdbInit()                                  KdbpCliInit()
diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake
index 31d65884253..eb6cfa817c3 100644
--- a/ntoskrnl/ntos.cmake
+++ b/ntoskrnl/ntos.cmake
@@ -9,7 +9,6 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
 
 add_definitions(
-    -D__NTOSKRNL__
     -D_NTOSKRNL_
     -D_NTSYSTEM_
     -D_IN_KERNEL_
diff --git a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt
index 934b4bc2054..ae8970d20cd 100644
--- a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt
+++ b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt
@@ -1,7 +1,7 @@
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_)
+add_definitions(-DUNICODE -D_UNICODE -D_NTOSKRNL_ -D_NTSYSTEM_)
 
 include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/rtl)
 
diff --git a/sdk/lib/drivers/rtlver/CMakeLists.txt b/sdk/lib/drivers/rtlver/CMakeLists.txt
index d568968da19..357b2a7ab4b 100644
--- a/sdk/lib/drivers/rtlver/CMakeLists.txt
+++ b/sdk/lib/drivers/rtlver/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_)
+add_definitions(-DUNICODE -D_UNICODE -D_NTOSKRNL_ -D_NTSYSTEM_)
 
 list(APPEND SOURCE
     rtl.c)