diff options
Diffstat (limited to 'Boot')
| -rw-r--r-- | Boot/BootKit/BootKit.hxx | 2 | ||||
| -rw-r--r-- | Boot/BootKit/Support.hxx (renamed from Boot/BootKit/Vendor/Support.hxx) | 0 | ||||
| -rw-r--r-- | Boot/BootKit/Vendor/Qr.hxx | 10 | ||||
| -rw-r--r-- | Boot/Sources/HEL/AMD64/Support.cxx | 2 | ||||
| -rw-r--r-- | Boot/Sources/ProgramLoader.cxx | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/Boot/BootKit/BootKit.hxx b/Boot/BootKit/BootKit.hxx index af727da1..16f81696 100644 --- a/Boot/BootKit/BootKit.hxx +++ b/Boot/BootKit/BootKit.hxx @@ -19,7 +19,7 @@ #include <cstring> #include <FSKit/NewFS.hxx> -#include <BootKit/Vendor/Support.hxx> +#include <BootKit/Support.hxx> /***********************************************************************************/ /// Include other APIs. diff --git a/Boot/BootKit/Vendor/Support.hxx b/Boot/BootKit/Support.hxx index a12148a1..a12148a1 100644 --- a/Boot/BootKit/Vendor/Support.hxx +++ b/Boot/BootKit/Support.hxx diff --git a/Boot/BootKit/Vendor/Qr.hxx b/Boot/BootKit/Vendor/Qr.hxx index 9f32430d..3616aaac 100644 --- a/Boot/BootKit/Vendor/Qr.hxx +++ b/Boot/BootKit/Vendor/Qr.hxx @@ -1,16 +1,18 @@ -#ifndef QR_H -#define QR_H +#ifndef QR_HXX +#define QR_HXX +extern "C" { #include <math.h> #include <stddef.h> #include <stdint.h> +} #include <BootKit/Vendor/Shared/base.h> #include <BootKit/Vendor/Shared/bit.h> #include <BootKit/Vendor/QrPrelude.hxx> #include <Modules/CoreCG/CoreCG.hxx> -#include <BootKit/Vendor/Support.hxx> +#include <BootKit/Support.hxx> #include <CompilerKit/Detail.hxx> /// @note the QR code is still code 128, it utilizes the same concept of having it's own character set. @@ -970,4 +972,4 @@ namespace Kernel::Qr using namespace qr; } // namespace Kernel::Qr -#endif +#endif // QR_HXX diff --git a/Boot/Sources/HEL/AMD64/Support.cxx b/Boot/Sources/HEL/AMD64/Support.cxx index 2c26bc27..a2ac6394 100644 --- a/Boot/Sources/HEL/AMD64/Support.cxx +++ b/Boot/Sources/HEL/AMD64/Support.cxx @@ -8,7 +8,7 @@ #include <FirmwareKit/EFI/API.hxx> #include <FirmwareKit/EFI/EFI.hxx> #include <FirmwareKit/Handover.hxx> -#include <BootKit/Vendor/Support.hxx> +#include <BootKit/Support.hxx> #include <KernelKit/MSDOS.hxx> #include <KernelKit/PE.hxx> diff --git a/Boot/Sources/ProgramLoader.cxx b/Boot/Sources/ProgramLoader.cxx index b88f4384..88e2f14a 100644 --- a/Boot/Sources/ProgramLoader.cxx +++ b/Boot/Sources/ProgramLoader.cxx @@ -5,7 +5,7 @@ ------------------------------------------- */ #include <BootKit/ProgramLoader.hxx> -#include <BootKit/Vendor/Support.hxx> +#include <BootKit/Support.hxx> #include <BootKit/BootKit.hxx> #include <KernelKit/PEF.hpp> |