Replace header ifdef guards with #pragma once

include/behavior_data.h

@@ -1,5 +1,4 @@
-#ifndef BEHAVIOR_DATA_H
-#define BEHAVIOR_DATA_H
+#pragma once
 
 #include "types.h"
 
@@ -530,5 +529,3 @@ extern const BehaviorScript bhvEndBirds1[];
 extern const BehaviorScript bhvEndBirds2[];
 extern const BehaviorScript bhvIntroScene[];
 extern const BehaviorScript bhvUnusedFakeStar[];
-
-#endif // BEHAVIOR_DATA_H

include/command_macros_base.h

@@ -1,5 +1,4 @@
-#ifndef COMMAND_MACROS_BASE_H
-#define COMMAND_MACROS_BASE_H
+#pragma once
 
 #include "platform_info.h"
 
@@ -24,5 +23,3 @@
 #define CMD_PTR(a) ((uintptr_t)(a))
 
 #define CMD_HHHHHH(a, b, c, d, e, f) CMD_HH(a, b), CMD_HH(c, d), CMD_HH(e, f)
-
-#endif // COMMAND_MACROS_BASE_H

include/course_table.h

@@ -1,5 +1,4 @@
-#ifndef COURSE_TABLE_H
-#define COURSE_TABLE_H
+#pragma once
 
 // Start of the 3 cap courses in a row.
 #define COURSE_CAP_COURSES COURSE_COTMC
@@ -28,5 +27,3 @@ enum CourseNum
 #undef DEFINE_BONUS_COURSE
 
 #define COURSE_IS_MAIN_COURSE(cmd) (cmd >= COURSE_MIN && cmd <= COURSE_STAGES_MAX)
-
-#endif // COURSE_TABLE_H

include/dialog_ids.h

@@ -1,5 +1,4 @@
-#ifndef DIALOG_IDS_H
-#define DIALOG_IDS_H
+#pragma once
 
 enum DialogId {
     DIALOG_NONE = -1,
@@ -175,5 +174,3 @@ enum DialogId {
     DIALOG_169,
     DIALOG_COUNT
 };
-
-#endif // DIALOG_IDS_H

include/eu_translation.h

@@ -1,5 +1,4 @@
-#ifndef EU_TRANSLATION_H
-#define EU_TRANSLATION_H
+#pragma once
 
 // EU changes most text to arrays for each language. This define allows these
 // differences to be combined.
@@ -16,5 +15,3 @@ extern void *act_name_table_eu_fr[];
 extern void *dialog_table_eu_de[];
 extern void *course_name_table_eu_de[];
 extern void *act_name_table_eu_de[];
-
-#endif // EU_TRANSLATION_H

include/farcall.h

@@ -1,5 +1,4 @@
-#ifndef __FARCALL_H__
-#define __FARCALL_H__
+#pragma once
 
 #ifdef __GNUC__
 #define farcall(x) x
@@ -12,8 +11,6 @@
 #define near
 #endif
 
-#endif
-
 /*
 How to use:
 

include/geo_commands.h

@@ -1,5 +1,4 @@
-#ifndef GEO_COMMANDS_H
-#define GEO_COMMANDS_H
+#pragma once
 
 #include "command_macros_base.h"
 
@@ -446,6 +445,3 @@
     CMD_BBH(GEO_BONE_ID, layer, 0x0000), \
     CMD_HHHHHH(tx, ty, tz, rx, ry, rz), \
     CMD_PTR(displayList)
-
-
-#endif // GEO_COMMANDS_H

include/gfx_dimensions.h

@@ -1,5 +1,4 @@
-#ifndef GFX_DIMENSIONS_H
-#define GFX_DIMENSIONS_H
+#pragma once
 
 /*
 
@@ -37,5 +36,3 @@ Note that RECT commands must be enhanced to support negative coordinates with th
 
 // If screen is taller than it is wide, radius should be equal to SCREEN_HEIGHT since we scale horizontally
 #define GFX_DIMENSIONS_FULL_RADIUS (SCREEN_HEIGHT * (GFX_DIMENSIONS_ASPECT_RATIO > 1 ? GFX_DIMENSIONS_ASPECT_RATIO : 1))
-
-#endif // GFX_DIMENSIONS_H

include/gzip.h

@@ -1,5 +1,4 @@
-#ifndef __GZIP_H__
-#define	__GZIP_H__
+#pragma once
 
 
 #ifndef NULL
@@ -54,6 +53,3 @@ extern int	flush_window(void);
 //
 //
 u32   expand_gzip(u8 *src_addr, u8 *dst_addr, u32 size, u32 outbytes_limit);
-
-
-#endif

include/helper_macros.h

@@ -1,6 +1,3 @@
-#ifndef HELPER_MACROS_H
-#define HELPER_MACROS_H
+#pragma once
 
 #define LIST_NEXT_ITEM(curItem, type) ((type *)((s32)curItem + sizeof(type)))
-
-#endif // HELPER_MACROS_H

include/hvqm/HVQM2File.h

@@ -7,8 +7,7 @@
 
 /*  revision 1.1  1999-02-12  */
 
-#ifndef __HVQM2FILE_H__
-#define __HVQM2FILE_H__
+#pragma once
 
 #include <HVQmd.h>
 
@@ -118,5 +117,3 @@ typedef struct {
 #define HVQM2_NESTSIZE_L 70	/* Number of elements on long side */
 #define HVQM2_NESTSIZE_S 38	/* Number of elements on shot side */
 #define HVQM2_NESTSIZE   (HVQM2_NESTSIZE_L * HVQM2_NESTSIZE_S)
-
-#endif /* __HVQM2FILE_H__ */

include/hvqm/HVQmd.h

@@ -7,8 +7,7 @@
 
 /*  revision 1.0  1998-10-14  */
 
-#ifndef __HVQMD_H__
-#define __HVQMD_H__
+#pragma once
 
 #include <ultra64.h>
 
@@ -18,5 +17,3 @@ typedef u16 CARD16;
 typedef s16 INT16;
 typedef u32 CARD32;
 typedef s32 INT32;
-
-#endif /* __HVQMD_H__ */

include/hvqm/adpcmdec.h

@@ -7,8 +7,7 @@
 
 /*  revision 1.0  1998-12-17  */
 
-#ifndef   __ADPCMDEC_H__
-#define   __ADPCMDEC_H__
+#pragma once
 
 #include <ultra64.h>
 
@@ -28,6 +27,4 @@ void adpcmDecode(void *instream, u32 format, u32 samples, s16 *outstream, u32 ex
 #define  ADPCM_RESET     0
 #define  ADPCM_CONTINUE  1
 
-#endif /* __ADPCMDEC_H__ */
-
 /* end */

include/hvqm/hvqm2dec.h

@@ -6,8 +6,7 @@
 
 /*  revision 1.2  1999-03-26  */
 
-#ifndef __HVQM2DEC_H__
-#define __HVQM2DEC_H__
+#pragma once
 
 #include <ultra64.h>
 #include <HVQM2File.h>
@@ -99,6 +98,4 @@ extern  u8  hvqm2sp1DataStart[], hvqm2sp1DataEnd[];
 extern  u8  hvqm2sp2TextStart[], hvqm2sp2TextEnd[];
 extern  u8  hvqm2sp2DataStart[], hvqm2sp2DataEnd[];
 
-#endif /* __HVQM2DEC_H__ */
-
 /* end */

include/ique/PR/PRimage.h

@@ -6,8 +6,7 @@
  *
  **************************************************************************/
 
-#ifndef	__GL_IMAGE_H__
-#define	__GL_IMAGE_H__
+#pragma once
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -123,4 +122,3 @@ unsigned short *ibufalloc();
 #ifdef __cplusplus
 }
 #endif
-#endif	/* !__GL_IMAGE_H__ */

include/ique/PR/R4300.h

@@ -18,8 +18,7 @@
  *
  **************************************************************************/
 
-#ifndef __R4300_H__
-#define __R4300_H__
+#pragma once
 
 #include <PR/ultratypes.h>
 
@@ -449,5 +448,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 /* __R4300_H */

include/ique/PR/abi.h

@@ -1,5 +1,4 @@
-#ifndef _ABI_H_
-#define _ABI_H_
+#pragma once
 
 /**************************************************************************
  *                                                                        *
@@ -992,5 +991,3 @@ typedef short ENVMIX_STATE[40];
 #endif
 
 #endif /* _LANGUAGE_C */
-
-#endif /* !_ABI_H_ */

include/ique/PR/dbgdefs.h

@@ -18,8 +18,7 @@
  *
  **************************************************************************/
 
-#ifndef _DBGDEFS_H_
-#define	_DBGDEFS_H_
+#pragma once
 
 #ifdef _LANGUAGE_C_PLUS_PLUS
 extern "C" {
@@ -34,5 +33,3 @@ typedef unsigned char TVuchar;
 #ifdef _LANGUAGE_C_PLUS_PLUS
 }
 #endif
-
-#endif

include/ique/PR/em.h

@@ -1,5 +1,4 @@
-#ifndef _EM_H_
-#define	_EM_H_
+#pragma once
 
 /**************************************************************************
  *									  *
@@ -98,5 +97,3 @@ extern void	emPause(void);
 
 
 #endif /* _LANGUAGE_C */
-
-#endif /* !_EM_H_ */

include/ique/PR/gbi-poslight.h

@@ -1,5 +1,4 @@
-#ifndef _GBI_POSLIGHT_H_
-#define _GBI_POSLIGHT_H_
+#pragma once
 
 /* version 990705 */
 #define G_LIGHTING_POSITIONAL 0x00400000
@@ -125,5 +124,3 @@ typedef struct {
       _gdSPDefPosLight(r5,g5,b5,x5,y5,z5,c5,l5,q5), \
       _gdSPDefPosLight(r6,g6,b6,x6,y6,z6,c6,l6,q6), \
       _gdSPDefPosLight(r7,g7,b7,x7,y7,z7,c7,l7,q7)} }
-
-#endif /* _GBI_POSLIGHT_H_ */