Use consistent RGBDS_<PROG>_<NAME>_HPP header guard convention

include/asm/charmap.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_ASM_CHARMAP_H
-#define RGBDS_ASM_CHARMAP_H
+#ifndef RGBDS_ASM_CHARMAP_HPP
+#define RGBDS_ASM_CHARMAP_HPP
 
 #include <stdint.h>
 #include <string>
@@ -18,4 +18,4 @@ bool charmap_HasChar(std::string const &input);
 void charmap_Convert(std::string const &input, std::vector<uint8_t> &output);
 size_t charmap_ConvertNext(char const *&input, std::vector<uint8_t> *output);
 
-#endif // RGBDS_ASM_CHARMAP_H
+#endif // RGBDS_ASM_CHARMAP_HPP

include/asm/fixpoint.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_ASM_FIXPOINT_H
-#define RGBDS_ASM_FIXPOINT_H
+#ifndef RGBDS_ASM_FIXPOINT_HPP
+#define RGBDS_ASM_FIXPOINT_HPP
 
 #include <stdint.h>
 
@@ -25,4 +25,4 @@ int32_t fix_Round(int32_t i, int32_t q);
 int32_t fix_Ceil(int32_t i, int32_t q);
 int32_t fix_Floor(int32_t i, int32_t q);
 
-#endif // RGBDS_ASM_FIXPOINT_H
+#endif // RGBDS_ASM_FIXPOINT_HPP

include/asm/format.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_FORMAT_SPEC_H
-#define RGBDS_FORMAT_SPEC_H
+#ifndef RGBDS_ASM_FORMAT_HPP
+#define RGBDS_ASM_FORMAT_HPP
 
 #include <stddef.h>
 #include <stdint.h>
@@ -41,4 +41,4 @@ public:
 	void appendNumber(std::string &str, uint32_t value) const;
 };
 
-#endif // RGBDS_FORMAT_SPEC_H
+#endif // RGBDS_ASM_FORMAT_HPP

include/asm/fstack.hpp

@@ -2,8 +2,8 @@
 
 // Contains some assembler-wide defines and externs
 
-#ifndef RGBDS_ASM_FSTACK_H
-#define RGBDS_ASM_FSTACK_H
+#ifndef RGBDS_ASM_FSTACK_HPP
+#define RGBDS_ASM_FSTACK_HPP
 
 #include <memory>
 #include <optional>
@@ -81,4 +81,4 @@ bool fstk_Break();
 void fstk_NewRecursionDepth(size_t newDepth);
 void fstk_Init(std::string const &mainPath, size_t maxDepth);
 
-#endif // RGBDS_ASM_FSTACK_H
+#endif // RGBDS_ASM_FSTACK_HPP

include/asm/lexer.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_ASM_LEXER_H
-#define RGBDS_ASM_LEXER_H
+#ifndef RGBDS_ASM_LEXER_HPP
+#define RGBDS_ASM_LEXER_HPP
 
 #include <deque>
 #include <memory>
@@ -155,4 +155,4 @@ struct Capture {
 Capture lexer_CaptureRept();
 Capture lexer_CaptureMacro();
 
-#endif // RGBDS_ASM_LEXER_H
+#endif // RGBDS_ASM_LEXER_HPP

include/asm/macro.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_MACRO_H
-#define RGBDS_MACRO_H
+#ifndef RGBDS_ASM_MACRO_HPP
+#define RGBDS_ASM_MACRO_HPP
 
 #include <memory>
 #include <stdint.h>
@@ -20,4 +20,4 @@ struct MacroArgs {
 	void shiftArgs(int32_t count);
 };
 
-#endif // RGBDS_MACRO_H
+#endif // RGBDS_ASM_MACRO_HPP

include/asm/main.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_MAIN_H
-#define RGBDS_MAIN_H
+#ifndef RGBDS_ASM_MAIN_HPP
+#define RGBDS_ASM_MAIN_HPP
 
 #include <stdio.h>
 #include <string>
@@ -15,4 +15,4 @@ extern bool generatedMissingIncludes;
 extern bool failedOnMissingInclude;
 extern bool generatePhonyDeps;
 
-#endif // RGBDS_MAIN_H
+#endif // RGBDS_ASM_MAIN_HPP

include/asm/opt.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_OPT_H
-#define RGBDS_OPT_H
+#ifndef RGBDS_ASM_OPT_HPP
+#define RGBDS_ASM_OPT_HPP
 
 #include <stdint.h>
 
@@ -15,4 +15,4 @@ void opt_Parse(char const *option);
 void opt_Push();
 void opt_Pop();
 
-#endif // RGBDS_OPT_H
+#endif // RGBDS_ASM_OPT_HPP

include/asm/output.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_ASM_OUTPUT_H
-#define RGBDS_ASM_OUTPUT_H
+#ifndef RGBDS_ASM_OUTPUT_HPP
+#define RGBDS_ASM_OUTPUT_HPP
 
 #include <memory>
 #include <stdint.h>
@@ -22,4 +22,4 @@ void out_CreateAssert(
 );
 void out_WriteObject();
 
-#endif // RGBDS_ASM_OUTPUT_H
+#endif // RGBDS_ASM_OUTPUT_HPP

include/asm/rpn.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_ASM_RPN_H
-#define RGBDS_ASM_RPN_H
+#ifndef RGBDS_ASM_RPN_HPP
+#define RGBDS_ASM_RPN_HPP
 
 #include <stdint.h>
 #include <string>
@@ -63,4 +63,4 @@ private:
 	uint8_t *reserveSpace(uint32_t size, uint32_t patchSize);
 };
 
-#endif // RGBDS_ASM_RPN_H
+#endif // RGBDS_ASM_RPN_HPP

include/asm/section.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_SECTION_H
-#define RGBDS_SECTION_H
+#ifndef RGBDS_ASM_SECTION_HPP
+#define RGBDS_ASM_SECTION_HPP
 
 #include <deque>
 #include <memory>
@@ -100,4 +100,4 @@ void sect_EndSection();
 void sect_PushSection();
 void sect_PopSection();
 
-#endif // RGBDS_SECTION_H
+#endif // RGBDS_ASM_SECTION_HPP

include/asm/symbol.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_SYMBOL_H
-#define RGBDS_SYMBOL_H
+#ifndef RGBDS_ASM_SYMBOL_HPP
+#define RGBDS_ASM_SYMBOL_HPP
 
 #include <memory>
 #include <optional>
@@ -100,4 +100,4 @@ void sym_Init(time_t now);
 std::optional<std::string> const &sym_GetCurrentSymbolScope();
 void sym_SetCurrentSymbolScope(std::optional<std::string> const &newScope);
 
-#endif // RGBDS_SYMBOL_H
+#endif // RGBDS_ASM_SYMBOL_HPP

include/asm/warning.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef WARNING_H
-#define WARNING_H
+#ifndef RGBDS_ASM_WARNING_HPP
+#define RGBDS_ASM_WARNING_HPP
 
 extern unsigned int nbErrors, maxErrors;
 
@@ -79,4 +79,4 @@ void processWarningFlag(char const *flag);
  */
 [[gnu::format(printf, 1, 2)]] void error(char const *fmt, ...);
 
-#endif // WARNING_H
+#endif // RGBDS_ASM_WARNING_HPP

include/defaultinitalloc.hpp

@@ -1,3 +1,11 @@
+/* SPDX-License-Identifier: MIT */
+
+#ifndef RGBDS_DEFAULT_INIT_ALLOC_HPP
+#define RGBDS_DEFAULT_INIT_ALLOC_HPP
+
+#include <memory>
+#include <vector>
+
 /*
  * Allocator adaptor that interposes construct() calls to convert value-initialization
  * (which is what you get with e.g. `vector::resize`) into default-initialization (which does not
@@ -6,12 +14,6 @@
  * https://stackoverflow.com/questions/21028299/is-this-behavior-of-vectorresizesize-type-n-under-c11-and-boost-container/21028912#21028912
  */
 
-#ifndef DEFAULT_INIT_ALLOC_H
-#define DEFAULT_INIT_ALLOC_H
-
-#include <memory>
-#include <vector>
-
 template<typename T, typename A = std::allocator<T>>
 class default_init_allocator : public A {
 	using a_t = std::allocator_traits<A>;
@@ -36,4 +38,4 @@ public:
 template<typename T>
 using DefaultInitVec = std::vector<T, default_init_allocator<T>>;
 
-#endif // DEFAULT_INIT_ALLOC_H
+#endif // RGBDS_DEFAULT_INIT_ALLOC_HPP

include/error.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_ERROR_H
-#define RGBDS_ERROR_H
+#ifndef RGBDS_ERROR_HPP
+#define RGBDS_ERROR_HPP
 
 extern "C" {
 
@@ -12,4 +12,4 @@ extern "C" {
 [[gnu::format(printf, 1, 2), noreturn]] void errx(char const *fmt, ...);
 }
 
-#endif // RGBDS_ERROR_H
+#endif // RGBDS_ERROR_HPP

include/extern/getopt.hpp

@@ -2,8 +2,8 @@
 
 /* This implementation was taken from musl and modified for RGBDS */
 
-#ifndef RGBDS_EXTERN_GETOPT_H
-#define RGBDS_EXTERN_GETOPT_H
+#ifndef RGBDS_EXTERN_GETOPT_HPP
+#define RGBDS_EXTERN_GETOPT_HPP
 
 extern "C" {
 
@@ -27,4 +27,4 @@ int musl_getopt_long_only(
 
 } // extern "C"
 
-#endif
+#endif // RGBDS_EXTERN_GETOPT_HPP

include/extern/utf8decoder.hpp

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef EXTERN_UTF8DECODER_H
-#define EXTERN_UTF8DECODER_H
+#ifndef RGBDS_EXTERN_UTF8DECODER_HPP
+#define RGBDS_EXTERN_UTF8DECODER_HPP
 
 #include <stdint.h>
 
 uint32_t decode(uint32_t *state, uint32_t *codep, uint8_t byte);
 
-#endif // EXTERN_UTF8DECODER_H
+#endif // RGBDS_EXTERN_UTF8DECODER_HPP

include/gfx/process.hpp

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_GFX_CONVERT_HPP
-#define RGBDS_GFX_CONVERT_HPP
+#ifndef RGBDS_GFX_PROCESS_HPP
+#define RGBDS_GFX_PROCESS_HPP
 
 void processPalettes();
 void process();
 
-#endif // RGBDS_GFX_CONVERT_HPP
+#endif // RGBDS_GFX_PROCESS_HPP

include/helpers.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef HELPERS_H
-#define HELPERS_H
+#ifndef RGBDS_HELPERS_HPP
+#define RGBDS_HELPERS_HPP
 
 // Ideally we'd use `std::unreachable`, but it has insufficient compiler support
 #ifdef __GNUC__ // GCC or compatible
@@ -111,4 +111,4 @@ struct Defer {
 	~Defer() { deferred(); }
 };
 
-#endif // HELPERS_H
+#endif // RGBDS_HELPERS_HPP

include/link/assign.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_LINK_ASSIGN_H
-#define RGBDS_LINK_ASSIGN_H
+#ifndef RGBDS_LINK_ASSIGN_HPP
+#define RGBDS_LINK_ASSIGN_HPP
 
 #include <stdint.h>
 
@@ -10,4 +10,4 @@ extern uint64_t nbSectionsToAssign;
 // Assigns all sections a slice of the address space
 void assign_AssignSections();
 
-#endif // RGBDS_LINK_ASSIGN_H
+#endif // RGBDS_LINK_ASSIGN_HPP

include/link/main.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_LINK_MAIN_H
-#define RGBDS_LINK_MAIN_H
+#ifndef RGBDS_LINK_MAIN_HPP
+#define RGBDS_LINK_MAIN_HPP
 
 #include <stdint.h>
 #include <stdio.h>
@@ -65,4 +65,4 @@ struct FileStackNode {
 [[gnu::format(printf, 3, 4), noreturn]] void
     fatal(FileStackNode const *where, uint32_t lineNo, char const *fmt, ...);
 
-#endif // RGBDS_LINK_MAIN_H
+#endif // RGBDS_LINK_MAIN_HPP

include/link/object.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_LINK_OBJECT_H
-#define RGBDS_LINK_OBJECT_H
+#ifndef RGBDS_LINK_OBJECT_HPP
+#define RGBDS_LINK_OBJECT_HPP
 
 /*
  * Read an object (.o) file, and add its info to the data structures.
@@ -16,4 +16,4 @@ void obj_ReadFile(char const *fileName, unsigned int i);
  */
 void obj_Setup(unsigned int nbFiles);
 
-#endif // RGBDS_LINK_OBJECT_H
+#endif // RGBDS_LINK_OBJECT_HPP

include/link/output.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_LINK_OUTPUT_H
-#define RGBDS_LINK_OUTPUT_H
+#ifndef RGBDS_LINK_OUTPUT_HPP
+#define RGBDS_LINK_OUTPUT_HPP
 
 #include "link/section.hpp"
 
@@ -23,4 +23,4 @@ Section const *out_OverlappingSection(Section const &section);
  */
 void out_WriteFiles();
 
-#endif // RGBDS_LINK_OUTPUT_H
+#endif // RGBDS_LINK_OUTPUT_HPP

include/link/patch.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_LINK_PATCH_H
-#define RGBDS_LINK_PATCH_H
+#ifndef RGBDS_LINK_PATCH_HPP
+#define RGBDS_LINK_PATCH_HPP
 
 /*
  * Checks all assertions
@@ -14,4 +14,4 @@ void patch_CheckAssertions();
  */
 void patch_ApplyPatches();
 
-#endif // RGBDS_LINK_PATCH_H
+#endif // RGBDS_LINK_PATCH_HPP

include/link/sdas_obj.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_LINK_SDAS_OBJ_H
-#define RGBDS_LINK_SDAS_OBJ_H
+#ifndef RGBDS_LINK_SDAS_OBJ_HPP
+#define RGBDS_LINK_SDAS_OBJ_HPP
 
 #include <stdio.h>
 #include <vector>
@@ -11,4 +11,4 @@ struct Symbol;
 
 void sdobj_ReadFile(FileStackNode const &where, FILE *file, std::vector<Symbol> &fileSymbols);
 
-#endif // RGBDS_LINK_SDAS_OBJ_H
+#endif // RGBDS_LINK_SDAS_OBJ_HPP

include/link/section.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_LINK_SECTION_H
-#define RGBDS_LINK_SECTION_H
+#ifndef RGBDS_LINK_SECTION_HPP
+#define RGBDS_LINK_SECTION_HPP
 
 // GUIDELINE: external code MUST NOT BE AWARE of the data structure used!
 
@@ -88,4 +88,4 @@ Section *sect_GetSection(std::string const &name);
  */
 void sect_DoSanityChecks();
 
-#endif // RGBDS_LINK_SECTION_H
+#endif // RGBDS_LINK_SECTION_HPP

include/link/symbol.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_LINK_SYMBOL_H
-#define RGBDS_LINK_SYMBOL_H
+#ifndef RGBDS_LINK_SYMBOL_HPP
+#define RGBDS_LINK_SYMBOL_HPP
 
 // GUIDELINE: external code MUST NOT BE AWARE of the data structure used!
 
@@ -47,4 +47,4 @@ void sym_AddSymbol(Symbol &symbol);
  */
 Symbol *sym_GetSymbol(std::string const &name);
 
-#endif // RGBDS_LINK_SYMBOL_H
+#endif // RGBDS_LINK_SYMBOL_HPP

include/linkdefs.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_LINKDEFS_H
-#define RGBDS_LINKDEFS_H
+#ifndef RGBDS_LINKDEFS_HPP
+#define RGBDS_LINKDEFS_HPP
 
 #include <stdint.h>
 #include <string>
@@ -129,4 +129,4 @@ enum PatchType {
 	PATCHTYPE_INVALID
 };
 
-#endif // RGBDS_LINKDEFS_H
+#endif // RGBDS_LINKDEFS_HPP

include/opmath.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_OP_MATH_H
-#define RGBDS_OP_MATH_H
+#ifndef RGBDS_OP_MATH_HPP
+#define RGBDS_OP_MATH_HPP
 
 #include <stdint.h>
 
@@ -12,4 +12,4 @@ int32_t op_shift_left(int32_t value, int32_t amount);
 int32_t op_shift_right(int32_t value, int32_t amount);
 int32_t op_shift_right_unsigned(int32_t value, int32_t amount);
 
-#endif // RGBDS_OP_MATH_H
+#endif // RGBDS_OP_MATH_HPP

include/platform.hpp

@@ -2,8 +2,8 @@
 
 // platform-specific hacks
 
-#ifndef RGBDS_PLATFORM_H
-#define RGBDS_PLATFORM_H
+#ifndef RGBDS_PLATFORM_HPP
+#define RGBDS_PLATFORM_HPP
 
 // MSVC doesn't have str(n)casecmp, use a suitable replacement
 #ifdef _MSC_VER
@@ -56,4 +56,4 @@
 	#define setmode(fd, mode) (0)
 #endif
 
-#endif // RGBDS_PLATFORM_H
+#endif // RGBDS_PLATFORM_HPP

include/util.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef RGBDS_UTIL_H
-#define RGBDS_UTIL_H
+#ifndef RGBDS_UTIL_HPP
+#define RGBDS_UTIL_HPP
 
 #include <stddef.h>
 #include <stdint.h>
@@ -14,4 +14,4 @@ char const *printChar(int c);
  */
 size_t readUTF8Char(std::vector<uint8_t> *dest, char const *src);
 
-#endif // RGBDS_UTIL_H
+#endif // RGBDS_UTIL_HPP

include/version.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: MIT */
 
-#ifndef EXTERN_VERSION_H
-#define EXTERN_VERSION_H
+#ifndef RGBDS_VERSION_HPP
+#define RGBDS_VERSION_HPP
 
 extern "C" {
 
@@ -12,4 +12,4 @@ extern "C" {
 char const *get_package_version_string();
 }
 
-#endif // EXTERN_VERSION_H
+#endif // RGBDS_VERSION_H