mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-24 12:03:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This standard _BLDR_ define is already defined for both FreeLdr and
boot/environ UEFI bootloader lib, so no actual behavioural changes
should occur.
This commit is contained in:
Hermès Bélusca-Maïto 2022-03-20 16:45:51 +01:00
parent 44a6987493
commit 9d3c3a757a
No known key found for this signature in database
GPG Key ID: 3B2539C65E7B93D0
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot/environ/include/bl.h
View File

@ -42,7 +42,6 @@
#include <GlobalVariable.h> #include <GlobalVariable.h>
/* Registry Headers */ /* Registry Headers */
#define __FREELDR_H
#include <cmlib.h> #include <cmlib.h>
/* DEFINES *******************************************************************/ /* DEFINES *******************************************************************/

6
sdk/include/reactos/drivers/xbox/superio.h
View File

@ -70,7 +70,7 @@ LpcWriteRegister(UCHAR Register, UCHAR Value)
WRITE_PORT_UCHAR((PUCHAR)(LPC_IO_BASE + 1), Value); WRITE_PORT_UCHAR((PUCHAR)(LPC_IO_BASE + 1), Value);
} }
#ifndef __FREELDR_H #ifndef _BLDR_
FORCEINLINE FORCEINLINE
ULONG ULONG
LpcDetectSuperIO(VOID) LpcDetectSuperIO(VOID)
@ -105,7 +105,7 @@ LpcGetIoBase()
return Base; return Base;
} }
#ifndef __FREELDR_H #ifndef _BLDR_
FORCEINLINE FORCEINLINE
ULONG ULONG
LpcGetIoBaseMPU() LpcGetIoBaseMPU()
@ -128,7 +128,7 @@ LpcGetIrqPrimary()
return LpcReadRegister(LPC_CONFIG_DEVICE_INTERRUPT_PRIMARY); return LpcReadRegister(LPC_CONFIG_DEVICE_INTERRUPT_PRIMARY);
} }
#ifndef __FREELDR_H #ifndef _BLDR_
FORCEINLINE FORCEINLINE
ULONG ULONG
LpcGetIrqSecondary() LpcGetIrqSecondary()

4
sdk/lib/cmlib/cmlib.h
View File

@ -214,7 +214,7 @@
#include "hivedata.h" #include "hivedata.h"
#include "cmdata.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_SECURITY_CACHE_ENTRY PVOID
#define PCM_KEY_CONTROL_BLOCK PVOID #define PCM_KEY_CONTROL_BLOCK PVOID
@ -224,7 +224,7 @@
#define CMP_SECURITY_HASH_LISTS 64 #define CMP_SECURITY_HASH_LISTS 64
// #endif // Commented out until one finds a way to properly include // #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 // Use Count Log and Entry