[ros-diffs] [reactos] 01/05: [SDK:REACTOS][CMLIB][BOOT] Get rid of the FreeLdr-specific __FREELDR_H define, and use the standard NT _BLDR_ instead.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d3c3a757ab67c8c897a7…

commit 9d3c3a757ab67c8c897a7f4dfb7de3ba0b31000f
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Mar 20 16:45:51 2022 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Fri Mar 25 18:54:18 2022 +0100

    [SDK:REACTOS][CMLIB][BOOT] Get rid of the FreeLdr-specific __FREELDR_H define, and use
the standard NT _BLDR_ instead.
    
    This standard _BLDR_ define is already defined for both FreeLdr and
    boot/environ UEFI bootloader lib, so no actual behavioural changes
    should occur.
---
 boot/environ/include/bl.h                  | 1 -
 sdk/include/reactos/drivers/xbox/superio.h | 6 +++---
 sdk/lib/cmlib/cmlib.h                      | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h
index 22481b123eb..e5a338a8b11 100644
--- a/boot/environ/include/bl.h
+++ b/boot/environ/include/bl.h
@@ -42,7 +42,6 @@
 #include <GlobalVariable.h>
 
 /* Registry Headers */
-#define __FREELDR_H
 #include <cmlib.h>
 
 /* DEFINES *******************************************************************/
diff --git a/sdk/include/reactos/drivers/xbox/superio.h
b/sdk/include/reactos/drivers/xbox/superio.h
index ccb430c0fe5..2e1d9480103 100644
--- a/sdk/include/reactos/drivers/xbox/superio.h
+++ b/sdk/include/reactos/drivers/xbox/superio.h
@@ -70,7 +70,7 @@ LpcWriteRegister(UCHAR Register, UCHAR Value)
     WRITE_PORT_UCHAR((PUCHAR)(LPC_IO_BASE + 1), Value);
 }
 
-#ifndef __FREELDR_H
+#ifndef _BLDR_
 FORCEINLINE
 ULONG
 LpcDetectSuperIO(VOID)
@@ -105,7 +105,7 @@ LpcGetIoBase()
     return Base;
 }
 
-#ifndef __FREELDR_H
+#ifndef _BLDR_
 FORCEINLINE
 ULONG
 LpcGetIoBaseMPU()
@@ -128,7 +128,7 @@ LpcGetIrqPrimary()
     return LpcReadRegister(LPC_CONFIG_DEVICE_INTERRUPT_PRIMARY);
 }
 
-#ifndef __FREELDR_H
+#ifndef _BLDR_
 FORCEINLINE
 ULONG
 LpcGetIrqSecondary()
diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h
index 06b4a953525..1946ec5437b 100644
--- a/sdk/lib/cmlib/cmlib.h
+++ b/sdk/lib/cmlib/cmlib.h
@@ -214,7 +214,7 @@
 #include "hivedata.h"
 #include "cmdata.h"
 
-#if defined(_TYPEDEFS_HOST_H) || defined(__FREELDR_H) // || defined(_BLDR_)
+#if defined(_TYPEDEFS_HOST_H) || defined(_BLDR_)
 
 #define PCM_KEY_SECURITY_CACHE_ENTRY    PVOID
 #define PCM_KEY_CONTROL_BLOCK           PVOID
@@ -224,7 +224,7 @@
 #define CMP_SECURITY_HASH_LISTS         64
 
 // #endif // Commented out until one finds a way to properly include
-          // this header in freeldr and in ntoskrnl.
+          // this header in the bootloader and in ntoskrnl.
 
 //
 // Use Count Log and Entry