https://git.reactos.org/?p=reactos.git;a=commitdiff;h=033102fdb187a3ebd2e0d7...
commit 033102fdb187a3ebd2e0d7b8fd5a046189715c80 Author: Hervé Poussineau hpoussin@reactos.org AuthorDate: Thu Apr 9 19:47:01 2020 +0200 Commit: Hervé Poussineau hpoussin@reactos.org CommitDate: Thu Apr 9 23:00:57 2020 +0200
[NTOS] Add a #define __ROS_ROSSYM__ when using rossym
Use it where needed. --- ntoskrnl/include/ntoskrnl.h | 2 +- ntoskrnl/mm/ARM3/sysldr.c | 2 +- sdk/lib/rossym/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h index 08afcb5e8cc..c03dc5dff1d 100644 --- a/ntoskrnl/include/ntoskrnl.h +++ b/ntoskrnl/include/ntoskrnl.h @@ -83,7 +83,7 @@ #include <windbgkd.h> #include <wdbgexts.h> #include <kddll.h> -#ifndef _WINKD_ +#ifdef __ROS_ROSSYM__ #include <reactos/rossym.h> #endif
diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index ab6e1165cc1..68b2a126089 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -3259,7 +3259,7 @@ LoaderScan: PspRunLoadImageNotifyRoutines(FileName, NULL, &ImageInfo); }
-#if defined(KDBG) || defined(_WINKD_) +#ifdef __ROS_ROSSYM__ /* MiCacheImageSymbols doesn't detect rossym */ if (TRUE) #else diff --git a/sdk/lib/rossym/CMakeLists.txt b/sdk/lib/rossym/CMakeLists.txt index 1b9362a8f37..e04cdbdedb2 100644 --- a/sdk/lib/rossym/CMakeLists.txt +++ b/sdk/lib/rossym/CMakeLists.txt @@ -13,3 +13,4 @@ list(APPEND SOURCE zwfile.c) add_library(rossym ${SOURCE}) add_dependencies(rossym psdk bugcodes) +target_compile_definitions(rossym INTERFACE "-D__ROS_ROSSYM__")