From 6f2c8bf1ae0cd8db4dcc0542b492a33984ce6cca Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Thu, 19 Jun 2025 11:35:51 +0000 Subject: [PATCH] Use pragma once everywhere (#897) * Use pragma once everywhere * Fix apple folder manager * format * Restore types * Fix interrupt * gbi * Move mbi above defines * Move guard * Update gfxdebuggerbridge.h --- include/libultraship/bridge.h | 5 +---- include/libultraship/classes.h | 4 ---- include/libultraship/color.h | 5 +---- include/libultraship/libultra.h | 5 +---- include/libultraship/libultra/abi.h | 5 +---- include/libultraship/libultra/controller.h | 5 ----- include/libultraship/libultra/convert.h | 5 +---- include/libultraship/libultra/eeprom.h | 5 +---- include/libultraship/libultra/exception.h | 5 +---- include/libultraship/libultra/gbi.h | 7 ++----- include/libultraship/libultra/gu.h | 5 +---- include/libultraship/libultra/internal.h | 5 +---- include/libultraship/libultra/interrupt.h | 7 +++---- include/libultraship/libultra/pfs.h | 5 +---- include/libultraship/libultra/pi.h | 6 +----- include/libultraship/libultra/printf.h | 5 +---- include/libultraship/libultra/r4300.h | 5 +---- include/libultraship/libultra/rcp.h | 5 +---- include/libultraship/libultra/rdp.h | 5 +---- include/libultraship/libultra/sptask.h | 5 +---- include/libultraship/libultra/thread.h | 5 +---- include/libultraship/libultra/time.h | 5 +---- include/libultraship/libultra/types.h | 5 +---- include/libultraship/libultra/vi.h | 5 +---- include/libultraship/libultraship.h | 5 +---- src/debug/CrashHandler.h | 5 +---- src/graphic/Fast3D/backends/gfx_dxgi.h | 4 +--- src/graphic/Fast3D/backends/gfx_metal.h | 6 +----- src/graphic/Fast3D/backends/gfx_opengl.h | 4 +--- src/graphic/Fast3D/backends/gfx_rendering_api.h | 4 +--- src/graphic/Fast3D/backends/gfx_screen_config.h | 5 +---- src/graphic/Fast3D/backends/gfx_sdl.h | 4 +--- src/graphic/Fast3D/backends/gfx_window_manager_api.h | 5 +---- src/graphic/Fast3D/interpreter.h | 5 +---- src/public/bridge/audiobridge.h | 5 ----- src/public/bridge/consolevariablebridge.h | 5 ----- src/public/bridge/controllerbridge.h | 5 ----- src/public/bridge/crashhandlerbridge.h | 5 ----- src/public/bridge/gfxbridge.h | 5 +---- src/public/bridge/gfxdebuggerbridge.h | 9 ++------- src/public/bridge/resourcebridge.h | 5 ----- src/public/bridge/windowbridge.h | 5 ----- src/utils/AppleFolderManager.h | 5 +---- src/utils/binarytools/endianness.h | 5 +---- src/utils/macUtils.h | 5 ++--- src/window/FileDropMgr.h | 5 +---- 46 files changed, 43 insertions(+), 192 deletions(-) diff --git a/include/libultraship/bridge.h b/include/libultraship/bridge.h index 628790c..8a519ca 100644 --- a/include/libultraship/bridge.h +++ b/include/libultraship/bridge.h @@ -1,5 +1,4 @@ -#ifndef _LIBULTRASHIP_BRIDGE_H_ -#define _LIBULTRASHIP_BRIDGE_H_ +#pragma once #include "public/bridge/resourcebridge.h" #include "public/bridge/audiobridge.h" @@ -9,5 +8,3 @@ #include "public/bridge/crashhandlerbridge.h" #include "public/bridge/gfxdebuggerbridge.h" #include "public/bridge/gfxbridge.h" - -#endif diff --git a/include/libultraship/classes.h b/include/libultraship/classes.h index 7b75f82..499cc84 100644 --- a/include/libultraship/classes.h +++ b/include/libultraship/classes.h @@ -1,9 +1,6 @@ #pragma once #ifdef __cplusplus -#ifndef _LIBULTRASHIP_CLASSES_H -#define _LIBULTRASHIP_CLASSES_H - #include "resource/archive/ArchiveManager.h" #include "resource/archive/Archive.h" #include "resource/archive/OtrArchive.h" @@ -39,4 +36,3 @@ #include "utils/AppleFolderManager.h" #endif #endif -#endif diff --git a/include/libultraship/color.h b/include/libultraship/color.h index 654faeb..83eb3b9 100644 --- a/include/libultraship/color.h +++ b/include/libultraship/color.h @@ -1,5 +1,4 @@ -#ifndef COLOR_H -#define COLOR_H +#pragma once #include @@ -44,5 +43,3 @@ typedef union { #ifdef __cplusplus }; #endif - -#endif diff --git a/include/libultraship/libultra.h b/include/libultraship/libultra.h index 765224d..59df02a 100644 --- a/include/libultraship/libultra.h +++ b/include/libultraship/libultra.h @@ -1,5 +1,4 @@ -#ifndef _ULTRA64_H_ -#define _ULTRA64_H_ +#pragma once #include "libultra/abi.h" #include "libultra/controller.h" @@ -26,5 +25,3 @@ #include "libultra/time.h" #include "libultra/types.h" #include "libultra/vi.h" - -#endif diff --git a/include/libultraship/libultra/abi.h b/include/libultraship/libultra/abi.h index a4e5006..3258dd1 100644 --- a/include/libultraship/libultra/abi.h +++ b/include/libultraship/libultra/abi.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_ABI_H -#define ULTRA64_ABI_H +#pragma once typedef unsigned int u32; @@ -470,5 +469,3 @@ typedef short ENVMIX_STATE[40]; _a->words.w0 = (_SHIFTL(A_RESAMPLE_ZOH, 24, 8) | _SHIFTL(pitch, 0, 16)); \ _a->words.w1 = _SHIFTL(pitchAccu, 0, 16); \ } - -#endif /* ULTRA64_ABI_H */ diff --git a/include/libultraship/libultra/controller.h b/include/libultraship/libultra/controller.h index ac796cd..a82cb3d 100644 --- a/include/libultraship/libultra/controller.h +++ b/include/libultraship/libultra/controller.h @@ -1,8 +1,5 @@ #pragma once -#ifndef ULTRA64_CONTROLLER_H -#define ULTRA64_CONTROLLER_H - #include "stdint.h" #define SIAccessQueueSize 2 @@ -163,5 +160,3 @@ typedef struct { } __OSContReadHeader; // size = 0x8 #include "os.h" - -#endif diff --git a/include/libultraship/libultra/convert.h b/include/libultraship/libultra/convert.h index 3a9fda1..48dd06f 100644 --- a/include/libultraship/libultra/convert.h +++ b/include/libultraship/libultra/convert.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_CONVERT_H -#define ULTRA64_CONVERT_H +#pragma once #define OS_CLOCK_RATE 62500000LL #define OS_CPU_COUNTER (OS_CLOCK_RATE * 3 / 4) @@ -14,5 +13,3 @@ #define OS_PHYSICAL_TO_K0(x) (x) #define OS_PHYSICAL_TO_K1(x) (x) - -#endif diff --git a/include/libultraship/libultra/eeprom.h b/include/libultraship/libultra/eeprom.h index 5971b78..b64c87e 100644 --- a/include/libultraship/libultra/eeprom.h +++ b/include/libultraship/libultra/eeprom.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_EEPROM_H -#define ULTRA64_EEPROM_H +#pragma once #include "message.h" @@ -17,5 +16,3 @@ int32_t osEepromLongWrite(OSMesgQueue*, uint8_t, uint8_t*, int32_t); #ifdef __cplusplus } #endif - -#endif \ No newline at end of file diff --git a/include/libultraship/libultra/exception.h b/include/libultraship/libultra/exception.h index 08e6dfd..7442b80 100644 --- a/include/libultraship/libultra/exception.h +++ b/include/libultraship/libultra/exception.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_EXCEPTION_H -#define ULTRA64_EXCEPTION_H +#pragma once #include "types.h" @@ -41,5 +40,3 @@ void __osSetGlobalIntMask(OSHWIntr mask); void __osResetGlobalIntMask(OSHWIntr mask); extern __osHwInt __osHwIntTable[]; - -#endif diff --git a/include/libultraship/libultra/gbi.h b/include/libultraship/libultra/gbi.h index 9df58dc..915d19c 100644 --- a/include/libultraship/libultra/gbi.h +++ b/include/libultraship/libultra/gbi.h @@ -1,7 +1,6 @@ -#include "mbi.h" +#pragma once -#ifndef ULTRA64_GBI_H -#define ULTRA64_GBI_H +#include "mbi.h" #ifdef _MSC_VER #ifndef u8 @@ -4214,5 +4213,3 @@ typedef union Gfx { #define gDPNoOpTag3(pkt, type, data, n) gDma1p(pkt, G_NOOP, data, n, type) #endif - -#endif diff --git a/include/libultraship/libultra/gu.h b/include/libultraship/libultra/gu.h index 6fa3843..535140a 100644 --- a/include/libultraship/libultra/gu.h +++ b/include/libultraship/libultra/gu.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_GU_H -#define ULTRA64_GU_H +#pragma once #include "types.h" #include "gbi.h" @@ -200,5 +199,3 @@ void guSprite2DInit(uSprite* SpritePointer, void* SourceImagePointer, void* Tlut #ifdef __cplusplus } #endif - -#endif diff --git a/include/libultraship/libultra/internal.h b/include/libultraship/libultra/internal.h index c87e9a0..1433033 100644 --- a/include/libultraship/libultra/internal.h +++ b/include/libultraship/libultra/internal.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_INTERNAL_H -#define ULTRA64_INTERNAL_H +#pragma once #include "pi.h" @@ -26,5 +25,3 @@ extern __OSEventState __osEventStateTab[]; #ifdef __cplusplus } #endif - -#endif diff --git a/include/libultraship/libultra/interrupt.h b/include/libultraship/libultra/interrupt.h index 7c669c1..626ef41 100644 --- a/include/libultraship/libultra/interrupt.h +++ b/include/libultraship/libultra/interrupt.h @@ -1,6 +1,5 @@ -#ifndef ULTRA64_INTERRUPT_H -#define ULTRA64_INTERRUPT_H +#pragma once -typedef u32 OSIntMask; +#include -#endif +typedef uint32_t OSIntMask; diff --git a/include/libultraship/libultra/pfs.h b/include/libultraship/libultra/pfs.h index 4b7de62..faea235 100644 --- a/include/libultraship/libultra/pfs.h +++ b/include/libultraship/libultra/pfs.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_PFS_H -#define ULTRA64_PFS_H +#pragma once #include "message.h" @@ -133,5 +132,3 @@ typedef struct { /* 0x100 */ u8 bank; /* 0x101 */ u8 map[PFS_INODE_DIST_MAP]; } __OSInodeCache; // size = 0x202 - -#endif diff --git a/include/libultraship/libultra/pi.h b/include/libultraship/libultra/pi.h index e9a39bb..1624900 100644 --- a/include/libultraship/libultra/pi.h +++ b/include/libultraship/libultra/pi.h @@ -1,6 +1,4 @@ -#ifndef ULTRA64_PI_H -#define ULTRA64_PI_H - +#pragma once #include "message.h" typedef struct { @@ -79,5 +77,3 @@ typedef struct { #define DEVICE_TYPE_64DD 2 /* 64 Disk Drive */ #define DEVICE_TYPE_SRAM 3 /* SRAM */ #define DEVICE_TYPE_INIT 7 /* initial value */ - -#endif diff --git a/include/libultraship/libultra/printf.h b/include/libultraship/libultra/printf.h index 7724432..f5ece68 100644 --- a/include/libultraship/libultra/printf.h +++ b/include/libultraship/libultra/printf.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_PRINTF_H -#define ULTRA64_PRINTF_H +#pragma once #include "types.h" @@ -29,5 +28,3 @@ typedef void* (*PrintCallback)(void*, const char*, u32); #define FLAGS_MINUS 4 #define FLAGS_HASH 8 #define FLAGS_ZERO 16 - -#endif diff --git a/include/libultraship/libultra/r4300.h b/include/libultraship/libultra/r4300.h index 052304c..ac7d7c2 100644 --- a/include/libultraship/libultra/r4300.h +++ b/include/libultraship/libultra/r4300.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_R4300_H -#define ULTRA64_R4300_H +#pragma once #ifdef _LANGUAGE_C #include "types.h" @@ -363,5 +362,3 @@ #define FPCSR_RM_RZ 0x00000001 // round to zero #define FPCSR_RM_RP 0x00000002 // round to positive infinity #define FPCSR_RM_RM 0x00000003 // round to negative infinity - -#endif diff --git a/include/libultraship/libultra/rcp.h b/include/libultraship/libultra/rcp.h index b6577e1..8f3ac31 100644 --- a/include/libultraship/libultra/rcp.h +++ b/include/libultraship/libultra/rcp.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_RCP_H -#define ULTRA64_RCP_H +#pragma once /** * PIF Physical memory map (total size = 2 KB) @@ -268,5 +267,3 @@ #define IO_READ(addr) (*(vu32*)PHYS_TO_K1(addr)) #define IO_WRITE(addr, data) (*(vu32*)PHYS_TO_K1(addr) = (u32)(data)) - -#endif diff --git a/include/libultraship/libultra/rdp.h b/include/libultraship/libultra/rdp.h index 8d5cd52..6921ce5 100644 --- a/include/libultraship/libultra/rdp.h +++ b/include/libultraship/libultra/rdp.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_RDP_H -#define ULTRA64_RDP_H +#pragma once /* DP Command Registers */ @@ -47,5 +46,3 @@ #define DPC_CLR_PIPE_CTR 0x0080 #define DPC_CLR_CMD_CTR 0x0100 #define DPC_CLR_CLOCK_CTR 0x0200 - -#endif diff --git a/include/libultraship/libultra/sptask.h b/include/libultraship/libultra/sptask.h index 235b513..fa74dc9 100644 --- a/include/libultraship/libultra/sptask.h +++ b/include/libultraship/libultra/sptask.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_SPTASK_H -#define ULTRA64_SPTASK_H +#pragma once #include "types.h" @@ -64,5 +63,3 @@ typedef u32 OSYieldResult; #define osSpTaskStart(p) \ osSpTaskLoad(p); \ osSpTaskStartGo(p); - -#endif diff --git a/include/libultraship/libultra/thread.h b/include/libultraship/libultra/thread.h index dcc5ec6..75ced5a 100644 --- a/include/libultraship/libultra/thread.h +++ b/include/libultraship/libultra/thread.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_THREAD_H -#define ULTRA64_THREAD_H +#pragma once #include "types.h" @@ -60,5 +59,3 @@ typedef struct OSThread { /* 0x1C */ __OSThreadprofile* thprof; /* 0x20 */ __OSThreadContext context; } OSThread; // size = 0x1B0 - -#endif diff --git a/include/libultraship/libultra/time.h b/include/libultraship/libultra/time.h index 5c6650b..6241eb0 100644 --- a/include/libultraship/libultra/time.h +++ b/include/libultraship/libultra/time.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_TIME_H -#define ULTRA64_TIME_H +#pragma once #include "message.h" @@ -13,5 +12,3 @@ typedef struct OSTimer { /* 0x18 */ OSMesgQueue* mq; /* 0x1C */ OSMesg msg; } OSTimer; // size = 0x20 - -#endif diff --git a/include/libultraship/libultra/types.h b/include/libultraship/libultra/types.h index bbe6f24..0ed49c9 100644 --- a/include/libultraship/libultra/types.h +++ b/include/libultraship/libultra/types.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_TYPES_H -#define ULTRA64_TYPES_H +#pragma once #include #include @@ -55,5 +54,3 @@ typedef MtxS Mtx; #else typedef MtxF Mtx; #endif - -#endif diff --git a/include/libultraship/libultra/vi.h b/include/libultraship/libultra/vi.h index bf3e9b9..1b50f3d 100644 --- a/include/libultraship/libultra/vi.h +++ b/include/libultraship/libultra/vi.h @@ -1,5 +1,4 @@ -#ifndef ULTRA64_VI_H -#define ULTRA64_VI_H +#pragma once #include "message.h" @@ -133,5 +132,3 @@ typedef struct { #define OS_TV_NTSC 1 #define OS_TV_MPAL 2 #define OS_VI_UNK28 28 - -#endif diff --git a/include/libultraship/libultraship.h b/include/libultraship/libultraship.h index 6190569..e01d10e 100644 --- a/include/libultraship/libultraship.h +++ b/include/libultraship/libultraship.h @@ -1,5 +1,4 @@ -#ifndef _LIBULTRASHIP_H_ -#define _LIBULTRASHIP_H_ +#pragma once #include "libultra.h" #include "bridge.h" @@ -9,5 +8,3 @@ #ifdef __cplusplus #include "classes.h" #endif - -#endif diff --git a/src/debug/CrashHandler.h b/src/debug/CrashHandler.h index 23f5bed..9a35cff 100644 --- a/src/debug/CrashHandler.h +++ b/src/debug/CrashHandler.h @@ -1,5 +1,4 @@ -#ifndef CRASH_HANDLER_H -#define CRASH_HANDLER_H +#pragma once #include @@ -49,5 +48,3 @@ class CrashHandler { bool CheckStrLen(const char* str); }; } // namespace Ship - -#endif // CRASH_HANDLER_H diff --git a/src/graphic/Fast3D/backends/gfx_dxgi.h b/src/graphic/Fast3D/backends/gfx_dxgi.h index 9a5aab1..398e594 100644 --- a/src/graphic/Fast3D/backends/gfx_dxgi.h +++ b/src/graphic/Fast3D/backends/gfx_dxgi.h @@ -1,5 +1,4 @@ -#ifndef GFX_DXGI_H -#define GFX_DXGI_H +#pragma once #if defined(ENABLE_DX11) || defined(ENABLE_DX12) #include "gfx_rendering_api.h" @@ -121,4 +120,3 @@ void ThrowIfFailed(HRESULT res, HWND h_wnd, const char* message); #endif #endif -#endif diff --git a/src/graphic/Fast3D/backends/gfx_metal.h b/src/graphic/Fast3D/backends/gfx_metal.h index 6437893..b926895 100644 --- a/src/graphic/Fast3D/backends/gfx_metal.h +++ b/src/graphic/Fast3D/backends/gfx_metal.h @@ -4,12 +4,9 @@ // // Created by David Chavez on 16.08.22. // - +#pragma once #ifdef __APPLE__ -#ifndef GFX_METAL_H -#define GFX_METAL_H - #include "gfx_rendering_api.h" #include "../interpreter.h" @@ -219,4 +216,3 @@ class GfxRenderingAPIMetal final : public GfxRenderingAPI { bool Metal_IsSupported(); #endif -#endif diff --git a/src/graphic/Fast3D/backends/gfx_opengl.h b/src/graphic/Fast3D/backends/gfx_opengl.h index be7356b..a95876e 100644 --- a/src/graphic/Fast3D/backends/gfx_opengl.h +++ b/src/graphic/Fast3D/backends/gfx_opengl.h @@ -1,6 +1,5 @@ #ifdef ENABLE_OPENGL -#ifndef GFX_OPENGL_H -#define GFX_OPENGL_H +#pragma once #include "gfx_rendering_api.h" #include "../interpreter.h" @@ -133,4 +132,3 @@ class GfxRenderingAPIOGL final : public GfxRenderingAPI { } // namespace Fast #endif -#endif \ No newline at end of file diff --git a/src/graphic/Fast3D/backends/gfx_rendering_api.h b/src/graphic/Fast3D/backends/gfx_rendering_api.h index 086b95c..d95bcc0 100644 --- a/src/graphic/Fast3D/backends/gfx_rendering_api.h +++ b/src/graphic/Fast3D/backends/gfx_rendering_api.h @@ -1,5 +1,4 @@ -#ifndef GFX_RENDERING_API_H -#define GFX_RENDERING_API_H +#pragma once #include @@ -84,4 +83,3 @@ class GfxRenderingAPI { bool mSrgbMode = false; }; } // namespace Fast -#endif diff --git a/src/graphic/Fast3D/backends/gfx_screen_config.h b/src/graphic/Fast3D/backends/gfx_screen_config.h index 5b933f8..30cac0e 100644 --- a/src/graphic/Fast3D/backends/gfx_screen_config.h +++ b/src/graphic/Fast3D/backends/gfx_screen_config.h @@ -1,7 +1,4 @@ -#ifndef GFX_SCREEN_CONFIG_H -#define GFX_SCREEN_CONFIG_H +#pragma once #define DESIRED_SCREEN_WIDTH 640 #define DESIRED_SCREEN_HEIGHT 480 - -#endif diff --git a/src/graphic/Fast3D/backends/gfx_sdl.h b/src/graphic/Fast3D/backends/gfx_sdl.h index 2ee428c..cbb3a2a 100644 --- a/src/graphic/Fast3D/backends/gfx_sdl.h +++ b/src/graphic/Fast3D/backends/gfx_sdl.h @@ -1,5 +1,4 @@ -#ifndef GFX_SDL_H -#define GFX_SDL_H +#pragma once #include "gfx_window_manager_api.h" namespace Fast { @@ -62,4 +61,3 @@ class GfxWindowBackendSDL2 final : public GfxWindowBackend { void (*mOnAllKeysUp)(); }; } // namespace Fast -#endif diff --git a/src/graphic/Fast3D/backends/gfx_window_manager_api.h b/src/graphic/Fast3D/backends/gfx_window_manager_api.h index e793e6c..46615c8 100644 --- a/src/graphic/Fast3D/backends/gfx_window_manager_api.h +++ b/src/graphic/Fast3D/backends/gfx_window_manager_api.h @@ -1,5 +1,4 @@ -#ifndef GFX_WINDOW_MANAGER_API_H -#define GFX_WINDOW_MANAGER_API_H +#pragma once #include #include @@ -50,5 +49,3 @@ class GfxWindowBackend { bool mVsyncEnabled = true; }; } // namespace Fast - -#endif diff --git a/src/graphic/Fast3D/interpreter.h b/src/graphic/Fast3D/interpreter.h index 950b25d..e9e3f3b 100644 --- a/src/graphic/Fast3D/interpreter.h +++ b/src/graphic/Fast3D/interpreter.h @@ -1,5 +1,4 @@ -#ifndef GFX_PC_H -#define GFX_PC_H +#pragma once #include #include @@ -528,5 +527,3 @@ const char* GfxGetOpcodeName(int8_t opcode); extern "C" void gfx_texture_cache_clear(); extern "C" int gfx_create_framebuffer(uint32_t width, uint32_t height, uint32_t native_width, uint32_t native_height, uint8_t resize); - -#endif diff --git a/src/public/bridge/audiobridge.h b/src/public/bridge/audiobridge.h index 6c5202e..5930cb5 100644 --- a/src/public/bridge/audiobridge.h +++ b/src/public/bridge/audiobridge.h @@ -1,8 +1,5 @@ #pragma once -#ifndef AUDIOBRIDGE_H -#define AUDIOBRIDGE_H - #include "stdint.h" #include "stddef.h" @@ -21,5 +18,3 @@ void AudioPlayerPlayFrame(const uint8_t* buf, size_t len); #ifdef __cplusplus }; #endif - -#endif diff --git a/src/public/bridge/consolevariablebridge.h b/src/public/bridge/consolevariablebridge.h index b6d7fa1..2915266 100644 --- a/src/public/bridge/consolevariablebridge.h +++ b/src/public/bridge/consolevariablebridge.h @@ -1,8 +1,5 @@ #pragma once -#ifndef _CONSOLEVARIABLEBRIDGE_H -#define _CONSOLEVARIABLEBRIDGE_H - #include "stdint.h" #include "libultraship/color.h" @@ -43,5 +40,3 @@ void CVarSave(); #ifdef __cplusplus }; #endif - -#endif \ No newline at end of file diff --git a/src/public/bridge/controllerbridge.h b/src/public/bridge/controllerbridge.h index 0c04b54..1b02940 100644 --- a/src/public/bridge/controllerbridge.h +++ b/src/public/bridge/controllerbridge.h @@ -1,8 +1,5 @@ #pragma once -#ifndef CONTROLDECKBRIDGE_H -#define CONTROLDECKBRIDGE_H - #include #ifdef __cplusplus @@ -15,5 +12,3 @@ void ControllerUnblockGameInput(uint16_t inputBlockId); #ifdef __cplusplus }; #endif - -#endif \ No newline at end of file diff --git a/src/public/bridge/crashhandlerbridge.h b/src/public/bridge/crashhandlerbridge.h index ad6fc74..f65c3e7 100644 --- a/src/public/bridge/crashhandlerbridge.h +++ b/src/public/bridge/crashhandlerbridge.h @@ -1,8 +1,5 @@ #pragma once -#ifndef CRASHHANDLERBRIDGE_H -#define CRASHHANDLERBRIDGE_H - #include typedef void (*CrashHandlerCallback)(char*, size_t*); @@ -16,5 +13,3 @@ void CrashHandlerRegisterCallback(CrashHandlerCallback callback); #ifdef __cplusplus } #endif - -#endif diff --git a/src/public/bridge/gfxbridge.h b/src/public/bridge/gfxbridge.h index 64eab37..0ae5f18 100644 --- a/src/public/bridge/gfxbridge.h +++ b/src/public/bridge/gfxbridge.h @@ -1,5 +1,4 @@ -#ifndef GFX_BRIDGE_H -#define GFX_BRIDGE_H +#pragma once #include "stdint.h" @@ -24,5 +23,3 @@ uint16_t GfxGetPixelDepth(float x, float y); #ifdef __cplusplus } #endif - -#endif diff --git a/src/public/bridge/gfxdebuggerbridge.h b/src/public/bridge/gfxdebuggerbridge.h index a3781cf..24a3ee7 100644 --- a/src/public/bridge/gfxdebuggerbridge.h +++ b/src/public/bridge/gfxdebuggerbridge.h @@ -1,10 +1,7 @@ #pragma once -#ifndef GFXDEBUGGER_H -#define GFXDEBUGGER_H - -#include "stdint.h" -#include "stddef.h" +#include +#include #ifdef __cplusplus extern "C" { @@ -18,5 +15,3 @@ void GfxDebuggerDebugDisplayList(void* cmds); #ifdef __cplusplus }; #endif - -#endif diff --git a/src/public/bridge/resourcebridge.h b/src/public/bridge/resourcebridge.h index d2b78eb..6a6e42a 100644 --- a/src/public/bridge/resourcebridge.h +++ b/src/public/bridge/resourcebridge.h @@ -1,8 +1,5 @@ #pragma once -#ifndef RESOURCEBRIDGE_H -#define RESOURCEBRIDGE_H - #include "stdint.h" #ifdef __cplusplus @@ -52,5 +49,3 @@ uint32_t IsResourceManagerLoaded(); #ifdef __cplusplus }; #endif - -#endif diff --git a/src/public/bridge/windowbridge.h b/src/public/bridge/windowbridge.h index 4f6781f..623f16d 100644 --- a/src/public/bridge/windowbridge.h +++ b/src/public/bridge/windowbridge.h @@ -1,8 +1,5 @@ #pragma once -#ifndef WINDOWBRIDGE_H -#define WINDOWBRIDGE_H - #include "stdint.h" #ifdef __cplusplus @@ -20,5 +17,3 @@ bool WindowIsFullscreen(); #ifdef __cplusplus }; #endif - -#endif \ No newline at end of file diff --git a/src/utils/AppleFolderManager.h b/src/utils/AppleFolderManager.h index 5daec9d..904b6ec 100644 --- a/src/utils/AppleFolderManager.h +++ b/src/utils/AppleFolderManager.h @@ -5,8 +5,7 @@ // Created by David Chavez on 28.06.22. // -#ifndef AppleFolderManager_h -#define AppleFolderManager_h +#pragma once #include namespace Ship { @@ -66,5 +65,3 @@ class FolderManager { void* m_autoreleasePool; }; }; // namespace Ship - -#endif /* AppleFolderManager_h */ diff --git a/src/utils/binarytools/endianness.h b/src/utils/binarytools/endianness.h index 55253de..3b17a8b 100644 --- a/src/utils/binarytools/endianness.h +++ b/src/utils/binarytools/endianness.h @@ -1,5 +1,4 @@ -#ifndef ENDIANESS_H -#define ENDIANESS_H +#pragma once #ifdef __cplusplus namespace Ship { @@ -84,5 +83,3 @@ enum class Endianness { #define LE32SWAP_CONST(x) (x) #define LE64SWAP_CONST(x) (x) #endif - -#endif diff --git a/src/utils/macUtils.h b/src/utils/macUtils.h index c9e82d3..caf0caf 100644 --- a/src/utils/macUtils.h +++ b/src/utils/macUtils.h @@ -1,5 +1,5 @@ -#ifndef macUtils_h -#define macUtils_h +#pragma once + #include #ifdef __cplusplus extern "C" { @@ -9,4 +9,3 @@ bool isNativeMacOSFullscreenActive(SDL_Window* window); #ifdef __cplusplus } #endif -#endif diff --git a/src/window/FileDropMgr.h b/src/window/FileDropMgr.h index b7f40c1..27d83a5 100644 --- a/src/window/FileDropMgr.h +++ b/src/window/FileDropMgr.h @@ -1,5 +1,4 @@ -#ifndef FILEDROPMGR_H -#define FILEDROPMGR_H +#pragma once namespace Ship { @@ -18,5 +17,3 @@ class FileDropMgr { }; } // namespace Ship - -#endif // FILEDROPMGR_H