IntelFsp2WrapperPkg: Replace include guards with #pragma once

Replace traditional `#ifndef`/`#define`/`#endif` include guards with
`#pragma` once.

`#pragma once` is a widely supported preprocessor directive that
prevents header files from being included multiple times. It is
supported by all toolchains used to build edk2: GCC, Clang/LLVM, and
MSVC.

Compared to macro-based include guards, `#pragma once`:

- Eliminates the risk of macro name collisions or copy/paste errors
  where two headers inadvertently use the same guard macro.
- Eliminate inconsistency in the way include guard macros are named
  (e.g., some files use `__FILE_H__`, others use `FILE_H_`, etc.).
- Reduces boilerplate (three lines replaced by one).
- Avoids polluting the macro namespace with guard symbols.
- Can improve build times as the preprocessor can skip re-opening the
  file entirely, rather than re-reading it to find the matching
  `#endif` ("multiple-include optimization").
  - Note that some compilers may already optimize traditional include
    guards, by recognzining the idiomatic pattern.

This change is made acknowledging that overall portability of the
code will technically be reduced, as `#pragma once` is not part of the
C/C++ standards.

However, this is considered acceptable given:

1. edk2 already defines a subset of supported compilers in
   BaseTools/Conf/tools_def.template, all of which have supported
   `#pragma once` for over two decades.
2. There have been concerns raised to the project about inconsistent
   include guard naming and potential macro collisions.

Approximate compiler support dates:

- MSVC: Supported since Visual C++ 4.2 (1996)
- GCC: Supported since 3.4 (2004)
  (http://gnu.ist.utl.pt/software/gcc/gcc-3.4/changes.html)
- Clang (LLVM based): Since initial release in 2007

Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>

10 files changed, 10 insertions, 40 deletions

diff --git a/IntelFsp2WrapperPkg/Include/Library/FspMeasurementLib.h b/IntelFsp2WrapperPkg/Include/Library/FspMeasurementLib.h
index 7b303dab3e..2997bc97b4 100644
--- a/IntelFsp2WrapperPkg/Include/Library/FspMeasurementLib.h
+++ b/IntelFsp2WrapperPkg/Include/Library/FspMeasurementLib.h
@@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#ifndef _FSP_MEASUREMENT_LIB_H_

-#define _FSP_MEASUREMENT_LIB_H_

+#pragma once

 

 #define FSP_MEASURE_FSP     BIT0

 #define FSP_MEASURE_FSPT    BIT1

@@ -37,5 +36,3 @@ MeasureFspFirmwareBlob (
   IN EFI_PHYSICAL_ADDRESS  FirmwareBlobBase,

   IN UINT64                FirmwareBlobLength

   );

-

-#endif

diff --git a/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiLib.h b/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiLib.h
index 59df1d7cd7..0b847a63a4 100644
--- a/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiLib.h
+++ b/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiLib.h
@@ -6,8 +6,7 @@
 

 **/

 

-#ifndef __FSP_WRAPPER_API_LIB_H__

-#define __FSP_WRAPPER_API_LIB_H__

+#pragma once

 

 #include <FspEas.h>

 

@@ -90,5 +89,3 @@ EFIAPI
 CallFspSmmInit (

   IN VOID  *FspiUpdDataPtr

   );

-

-#endif

diff --git a/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiTestLib.h b/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiTestLib.h
index 26ad8f0dbd..5eb9ea1b6b 100644
--- a/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiTestLib.h
+++ b/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiTestLib.h
@@ -6,8 +6,7 @@
 

 **/

 

-#ifndef __FSP_WRAPPER_API_TEST_LIB_H__

-#define __FSP_WRAPPER_API_TEST_LIB_H__

+#pragma once

 

 #include <PiPei.h>

 

@@ -64,5 +63,3 @@ EFIAPI
 TestFspSmmInitApiOutput (

   IN  VOID  *FspiUpdDataPtr

   );

-

-#endif

diff --git a/IntelFsp2WrapperPkg/Include/Library/FspWrapperHobProcessLib.h b/IntelFsp2WrapperPkg/Include/Library/FspWrapperHobProcessLib.h
index 9ae9d67960..e5bd05b7de 100644
--- a/IntelFsp2WrapperPkg/Include/Library/FspWrapperHobProcessLib.h
+++ b/IntelFsp2WrapperPkg/Include/Library/FspWrapperHobProcessLib.h
@@ -6,8 +6,7 @@
 

 **/

 

-#ifndef __FSP_WRAPPER_HOB_PROCESS_LIB_H__

-#define __FSP_WRAPPER_HOB_PROCESS_LIB_H__

+#pragma once

 

 /**

   Post FSP-M HOB process for Memory Resource Descriptor.

@@ -47,5 +46,3 @@ EFIAPI
 PostFspiHobProcess (

   IN VOID  *FspHobList

   );

-

-#endif

diff --git a/IntelFsp2WrapperPkg/Include/Library/FspWrapperMultiPhaseProcessLib.h b/IntelFsp2WrapperPkg/Include/Library/FspWrapperMultiPhaseProcessLib.h
index aadacc9b50..1e34be264d 100644
--- a/IntelFsp2WrapperPkg/Include/Library/FspWrapperMultiPhaseProcessLib.h
+++ b/IntelFsp2WrapperPkg/Include/Library/FspWrapperMultiPhaseProcessLib.h
@@ -6,8 +6,7 @@
 

 **/

 

-#ifndef __FSP_WRAPPER_MULTI_PHASE_PROCESS_LIB_H__

-#define __FSP_WRAPPER_MULTI_PHASE_PROCESS_LIB_H__

+#pragma once

 

 /**

   FSP Wrapper Variable Request Handler

@@ -40,5 +39,3 @@ FspWrapperMultiPhaseHandler (
   IN OUT VOID  **FspHobListPtr,

   IN UINT8     ComponentIndex

   );

-

-#endif

diff --git a/IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformLib.h b/IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformLib.h
index 8e3cd64307..114d600fe6 100644
--- a/IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformLib.h
+++ b/IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformLib.h
@@ -6,8 +6,7 @@
 

 **/

 

-#ifndef __FSP_WRAPPER_PLATFORM_LIB_H__

-#define __FSP_WRAPPER_PLATFORM_LIB_H__

+#pragma once

 

 /**

   This function overrides the default configurations in the FSP-M UPD data region.

@@ -88,5 +87,3 @@ EFIAPI
 UpdateFspiUpdData (

   IN OUT VOID  *FspUpdRgnPtr

   );

-

-#endif

diff --git a/IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformMultiPhaseLib.h b/IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformMultiPhaseLib.h
index 272b0e3911..0656581ece 100644
--- a/IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformMultiPhaseLib.h
+++ b/IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformMultiPhaseLib.h
@@ -6,8 +6,7 @@
 

 **/

 

-#ifndef FSP_WRAPPER_PLATFORM_MULTI_PHASE_LIB_H_

-#define FSP_WRAPPER_PLATFORM_MULTI_PHASE_LIB_H_

+#pragma once

 

 /**

   FSP Wrapper Platform MultiPhase Handler

@@ -26,5 +25,3 @@ FspWrapperPlatformMultiPhaseHandler (
   IN UINT8     ComponentIndex,

   IN UINT32    PhaseIndex

   );

-

-#endif //FSP_WRAPPER_PLATFORM_MULTI_PHASE_LIB_H_

diff --git a/IntelFsp2WrapperPkg/Include/Ppi/FspSiliconInitDone.h b/IntelFsp2WrapperPkg/Include/Ppi/FspSiliconInitDone.h
index addd86cf89..15d55c4d8d 100644
--- a/IntelFsp2WrapperPkg/Include/Ppi/FspSiliconInitDone.h
+++ b/IntelFsp2WrapperPkg/Include/Ppi/FspSiliconInitDone.h
@@ -6,8 +6,7 @@
 

 **/

 

-#ifndef _FSP_SILICON_INIT_DONE_H_

-#define _FSP_SILICON_INIT_DONE_H_

+#pragma once

 

 typedef struct _FSP_SILICON_INIT_DONE_PPI FSP_SILICON_INIT_DONE_PPI;

 

@@ -33,5 +32,3 @@ struct _FSP_SILICON_INIT_DONE_PPI {
 };

 

 extern EFI_GUID  gFspSiliconInitDonePpiGuid;

-

-#endif

diff --git a/IntelFsp2WrapperPkg/Include/Ppi/TopOfTemporaryRam.h b/IntelFsp2WrapperPkg/Include/Ppi/TopOfTemporaryRam.h
index 0dfdbb079c..d7fcfaeb7b 100644
--- a/IntelFsp2WrapperPkg/Include/Ppi/TopOfTemporaryRam.h
+++ b/IntelFsp2WrapperPkg/Include/Ppi/TopOfTemporaryRam.h
@@ -6,9 +6,6 @@
 

 **/

 

-#ifndef _TOP_OF_TEMPORARY_RAM_H_

-#define _TOP_OF_TEMPORARY_RAM_H_

+#pragma once

 

 extern EFI_GUID  gTopOfTemporaryRamPpiGuid;

-

-#endif

diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Fsp.h b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Fsp.h
index d2af7a5484..dce94da3f8 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Fsp.h
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Fsp.h
@@ -6,8 +6,7 @@
 

 **/

 

-#ifndef __FSP_H__

-#define __FSP_H__

+#pragma once

 

 //

 // Fv Header

@@ -41,5 +40,3 @@
 //

 #define FSP_HEADER_IMAGEBASE_OFFSET    0x1C

 #define FSP_HEADER_TEMPRAMINIT_OFFSET  0x30

-

-#endif