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

@@ -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

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

include/libultraship/color.h

@@ -1,5 +1,4 @@
-#ifndef COLOR_H
-#define COLOR_H
+#pragma once
 
 #include <stdint.h>
 
@@ -44,5 +43,3 @@ typedef union {
 #ifdef __cplusplus
 };
 #endif
-
-#endif

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

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 */

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

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

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

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

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

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

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

include/libultraship/libultra/interrupt.h

@@ -1,6 +1,5 @@
-#ifndef ULTRA64_INTERRUPT_H
-#define ULTRA64_INTERRUPT_H
+#pragma once
 
-typedef u32 OSIntMask;
+#include <stdint.h>
 
-#endif
+typedef uint32_t OSIntMask;

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

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

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

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

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

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

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