diff --git a/actors/common0.h b/actors/common0.h index 53c7f396..202c6d60 100644 --- a/actors/common0.h +++ b/actors/common0.h @@ -1,5 +1,4 @@ -#ifndef COMMON0_H -#define COMMON0_H +#pragma once #include "types.h" @@ -190,5 +189,3 @@ extern const Collision purple_switch_seg8_collision_0800C7A8[]; extern const GeoLayout test_platform_geo[]; extern const Gfx unknown_seg8_dl_08026260[]; extern const Collision unknown_seg8_collision_080262F8[]; - -#endif diff --git a/actors/common1.h b/actors/common1.h index 9a1b650e..3c8b5b99 100644 --- a/actors/common1.h +++ b/actors/common1.h @@ -1,5 +1,4 @@ -#ifndef COMMON1_H -#define COMMON1_H +#pragma once #include "types.h" @@ -249,5 +248,3 @@ extern const Gfx wooden_signpost_seg3_dl_0302DC40[]; extern const Gfx wooden_signpost_seg3_dl_0302DCD0[]; extern const Gfx wooden_signpost_seg3_dl_0302DD08[]; extern const Collision wooden_signpost_seg3_collision_0302DD80[]; - -#endif diff --git a/actors/group0.h b/actors/group0.h index 44f8b05d..3409bbd4 100644 --- a/actors/group0.h +++ b/actors/group0.h @@ -1,5 +1,4 @@ -#ifndef GROUP0_H -#define GROUP0_H +#pragma once #include "types.h" @@ -341,5 +340,3 @@ extern const Gfx white_particle_small_dl_begin[]; extern const Gfx white_particle_small_dl_end[]; extern const Gfx white_particle_small_dl[]; extern const Gfx white_particle_small_unused_dl[]; - -#endif diff --git a/actors/group1.h b/actors/group1.h index 23990b04..047dcf4f 100644 --- a/actors/group1.h +++ b/actors/group1.h @@ -1,5 +1,4 @@ -#ifndef GROUP1_H -#define GROUP1_H +#pragma once #include "types.h" @@ -90,5 +89,3 @@ extern const Gfx yoshi_egg_seg5_dl_05009880[]; extern const Gfx yoshi_egg_seg5_dl_05009898[]; extern const Gfx yoshi_egg_seg5_dl_050098B0[]; extern const Gfx yoshi_egg_seg5_dl_050098C8[]; - -#endif diff --git a/actors/group10.h b/actors/group10.h index 6a518be2..c1129d8f 100644 --- a/actors/group10.h +++ b/actors/group10.h @@ -1,5 +1,4 @@ -#ifndef GROUP10_H -#define GROUP10_H +#pragma once #include "types.h" @@ -93,5 +92,3 @@ extern const Gfx yoshi_seg5_dl_050222A8[]; extern const Gfx yoshi_seg5_dl_05022408[]; extern const Gfx yoshi_seg5_dl_05022608[]; extern const struct Animation *const yoshi_seg5_anims_05024100[]; - -#endif diff --git a/actors/group11.h b/actors/group11.h index 6d6fdc43..cb195f0d 100644 --- a/actors/group11.h +++ b/actors/group11.h @@ -1,5 +1,4 @@ -#ifndef GROUP11_H -#define GROUP11_H +#pragma once #include "types.h" @@ -94,5 +93,3 @@ extern const Gfx wiggler_seg5_dl_0500E608[]; extern const Gfx wiggler_seg5_dl_0500E640[]; extern const Gfx wiggler_seg5_dl_0500E678[]; extern const struct Animation *const wiggler_seg5_anims_0500EC8C[]; - -#endif diff --git a/actors/group12.h b/actors/group12.h index 02258c86..6d284c8e 100644 --- a/actors/group12.h +++ b/actors/group12.h @@ -1,5 +1,4 @@ -#ifndef GROUP12_H -#define GROUP12_H +#pragma once #include "types.h" @@ -134,5 +133,3 @@ extern const Gfx impact_smoke_seg6_dl_06062D18[]; extern const GeoLayout bowser_1_yellow_sphere_geo[]; extern const Gfx yellow_sphere_seg6_dl_0601F388[]; extern const Gfx yellow_sphere_seg6_dl_0601F3C0[]; - -#endif diff --git a/actors/group13.h b/actors/group13.h index 6978503d..e4eec4dc 100644 --- a/actors/group13.h +++ b/actors/group13.h @@ -1,5 +1,4 @@ -#ifndef GROUP13_H -#define GROUP13_H +#pragma once #include "types.h" @@ -99,5 +98,3 @@ extern const Gfx water_mine_seg6_dl_0600D3F8[]; extern const GeoLayout water_ring_geo[]; extern const Gfx water_ring_seg6_dl_06013AC0[]; extern const struct Animation *const water_ring_seg6_anims_06013F7C[]; - -#endif diff --git a/actors/group14.h b/actors/group14.h index f776dcd5..ee99f0e1 100644 --- a/actors/group14.h +++ b/actors/group14.h @@ -1,5 +1,4 @@ -#ifndef GROUP14_H -#define GROUP14_H +#pragma once #include "types.h" @@ -132,5 +131,3 @@ extern const Gfx whomp_seg6_dl_0601FFA0[]; extern const Gfx whomp_seg6_dl_06020038[]; extern const struct Animation *const whomp_seg6_anims_06020A04[]; extern const Collision whomp_seg6_collision_06020A0C[]; - -#endif diff --git a/actors/group15.h b/actors/group15.h index 76f4a650..f71a3d83 100644 --- a/actors/group15.h +++ b/actors/group15.h @@ -1,5 +1,4 @@ -#ifndef GROUP15_H -#define GROUP15_H +#pragma once #include "types.h" @@ -85,5 +84,3 @@ extern const Gfx toad_seg6_dl_06008890[]; extern const Gfx toad_seg6_dl_06008A90[]; extern const Gfx toad_seg6_dl_06008BD8[]; extern const struct Animation *const toad_seg6_anims_0600FB58[]; - -#endif diff --git a/actors/group16.h b/actors/group16.h index 5ebea5df..3a9efb2a 100644 --- a/actors/group16.h +++ b/actors/group16.h @@ -1,5 +1,4 @@ -#ifndef GROUP16_H -#define GROUP16_H +#pragma once #include "types.h" @@ -34,5 +33,3 @@ extern const Gfx moneybag_seg6_dl_06005750[]; extern const Gfx moneybag_seg6_dl_06005980[]; extern const Gfx moneybag_seg6_dl_060059F0[]; extern const struct Animation *const moneybag_seg6_anims_06005E5C[]; - -#endif diff --git a/actors/group17.h b/actors/group17.h index e28bc024..4e68aa78 100644 --- a/actors/group17.h +++ b/actors/group17.h @@ -1,5 +1,4 @@ -#ifndef GROUP17_H -#define GROUP17_H +#pragma once #include "types.h" @@ -101,5 +100,3 @@ extern const Gfx swoop_seg6_dl_06006BD0[]; extern const Gfx swoop_seg6_dl_06006CC8[]; extern const Gfx swoop_seg6_dl_06006D00[]; extern const struct Animation *const swoop_seg6_anims_060070D0[]; - -#endif diff --git a/actors/group2.h b/actors/group2.h index d40c61fd..5c58cc9f 100644 --- a/actors/group2.h +++ b/actors/group2.h @@ -1,5 +1,4 @@ -#ifndef GROUP2_H -#define GROUP2_H +#pragma once #include "types.h" @@ -27,5 +26,3 @@ extern const Gfx bully_seg5_dl_05003EA8[]; extern const Gfx bully_seg5_dl_05003F80[]; extern const Gfx bully_seg5_dl_05003FC8[]; extern const struct Animation *const bully_seg5_anims_0500470C[]; - -#endif diff --git a/actors/group3.h b/actors/group3.h index e6154e11..5f639105 100644 --- a/actors/group3.h +++ b/actors/group3.h @@ -1,5 +1,4 @@ -#ifndef GROUP3_H -#define GROUP3_H +#pragma once #include "types.h" @@ -37,5 +36,3 @@ extern const GeoLayout water_bomb_geo[]; extern const GeoLayout water_bomb_shadow_geo[]; extern const Gfx water_bubble_seg5_dl_05010D30[]; extern const Gfx water_bubble_seg5_dl_05011000[]; - -#endif diff --git a/actors/group4.h b/actors/group4.h index 16b3aa49..2f8d2f98 100644 --- a/actors/group4.h +++ b/actors/group4.h @@ -1,5 +1,4 @@ -#ifndef GROUP4_H -#define GROUP4_H +#pragma once #include "types.h" @@ -104,5 +103,3 @@ extern const struct Animation *const unagi_seg5_anims_05012824[]; // whirlpool extern const Gfx whirlpool_seg5_dl_05013B58[]; extern const Gfx whirlpool_seg5_dl_05013CB8[]; - -#endif diff --git a/actors/group5.h b/actors/group5.h index 9135cdb1..dc90c26e 100644 --- a/actors/group5.h +++ b/actors/group5.h @@ -1,5 +1,4 @@ -#ifndef GROUP5_H -#define GROUP5_H +#pragma once #include "types.h" @@ -81,5 +80,3 @@ extern const Gfx pokey_seg5_dl_050130B0[]; extern const Gfx tornado_seg5_dl_05014450[]; extern const Gfx tornado_seg5_dl_050145C0[]; extern const GeoLayout tweester_geo[]; - -#endif diff --git a/actors/group6.h b/actors/group6.h index d8c6fc1c..0110fe08 100644 --- a/actors/group6.h +++ b/actors/group6.h @@ -1,5 +1,4 @@ -#ifndef GROUP6_H -#define GROUP6_H +#pragma once #include "types.h" @@ -83,5 +82,3 @@ extern const Gfx ukiki_seg5_dl_0500CFF0[]; extern const Gfx ukiki_seg5_dl_0500D078[]; extern const Gfx ukiki_seg5_dl_0500D108[]; extern const struct Animation *const ukiki_seg5_anims_05015784[]; - -#endif diff --git a/actors/group7.h b/actors/group7.h index f5d9332f..5d4d908b 100644 --- a/actors/group7.h +++ b/actors/group7.h @@ -1,5 +1,4 @@ -#ifndef GROUP7_H -#define GROUP7_H +#pragma once #include "types.h" @@ -60,5 +59,3 @@ extern const Gfx spindrift_seg5_dl_05002B30[]; extern const Gfx spindrift_seg5_dl_05002C98[]; extern const Gfx spindrift_seg5_dl_05002D08[]; extern const struct Animation *const spindrift_seg5_anims_05002D68[]; - -#endif diff --git a/actors/group8.h b/actors/group8.h index 19b3956b..b3ca46eb 100644 --- a/actors/group8.h +++ b/actors/group8.h @@ -1,5 +1,4 @@ -#ifndef GROUP8_H -#define GROUP8_H +#pragma once #include "types.h" @@ -25,5 +24,3 @@ extern const Gfx springboard_checkerboard_seg5_dl_050016B8[]; extern const Gfx springboard_spring_seg5_dl_05001800[]; extern const Gfx springboard_checkerboard_seg5_dl_05001900[]; extern const Collision springboard_collision_05001A28[]; - -#endif diff --git a/actors/group9.h b/actors/group9.h index 3aa3eff7..aed61e10 100644 --- a/actors/group9.h +++ b/actors/group9.h @@ -1,5 +1,4 @@ -#ifndef GROUP9_H -#define GROUP9_H +#pragma once #include "types.h" @@ -80,5 +79,3 @@ extern const Gfx small_key_seg5_dl_05006A08[]; extern const Gfx small_key_seg5_dl_05006A28[]; extern const Gfx small_key_seg5_dl_05006A48[]; extern const Gfx small_key_seg5_dl_05006A68[]; - -#endif diff --git a/include/behavior_data.h b/include/behavior_data.h index a93038c0..d46ad5f1 100644 --- a/include/behavior_data.h +++ b/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 diff --git a/include/command_macros_base.h b/include/command_macros_base.h index 5a0aea51..95ec68a0 100644 --- a/include/command_macros_base.h +++ b/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 diff --git a/include/course_table.h b/include/course_table.h index ec2d4296..4eb88a12 100644 --- a/include/course_table.h +++ b/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 diff --git a/include/dialog_ids.h b/include/dialog_ids.h index 2d9a2410..36abb4e3 100644 --- a/include/dialog_ids.h +++ b/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 diff --git a/include/eu_translation.h b/include/eu_translation.h index ab04abfb..ea2f46d8 100644 --- a/include/eu_translation.h +++ b/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 diff --git a/include/farcall.h b/include/farcall.h index e8be2ae8..bd79e09a 100644 --- a/include/farcall.h +++ b/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: diff --git a/include/geo_commands.h b/include/geo_commands.h index 4e8d7f54..bf86af16 100644 --- a/include/geo_commands.h +++ b/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 diff --git a/include/gfx_dimensions.h b/include/gfx_dimensions.h index de2af63c..d42019d9 100644 --- a/include/gfx_dimensions.h +++ b/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 diff --git a/include/gzip.h b/include/gzip.h index 8ff67e6a..aabea052 100644 --- a/include/gzip.h +++ b/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 diff --git a/include/helper_macros.h b/include/helper_macros.h index a994af6f..92bf40a3 100644 --- a/include/helper_macros.h +++ b/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 diff --git a/include/hvqm/HVQM2File.h b/include/hvqm/HVQM2File.h index d0107305..669f4c17 100644 --- a/include/hvqm/HVQM2File.h +++ b/include/hvqm/HVQM2File.h @@ -7,8 +7,7 @@ /* revision 1.1 1999-02-12 */ -#ifndef __HVQM2FILE_H__ -#define __HVQM2FILE_H__ +#pragma once #include @@ -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__ */ diff --git a/include/hvqm/HVQmd.h b/include/hvqm/HVQmd.h index c537513a..b87fa04e 100644 --- a/include/hvqm/HVQmd.h +++ b/include/hvqm/HVQmd.h @@ -7,8 +7,7 @@ /* revision 1.0 1998-10-14 */ -#ifndef __HVQMD_H__ -#define __HVQMD_H__ +#pragma once #include @@ -18,5 +17,3 @@ typedef u16 CARD16; typedef s16 INT16; typedef u32 CARD32; typedef s32 INT32; - -#endif /* __HVQMD_H__ */ diff --git a/include/hvqm/adpcmdec.h b/include/hvqm/adpcmdec.h index 2e783944..0f2b489d 100644 --- a/include/hvqm/adpcmdec.h +++ b/include/hvqm/adpcmdec.h @@ -7,8 +7,7 @@ /* revision 1.0 1998-12-17 */ -#ifndef __ADPCMDEC_H__ -#define __ADPCMDEC_H__ +#pragma once #include @@ -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 */ diff --git a/include/hvqm/hvqm2dec.h b/include/hvqm/hvqm2dec.h index 2ef3ffd8..78c15136 100644 --- a/include/hvqm/hvqm2dec.h +++ b/include/hvqm/hvqm2dec.h @@ -6,8 +6,7 @@ /* revision 1.2 1999-03-26 */ -#ifndef __HVQM2DEC_H__ -#define __HVQM2DEC_H__ +#pragma once #include #include @@ -99,6 +98,4 @@ extern u8 hvqm2sp1DataStart[], hvqm2sp1DataEnd[]; extern u8 hvqm2sp2TextStart[], hvqm2sp2TextEnd[]; extern u8 hvqm2sp2DataStart[], hvqm2sp2DataEnd[]; -#endif /* __HVQM2DEC_H__ */ - /* end */ diff --git a/include/ique/PR/PRimage.h b/include/ique/PR/PRimage.h index 85457713..dd6d5ebe 100755 --- a/include/ique/PR/PRimage.h +++ b/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__ */ diff --git a/include/ique/PR/R4300.h b/include/ique/PR/R4300.h index 95c5211b..a0ff2446 100755 --- a/include/ique/PR/R4300.h +++ b/include/ique/PR/R4300.h @@ -18,8 +18,7 @@ * **************************************************************************/ -#ifndef __R4300_H__ -#define __R4300_H__ +#pragma once #include @@ -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 */ diff --git a/include/ique/PR/abi.h b/include/ique/PR/abi.h index b73cb726..4c811756 100644 --- a/include/ique/PR/abi.h +++ b/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_ */ diff --git a/include/ique/PR/dbgdefs.h b/include/ique/PR/dbgdefs.h index fa68983b..ebf0f715 100755 --- a/include/ique/PR/dbgdefs.h +++ b/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 diff --git a/include/ique/PR/em.h b/include/ique/PR/em.h index bf81f480..fb8d9f98 100755 --- a/include/ique/PR/em.h +++ b/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_ */ diff --git a/include/ique/PR/gbi-poslight.h b/include/ique/PR/gbi-poslight.h index 7b93aea0..7eb1faa0 100644 --- a/include/ique/PR/gbi-poslight.h +++ b/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_ */ diff --git a/include/ique/PR/gbi.h b/include/ique/PR/gbi.h index 986de97c..46ee5816 100755 --- a/include/ique/PR/gbi.h +++ b/include/ique/PR/gbi.h @@ -17,8 +17,7 @@ * **************************************************************************/ -#ifndef _GBI_H_ -#define _GBI_H_ +#pragma once #include @@ -4800,6 +4799,3 @@ typedef union { #endif #endif /* _LANGUAGE_C */ - - -#endif /* _GBI_H_ */ diff --git a/include/ique/PR/gs2dex.h b/include/ique/PR/gs2dex.h index cf982d0d..fe736d1e 100755 --- a/include/ique/PR/gs2dex.h +++ b/include/ique/PR/gs2dex.h @@ -9,8 +9,7 @@ $Id: gs2dex.h,v 1.1.1.1 2002/05/02 03:28:24 blythe Exp $ ---------------------------------------------------------------------*/ -#ifndef _GS2DEX_H_ -#define _GS2DEX_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -40,66 +39,66 @@ extern "C" { /* Non scalable background plane */ typedef struct { - u16 imageX; /* テクスチャの左上位置 X 座標 (u10.5) */ - u16 imageW; /* テクスチャの幅 (u10.2) */ - s16 frameX; /* 転送されるフレームの左上位置(s10.2) */ - u16 frameW; /* 転送されるフレームの幅 (u10.2) */ + u16 imageX; /* 鐃銃ワ申鐃緒申鐃緒申鐃緒申虜鐃緒申鐃緒申鐃緒申 X 鐃緒申標 (u10.5) */ + u16 imageW; /* 鐃銃ワ申鐃緒申鐃緒申鐃緒申鐃緒申鐃 (u10.2) */ + s16 frameX; /* 転鐃緒申鐃緒申鐃緒申鐃春レー鐃緒申虜鐃緒申鐃緒申鐃緒申(s10.2) */ + u16 frameW; /* 転鐃緒申鐃緒申鐃緒申鐃春レー鐃緒申鐃緒申鐃 (u10.2) */ - u16 imageY; /* テクスチャの左上位置 Y 座標 (u10.5) */ - u16 imageH; /* テクスチャの高さ (u10.2) */ - s16 frameY; /* 転送されるフレームの左上位置(s10.2) */ - u16 frameH; /* 転送されるフレームの高さ (u10.2) */ + u16 imageY; /* 鐃銃ワ申鐃緒申鐃緒申鐃緒申虜鐃緒申鐃緒申鐃緒申 Y 鐃緒申標 (u10.5) */ + u16 imageH; /* 鐃銃ワ申鐃緒申鐃緒申鐃緒申旅發 (u10.2) */ + s16 frameY; /* 転鐃緒申鐃緒申鐃緒申鐃春レー鐃緒申虜鐃緒申鐃緒申鐃緒申(s10.2) */ + u16 frameH; /* 転鐃緒申鐃緒申鐃緒申鐃春レー鐃緒申旅發 (u10.2) */ - u64 *imagePtr; /* DRAM 上のテクスチャソースアドレス */ - u16 imageLoad; /* LoadBlock, LoadTile のどちらを使用するか */ - u8 imageFmt; /* テクセルのフォーマット G_IM_FMT_* */ - u8 imageSiz; /* テクセルのサイズ G_IM_SIZ_* */ - u16 imagePal; /* パレット番号 */ - u16 imageFlip; /* イメージの左右反転 G_BG_FLAG_FLIPS で反転 */ + u64 *imagePtr; /* DRAM 鐃緒申離謄鐃緒申鐃緒申鐃緒申礇緒申鐃緒申鐃緒申鐃緒申疋譽 */ + u16 imageLoad; /* LoadBlock, LoadTile 鐃塾どわ申鐃緒申鐃緒申鐃術わ申鐃暑か */ + u8 imageFmt; /* 鐃銃ワ申鐃緒申鐃緒申離侫鐃緒申鐃緒申泪奪鐃 G_IM_FMT_* */ + u8 imageSiz; /* 鐃銃ワ申鐃緒申鐃緒申離鐃緒申鐃緒申鐃 G_IM_SIZ_* */ + u16 imagePal; /* 鐃術ワ申奪鐃緒申峭鐃 */ + u16 imageFlip; /* 鐃緒申鐃潤ー鐃緒申鐃塾削申鐃緒申反転 G_BG_FLAG_FLIPS 鐃緒申反転 */ - /* 以下は初期化ルーチン guS2DInitBg() 内で設定されるのでユーザが設 - 定する必要はない */ - u16 tmemW; /* frame 1 ラインの TMEM 幅 Word サイズ - LoadBlock の時 GS_PIX2TMEM(imageW/4,imageSiz) - LoadTile の時 GS_PIX2TMEM(frameW/4,imageSiz)+1 */ - u16 tmemH; /* 一度にロードできる TMEM 高さ (s13.2) 4倍値 - 通常テクスチャの時 512/tmemW*4 - CI テクスチャの時 256/tmemW*4 */ - u16 tmemLoadSH; /* SH 値 - LoadBlock の時 tmemSize/2-1 - LoadTile の時 tmemW*16-1 */ - u16 tmemLoadTH; /* TH 値 or Stride 値 - LoadBlock の時 GS_CALC_DXT(tmemW) - LoadTile の時 tmemH-1 */ - u16 tmemSizeW; /* image 1 ライン分の imagePtr のスキップ値 - LoadBlock の時 tmemW*2 - LoadTile の時 GS_PIX2TMEM(imageW/4,imageSiz)*2 */ - u16 tmemSize; /* ロード一回分の imagePtr のスキップ値 + /* 鐃淑駕申鐃熟緒申鐃緒申鐃緒申襦種申鐃緒申鐃 guS2DInitBg() 鐃緒申鐃緒申鐃緒申蠅居申鐃緒申里妊罅種申鐃緒申鐃緒申鐃 + 鐃所す鐃緒申必鐃竣はなわ申 */ + u16 tmemW; /* frame 1 鐃初イ鐃緒申鐃 TMEM 鐃緒申 Word 鐃緒申鐃緒申鐃緒申 + LoadBlock 鐃塾誌申 GS_PIX2TMEM(imageW/4,imageSiz) + LoadTile 鐃塾誌申 GS_PIX2TMEM(frameW/4,imageSiz)+1 */ + u16 tmemH; /* 鐃緒申鐃駿にワ申鐃緒申鐃宿でわ申鐃緒申 TMEM 鐃盾さ (s13.2) 4鐃緒申鐃緒申 + 鐃縮常申謄鐃緒申鐃緒申鐃緒申鐃塾誌申 512/tmemW*4 + CI 鐃銃ワ申鐃緒申鐃緒申鐃緒申了鐃 256/tmemW*4 */ + u16 tmemLoadSH; /* SH 鐃緒申 + LoadBlock 鐃塾誌申 tmemSize/2-1 + LoadTile 鐃塾誌申 tmemW*16-1 */ + u16 tmemLoadTH; /* TH 鐃緒申 or Stride 鐃緒申 + LoadBlock 鐃塾誌申 GS_CALC_DXT(tmemW) + LoadTile 鐃塾誌申 tmemH-1 */ + u16 tmemSizeW; /* image 1 鐃初イ鐃緒申分鐃緒申 imagePtr 鐃塾ワ申鐃緒申鐃獣ワ申鐃緒申 + LoadBlock 鐃塾誌申 tmemW*2 + LoadTile 鐃塾誌申 GS_PIX2TMEM(imageW/4,imageSiz)*2 */ + u16 tmemSize; /* 鐃緒申鐃緒申鐃宿逸申鐃淑鐃緒申 imagePtr 鐃塾ワ申鐃緒申鐃獣ワ申鐃緒申 = tmemSizeW*tmemH */ } uObjBg_t; /* 40 bytes */ /* Scalable background plane */ typedef struct { - u16 imageX; /* テクスチャの左上位置 X 座標 (u10.5) */ - u16 imageW; /* テクスチャの幅 (u10.2) */ - s16 frameX; /* 転送されるフレームの左上位置(s10.2) */ - u16 frameW; /* 転送されるフレームの幅 (u10.2) */ + u16 imageX; /* 鐃銃ワ申鐃緒申鐃緒申鐃緒申虜鐃緒申鐃緒申鐃緒申 X 鐃緒申標 (u10.5) */ + u16 imageW; /* 鐃銃ワ申鐃緒申鐃緒申鐃緒申鐃緒申鐃 (u10.2) */ + s16 frameX; /* 転鐃緒申鐃緒申鐃緒申鐃春レー鐃緒申虜鐃緒申鐃緒申鐃緒申(s10.2) */ + u16 frameW; /* 転鐃緒申鐃緒申鐃緒申鐃春レー鐃緒申鐃緒申鐃 (u10.2) */ - u16 imageY; /* テクスチャの左上位置 Y 座標 (u10.5) */ - u16 imageH; /* テクスチャの高さ (u10.2) */ - s16 frameY; /* 転送されるフレームの左上位置(s10.2) */ - u16 frameH; /* 転送されるフレームの高さ (u10.2) */ + u16 imageY; /* 鐃銃ワ申鐃緒申鐃緒申鐃緒申虜鐃緒申鐃緒申鐃緒申 Y 鐃緒申標 (u10.5) */ + u16 imageH; /* 鐃銃ワ申鐃緒申鐃緒申鐃緒申旅發 (u10.2) */ + s16 frameY; /* 転鐃緒申鐃緒申鐃緒申鐃春レー鐃緒申虜鐃緒申鐃緒申鐃緒申(s10.2) */ + u16 frameH; /* 転鐃緒申鐃緒申鐃緒申鐃春レー鐃緒申旅發 (u10.2) */ - u64 *imagePtr; /* DRAM 上のテクスチャソースアドレス */ - u16 imageLoad; /* LoadBlock, LoadTile のどちらを使用するか */ - u8 imageFmt; /* テクセルのフォーマット G_IM_FMT_* */ - u8 imageSiz; /* テクセルのサイズ G_IM_SIZ_* */ - u16 imagePal; /* パレット番号 */ - u16 imageFlip; /* イメージの左右反転 G_BG_FLAG_FLIPS で反転 */ + u64 *imagePtr; /* DRAM 鐃緒申離謄鐃緒申鐃緒申鐃緒申礇緒申鐃緒申鐃緒申鐃緒申疋譽 */ + u16 imageLoad; /* LoadBlock, LoadTile 鐃塾どわ申鐃緒申鐃緒申鐃術わ申鐃暑か */ + u8 imageFmt; /* 鐃銃ワ申鐃緒申鐃緒申離侫鐃緒申鐃緒申泪奪鐃 G_IM_FMT_* */ + u8 imageSiz; /* 鐃銃ワ申鐃緒申鐃緒申離鐃緒申鐃緒申鐃 G_IM_SIZ_* */ + u16 imagePal; /* 鐃術ワ申奪鐃緒申峭鐃 */ + u16 imageFlip; /* 鐃緒申鐃潤ー鐃緒申鐃塾削申鐃緒申反転 G_BG_FLAG_FLIPS 鐃緒申反転 */ - u16 scaleW; /* X 方向スケール値 (u5.10) */ - u16 scaleH; /* Y 方向スケール値 (u5.10) */ - s32 imageYorig; /* image における描画始点 (s20.5) */ + u16 scaleW; /* X 鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申 (u5.10) */ + u16 scaleH; /* Y 鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申 (u5.10) */ + s32 imageYorig; /* image 鐃祝わ申鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃 (s20.5) */ u8 padding[4]; @@ -114,24 +113,24 @@ typedef union { /*---------------------------------------------------------------------------* * 2D Objects *---------------------------------------------------------------------------*/ -#define G_OBJ_FLAG_FLIPS 1<<0 /* S 方向反転 */ -#define G_OBJ_FLAG_FLIPT 1<<4 /* T 方向反転 */ +#define G_OBJ_FLAG_FLIPS 1<<0 /* S 鐃緒申鐃緒申反転 */ +#define G_OBJ_FLAG_FLIPT 1<<4 /* T 鐃緒申鐃緒申反転 */ typedef struct { - s16 objX; /* s10.2 OBJ 左上端 X 座標 */ - u16 scaleW; /* u5.10 幅方向スケーリング */ - u16 imageW; /* u10.5 テクスチャの幅 (S 方向の長さ) */ - u16 paddingX; /* 未使用 常に 0 */ - s16 objY; /* s10.2 OBJ 左上端 Y 座標 */ - u16 scaleH; /* u5.10 高さ方向スケーリング */ - u16 imageH; /* u10.5 テクスチャの高さ (T 方向の長さ) */ - u16 paddingY; /* 未使用 常に 0 */ - u16 imageStride; /* テクセルの折り返し幅 (64bit word 単位) */ - u16 imageAdrs; /* TMEM 内のテクスチャ先頭位置 (64bit word 単位) */ - u8 imageFmt; /* テクセルのフォーマット G_IM_FMT_* */ - u8 imageSiz; /* テクセルのサイズ G_IM_SIZ_* */ - u8 imagePal; /* パレット番号 0-7 */ - u8 imageFlags; /* 表示フラグ G_OBJ_FLAG_FLIP* */ + s16 objX; /* s10.2 OBJ 鐃緒申鐃緒申端 X 鐃緒申標 */ + u16 scaleW; /* u5.10 鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃 */ + u16 imageW; /* u10.5 鐃銃ワ申鐃緒申鐃緒申鐃緒申鐃緒申鐃 (S 鐃緒申鐃緒申鐃緒申長鐃緒申) */ + u16 paddingX; /* 未鐃緒申鐃緒申 鐃緒申鐃 0 */ + s16 objY; /* s10.2 OBJ 鐃緒申鐃緒申端 Y 鐃緒申標 */ + u16 scaleH; /* u5.10 鐃盾さ鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申鐃 */ + u16 imageH; /* u10.5 鐃銃ワ申鐃緒申鐃緒申鐃緒申旅發 (T 鐃緒申鐃緒申鐃緒申長鐃緒申) */ + u16 paddingY; /* 未鐃緒申鐃緒申 鐃緒申鐃 0 */ + u16 imageStride; /* 鐃銃ワ申鐃緒申鐃緒申鐃緒申泙鐃緒申屬鐃緒申鐃 (64bit word 単鐃緒申) */ + u16 imageAdrs; /* TMEM 鐃緒申離謄鐃緒申鐃緒申鐃緒申鐃緒申鐃銃鐃緒申鐃緒申 (64bit word 単鐃緒申) */ + u8 imageFmt; /* 鐃銃ワ申鐃緒申鐃緒申離侫鐃緒申鐃緒申泪奪鐃 G_IM_FMT_* */ + u8 imageSiz; /* 鐃銃ワ申鐃緒申鐃緒申離鐃緒申鐃緒申鐃 G_IM_SIZ_* */ + u8 imagePal; /* 鐃術ワ申奪鐃緒申峭鐃 0-7 */ + u8 imageFlags; /* 表鐃緒申鐃春ラグ G_OBJ_FLAG_FLIP* */ } uObjSprite_t; /* 24 bytes */ typedef union { @@ -176,12 +175,12 @@ typedef union { #define GS_TB_TLINE(pix,siz) (GS_CALC_DXT(GS_PIX2TMEM((pix),(siz)))) typedef struct { - u32 type; /* Type 種別 G_OBJLT_TXTRBLOCK */ - u64 *image; /* DRAM 上のテクスチャソースアドレス */ - u16 tmem; /* ロード先の TMEM ワードアドレス (8byteWORD) */ - u16 tsize; /* Texture サイズ マクロ GS_TB_TSIZE() で指定 */ - u16 tline; /* Texture 1 ライン幅 マクロ GS_TB_TLINE() で指定 */ - u16 sid; /* STATE ID 4 の倍数で 0,4,8,12 のどれか */ + u32 type; /* Type 鐃緒申鐃緒申 G_OBJLT_TXTRBLOCK */ + u64 *image; /* DRAM 鐃緒申離謄鐃緒申鐃緒申鐃緒申礇緒申鐃緒申鐃緒申鐃緒申疋譽 */ + u16 tmem; /* 鐃緒申鐃緒申鐃緒申鐃緒申鐃 TMEM 鐃緒ー鐃宿ワ申鐃宿レス (8byteWORD) */ + u16 tsize; /* Texture 鐃緒申鐃緒申鐃緒申 鐃殉ワ申鐃緒申 GS_TB_TSIZE() 鐃叔誌申鐃緒申 */ + u16 tline; /* Texture 1 鐃初イ鐃緒申鐃緒申 鐃殉ワ申鐃緒申 GS_TB_TLINE() 鐃叔誌申鐃緒申 */ + u16 sid; /* STATE ID 4 鐃緒申鐃旬随申鐃緒申 0,4,8,12 鐃塾どれか */ u32 flag; /* STATE flag */ u32 mask; /* STATE mask */ } uObjTxtrBlock_t; /* 24 bytes */ @@ -190,12 +189,12 @@ typedef struct { #define GS_TT_THEIGHT(pix,siz) (((pix)<<2)-1) typedef struct { - u32 type; /* Type 種別 G_OBJLT_TXTRTILE */ - u64 *image; /* DRAM 上のテクスチャソースアドレス */ - u16 tmem; /* ロード先の TMEM ワードアドレス (8byteWORD) */ - u16 twidth; /* Texture 幅 マクロ GS_TT_TWIDTH() で指定 */ - u16 theight; /* Texture 高さ マクロ GS_TT_THEIGHT() で指定 */ - u16 sid; /* STATE ID 4 の倍数で 0,4,8,12 のどれか */ + u32 type; /* Type 鐃緒申鐃緒申 G_OBJLT_TXTRTILE */ + u64 *image; /* DRAM 鐃緒申離謄鐃緒申鐃緒申鐃緒申礇緒申鐃緒申鐃緒申鐃緒申疋譽 */ + u16 tmem; /* 鐃緒申鐃緒申鐃緒申鐃緒申鐃 TMEM 鐃緒ー鐃宿ワ申鐃宿レス (8byteWORD) */ + u16 twidth; /* Texture 鐃緒申 鐃殉ワ申鐃緒申 GS_TT_TWIDTH() 鐃叔誌申鐃緒申 */ + u16 theight; /* Texture 鐃盾さ 鐃殉ワ申鐃緒申 GS_TT_THEIGHT() 鐃叔誌申鐃緒申 */ + u16 sid; /* STATE ID 4 鐃緒申鐃旬随申鐃緒申 0,4,8,12 鐃塾どれか */ u32 flag; /* STATE flag */ u32 mask; /* STATE mask */ } uObjTxtrTile_t; /* 24 bytes */ @@ -204,12 +203,12 @@ typedef struct { #define GS_PAL_NUM(num) ((num)-1) typedef struct { - u32 type; /* Type 種別 G_OBJLT_TLUT */ - u64 *image; /* DRAM 上のテクスチャソースアドレス */ - u16 phead; /* ロード先頭のパレット番号 256 以上 511 以下 */ - u16 pnum; /* ロードするパレット数 - 1 */ - u16 zero; /* 常に 0 を代入する */ - u16 sid; /* STATE ID 4 の倍数で 0,4,8,12 のどれか */ + u32 type; /* Type 鐃緒申鐃緒申 G_OBJLT_TLUT */ + u64 *image; /* DRAM 鐃緒申離謄鐃緒申鐃緒申鐃緒申礇緒申鐃緒申鐃緒申鐃緒申疋譽 */ + u16 phead; /* 鐃緒申鐃緒申鐃緒申鐃緒申頭鐃塾パワ申奪鐃緒申峭鐃 256 鐃淑常申 511 鐃淑駕申 */ + u16 pnum; /* 鐃緒申鐃緒申鐃宿わ申鐃緒申僖鐃獣ト随申 - 1 */ + u16 zero; /* 鐃緒申鐃 0 鐃緒申鐃緒申鐃緒申鐃緒申鐃緒申 */ + u16 sid; /* STATE ID 4 鐃緒申鐃旬随申鐃緒申 0,4,8,12 鐃塾どれか */ u32 flag; /* STATE flag */ u32 mask; /* STATE mask */ } uObjTxtrTLUT_t; /* 24 bytes */ @@ -322,7 +321,7 @@ typedef struct { /*---------------------------------------------------------------------------* * Set general status *---------------------------------------------------------------------------*/ -#define G_MW_GENSTAT 0x08 /* G_MW_FOG と同じ値なので注意 */ +#define G_MW_GENSTAT 0x08 /* G_MW_FOG 鐃緒申同鐃緒申鐃粛なのわ申鐃緒申鐃緒申 */ #define gSPSetStatus(pkt, sid, val) \ gMoveWd((pkt), G_MW_GENSTAT, (sid), (val)) @@ -388,6 +387,5 @@ extern void guS2DInitBg(uObjBg *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif -#endif /* _GS2DEX_H_ */ /*======== End of gs2dex.h ========*/ diff --git a/include/ique/PR/gt.h b/include/ique/PR/gt.h index b6bbb5e5..1150ca89 100755 --- a/include/ique/PR/gt.h +++ b/include/ique/PR/gt.h @@ -44,8 +44,7 @@ * **************************************************************************/ -#ifndef _GT_H_ -#define _GT_H_ +#pragma once /* this file should be #included AFTER gbi.h */ @@ -361,5 +360,3 @@ typedef union { #ifdef _LANGUAGE_MAKEROM #endif /* _LANGUAGE_MAKEROM */ - -#endif /* _GT_H_ */ diff --git a/include/ique/PR/gu.h b/include/ique/PR/gu.h index a8d2d701..76317677 100755 --- a/include/ique/PR/gu.h +++ b/include/ique/PR/gu.h @@ -1,5 +1,4 @@ -#ifndef _GU_H_ -#define _GU_H_ +#pragma once /************************************************************************** * * @@ -265,5 +264,3 @@ void guSprite2DInit(uSprite *SpritePointer, int SourceImageBitSize, int SourceImageOffsetS, int SourceImageOffsetT); - -#endif /* !_GU_H_ */ diff --git a/include/ique/PR/gzsort.h b/include/ique/PR/gzsort.h index edd3e1ed..9ee88c1e 100755 --- a/include/ique/PR/gzsort.h +++ b/include/ique/PR/gzsort.h @@ -6,8 +6,7 @@ $Id: gzsort.h,v 1.1.1.1 2002/05/02 03:28:24 blythe Exp $ *---------------------------------------------------------------------*/ -#ifndef _GZSORT_H_ -#define _GZSORT_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -628,6 +627,5 @@ extern u64 gspZSort_pl_fifoDataStart[], gspZSort_pl_fifoDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif -#endif /* _GZSORT_H_ */ /*======== End of gzsort.h ========*/ diff --git a/include/ique/PR/leo.h b/include/ique/PR/leo.h index 0cb43e32..40fb203a 100755 --- a/include/ique/PR/leo.h +++ b/include/ique/PR/leo.h @@ -7,8 +7,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _LEO_H_ -#define _LEO_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -276,5 +275,3 @@ extern void LeoBootGame(void *entry); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_LEO_H */ diff --git a/include/ique/PR/leosp.h b/include/ique/PR/leosp.h index a4897eed..0de18dc7 100755 --- a/include/ique/PR/leosp.h +++ b/include/ique/PR/leosp.h @@ -7,8 +7,7 @@ * **************************************************************************/ -#ifndef _LEOSP_H_ -#define _LEOSP_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -46,5 +45,3 @@ extern s32 LeoSysReadWrite(LEOCmd *cmdBlock, s32 direction, #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_LEOSP_H */ diff --git a/include/ique/PR/libaudio.h b/include/ique/PR/libaudio.h index cb7a5b19..44e919a6 100644 --- a/include/ique/PR/libaudio.h +++ b/include/ique/PR/libaudio.h @@ -1,5 +1,4 @@ -#ifndef _ULTRA64_LIBAUDIO_H_ -#define _ULTRA64_LIBAUDIO_H_ +#pragma once #include "abi.h" @@ -47,5 +46,3 @@ typedef struct } ALSeqFile; void alSeqFileNew(ALSeqFile *f, u8 *base); - -#endif diff --git a/include/ique/PR/mbi.h b/include/ique/PR/mbi.h index a63824e7..c58ca777 100755 --- a/include/ique/PR/mbi.h +++ b/include/ique/PR/mbi.h @@ -1,5 +1,4 @@ -#ifndef _MBI_H_ -#define _MBI_H_ +#pragma once /************************************************************************** * * @@ -96,5 +95,3 @@ #ifndef NULL #define NULL 0 #endif - -#endif /* !_MBI_H_ */ diff --git a/include/ique/PR/os.h b/include/ique/PR/os.h index a44ed17b..57711e88 100755 --- a/include/ique/PR/os.h +++ b/include/ique/PR/os.h @@ -27,8 +27,7 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#ifndef _OS_H_ -#define _OS_H_ +#pragma once #include #include @@ -104,5 +103,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_H */ diff --git a/include/ique/PR/os_ai.h b/include/ique/PR/os_ai.h index 0aa0b0d7..77a42c9b 100755 --- a/include/ique/PR/os_ai.h +++ b/include/ique/PR/os_ai.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_AI_H_ -#define _OS_AI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -88,5 +87,3 @@ extern s32 osAiSetNextBuffer(void *, u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_AI_H_ */ diff --git a/include/ique/PR/os_bb.h b/include/ique/PR/os_bb.h index a7a92d89..7787f77d 100644 --- a/include/ique/PR/os_bb.h +++ b/include/ique/PR/os_bb.h @@ -6,8 +6,7 @@ $Date: 2004/06/28 22:34:42 $ *---------------------------------------------------------------------*/ -#ifndef _OS_BB_H_ -#define _OS_BB_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -107,5 +106,3 @@ extern void osBbRtcGet(u8* year, u8* month, u8* day, u8* dow, u8* hour, u8* min, #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_BB_H_ */ diff --git a/include/ique/PR/os_bb_export.h b/include/ique/PR/os_bb_export.h index 49eae36b..d4c90ff7 100755 --- a/include/ique/PR/os_bb_export.h +++ b/include/ique/PR/os_bb_export.h @@ -2,8 +2,7 @@ Copyright (C) 2002 - 2004 BroadOn Communications. *---------------------------------------------------------------------*/ -#ifndef _OS_BB_H_ -#define _OS_BB_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -26,5 +25,3 @@ extern void osBbRtcGet(u8* year, u8* month, u8* day, u8* dow, u8* hour, u8* min, #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_BB_H_ */ diff --git a/include/ique/PR/os_cache.h b/include/ique/PR/os_cache.h index 71b35343..ed51043f 100755 --- a/include/ique/PR/os_cache.h +++ b/include/ique/PR/os_cache.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_CACHE_H_ -#define _OS_CACHE_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -92,5 +91,3 @@ extern void osWritebackDCacheAll(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_CACHE_H_ */ diff --git a/include/ique/PR/os_cont.h b/include/ique/PR/os_cont.h index bafdbc8a..c9e57f1b 100755 --- a/include/ique/PR/os_cont.h +++ b/include/ique/PR/os_cont.h @@ -27,8 +27,7 @@ $Date: 2004/10/29 00:51:42 $ *---------------------------------------------------------------------*/ -#ifndef _OS_CONT_H_ -#define _OS_CONT_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -215,5 +214,3 @@ extern void osContGetReadData(OSContPad *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_CONT_H_ */ diff --git a/include/ique/PR/os_convert.h b/include/ique/PR/os_convert.h index 3f712545..406cf1ed 100755 --- a/include/ique/PR/os_convert.h +++ b/include/ique/PR/os_convert.h @@ -27,8 +27,7 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#ifndef _OS_CONVERT_H_ -#define _OS_CONVERT_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -107,5 +106,3 @@ extern void * osPhysicalToVirtual(u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_CONVERT_H_ */ diff --git a/include/ique/PR/os_debug.h b/include/ique/PR/os_debug.h index 35a7bbb3..d6c45a03 100755 --- a/include/ique/PR/os_debug.h +++ b/include/ique/PR/os_debug.h @@ -27,8 +27,7 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#ifndef _OS_DEBUG_H_ -#define _OS_DEBUG_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -113,5 +112,3 @@ extern OSTime osThreadProfileReadTimeTh(OSThread*); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_DEBUG_H_ */ diff --git a/include/ique/PR/os_eeprom.h b/include/ique/PR/os_eeprom.h index 050b8a88..3e62542d 100755 --- a/include/ique/PR/os_eeprom.h +++ b/include/ique/PR/os_eeprom.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_EEPROM_H_ -#define _OS_EEPROM_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -103,5 +102,3 @@ extern s32 osEepromLongWrite(OSMesgQueue *, u8, u8 *, int); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_EEPROM_H_ */ diff --git a/include/ique/PR/os_error.h b/include/ique/PR/os_error.h index 51d4c67a..7c380296 100755 --- a/include/ique/PR/os_error.h +++ b/include/ique/PR/os_error.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_ERROR_H_ -#define _OS_ERROR_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -82,5 +81,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_ERROR_H_ */ diff --git a/include/ique/PR/os_exception.h b/include/ique/PR/os_exception.h index d546d5a0..2dea84ee 100755 --- a/include/ique/PR/os_exception.h +++ b/include/ique/PR/os_exception.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_EXCEPTION_H_ -#define _OS_EXCEPTION_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -115,5 +114,3 @@ extern OSIntMask osSetIntMask(OSIntMask); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_EXCEPTION_H_ */ diff --git a/include/ique/PR/os_flash.h b/include/ique/PR/os_flash.h index 8357a116..866d1542 100755 --- a/include/ique/PR/os_flash.h +++ b/include/ique/PR/os_flash.h @@ -6,8 +6,7 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#ifndef _OS_FLASH_H_ -#define _OS_FLASH_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -67,5 +66,3 @@ extern s32 osFlashCheckEraseEnd(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_FLASH_H_ */ diff --git a/include/ique/PR/os_gbpak.h b/include/ique/PR/os_gbpak.h index fa6aaddc..3f69bfac 100755 --- a/include/ique/PR/os_gbpak.h +++ b/include/ique/PR/os_gbpak.h @@ -7,8 +7,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_GBPAK_H_ -#define _OS_GBPAK_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -103,5 +102,3 @@ extern s32 osGbpakCheckConnector(OSPfs *, u8 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_GBPAK_H_ */ diff --git a/include/ique/PR/os_gio.h b/include/ique/PR/os_gio.h index d274b97d..225a74a6 100755 --- a/include/ique/PR/os_gio.h +++ b/include/ique/PR/os_gio.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_GIO_H_ -#define _OS_GIO_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -82,5 +81,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_GIO_H_ */ diff --git a/include/ique/PR/os_host.h b/include/ique/PR/os_host.h index 8cb72e74..d4d0c48c 100755 --- a/include/ique/PR/os_host.h +++ b/include/ique/PR/os_host.h @@ -27,8 +27,7 @@ $Date: 2004/06/28 22:34:42 $ *---------------------------------------------------------------------*/ -#ifndef _OS_HOST_H_ -#define _OS_HOST_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -166,5 +165,3 @@ extern void osResetRdb(); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_HOST_H_ */ diff --git a/include/ique/PR/os_internal.h b/include/ique/PR/os_internal.h index ff2dc227..d02f7d13 100755 --- a/include/ique/PR/os_internal.h +++ b/include/ique/PR/os_internal.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_H_ -#define _OS_INTERNAL_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -45,5 +44,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_H */ diff --git a/include/ique/PR/os_internal_debug.h b/include/ique/PR/os_internal_debug.h index 24337b83..d3ca89ef 100755 --- a/include/ique/PR/os_internal_debug.h +++ b/include/ique/PR/os_internal_debug.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_DEBUG_H_ -#define _OS_INTERNAL_DEBUG_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -39,5 +38,3 @@ extern int __osAtomicDec(unsigned int *p); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_DEBUG_H */ diff --git a/include/ique/PR/os_internal_error.h b/include/ique/PR/os_internal_error.h index 0607f873..dc041b05 100755 --- a/include/ique/PR/os_internal_error.h +++ b/include/ique/PR/os_internal_error.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_ERROR_H_ -#define _OS_INTERNAL_ERROR_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -41,5 +40,3 @@ extern OSThread * __osGetNextFaultedThread(OSThread *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_ERROR_H */ diff --git a/include/ique/PR/os_internal_exception.h b/include/ique/PR/os_internal_exception.h index 8f38e5cb..be5fa8db 100755 --- a/include/ique/PR/os_internal_exception.h +++ b/include/ique/PR/os_internal_exception.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_EXCEPTION_H_ -#define _OS_INTERNAL_EXCEPTION_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -45,5 +44,3 @@ extern void __osResetGlobalIntMask(OSHWIntr); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_EXCEPTION_H */ diff --git a/include/ique/PR/os_internal_gio.h b/include/ique/PR/os_internal_gio.h index 4ad86fd0..0021bc44 100755 --- a/include/ique/PR/os_internal_gio.h +++ b/include/ique/PR/os_internal_gio.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_GIO_H_ -#define _OS_INTERNAL_GIO_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -41,5 +40,3 @@ extern void __osGIORawInterrupt(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_GIO_H */ diff --git a/include/ique/PR/os_internal_host.h b/include/ique/PR/os_internal_host.h index b5f7c6bb..9d802724 100755 --- a/include/ique/PR/os_internal_host.h +++ b/include/ique/PR/os_internal_host.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_HOST_H_ -#define _OS_INTERNAL_HOST_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -38,5 +37,3 @@ extern u32 __osRdbSend(u8 *buf, u32 size, u32 type); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_HOST_H */ diff --git a/include/ique/PR/os_internal_reg.h b/include/ique/PR/os_internal_reg.h index 395655d8..825719b3 100755 --- a/include/ique/PR/os_internal_reg.h +++ b/include/ique/PR/os_internal_reg.h @@ -18,8 +18,7 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_REG_H_ -#define _OS_INTERNAL_REG_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -55,5 +54,3 @@ extern u32 __osGetFpcCsr(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_REG_H */ diff --git a/include/ique/PR/os_internal_rsp.h b/include/ique/PR/os_internal_rsp.h index b2fbd082..271a91d9 100755 --- a/include/ique/PR/os_internal_rsp.h +++ b/include/ique/PR/os_internal_rsp.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_RSP_H_ -#define _OS_INTERNAL_RSP_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -44,5 +43,3 @@ extern s32 __osSpRawStartDma(s32, u32, void *, u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_RSP_H */ diff --git a/include/ique/PR/os_internal_si.h b/include/ique/PR/os_internal_si.h index 6dccf6d6..8ffbaf29 100755 --- a/include/ique/PR/os_internal_si.h +++ b/include/ique/PR/os_internal_si.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_SI_H_ -#define _OS_INTERNAL_SI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -42,5 +41,3 @@ extern s32 __osSiRawStartDma(s32, void *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_SI_H */ diff --git a/include/ique/PR/os_internal_thread.h b/include/ique/PR/os_internal_thread.h index a4d2e0fe..8ee5f2b1 100755 --- a/include/ique/PR/os_internal_thread.h +++ b/include/ique/PR/os_internal_thread.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_THREAD_H_ -#define _OS_INTERNAL_THREAD_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -39,5 +38,3 @@ extern OSThread * __osGetActiveQueue(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_THREAD_H */ diff --git a/include/ique/PR/os_internal_tlb.h b/include/ique/PR/os_internal_tlb.h index 9f0c18a2..70e07569 100755 --- a/include/ique/PR/os_internal_tlb.h +++ b/include/ique/PR/os_internal_tlb.h @@ -18,8 +18,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_TLB_H_ -#define _OS_INTERNAL_TLB_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -43,5 +42,3 @@ extern u32 __osGetTLBLo1(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_TLB_H */ diff --git a/include/ique/PR/os_libc.h b/include/ique/PR/os_libc.h index 72417ebb..a851851e 100755 --- a/include/ique/PR/os_libc.h +++ b/include/ique/PR/os_libc.h @@ -27,8 +27,7 @@ $Date: 2004/11/16 01:47:19 $ *---------------------------------------------------------------------*/ -#ifndef _OS_LIBC_H_ -#define _OS_LIBC_H_ +#pragma once #include "os_pfs.h" @@ -99,5 +98,3 @@ extern void osSyncPrintf(const char *fmt, ...); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_LIBC_H_ */ diff --git a/include/ique/PR/os_message.h b/include/ique/PR/os_message.h index 3f93e3ff..f95fd934 100755 --- a/include/ique/PR/os_message.h +++ b/include/ique/PR/os_message.h @@ -27,8 +27,7 @@ $Date: 2004/06/28 22:34:42 $ *---------------------------------------------------------------------*/ -#ifndef _OS_MESSAGE_H_ -#define _OS_MESSAGE_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -163,5 +162,3 @@ extern void osSetEventMesg(OSEvent, OSMesgQueue *, OSMesg); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_MESSAGE_H_ */ diff --git a/include/ique/PR/os_motor.h b/include/ique/PR/os_motor.h index d851f577..b4cc421f 100755 --- a/include/ique/PR/os_motor.h +++ b/include/ique/PR/os_motor.h @@ -7,8 +7,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_MOTOR_H_ -#define _OS_MOTOR_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -79,5 +78,3 @@ extern s32 osMotorStart(OSPfs *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_MOTOR_H_ */ diff --git a/include/ique/PR/os_pfs.h b/include/ique/PR/os_pfs.h index 38c70c05..ef1a7e38 100755 --- a/include/ique/PR/os_pfs.h +++ b/include/ique/PR/os_pfs.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_PFS_H_ -#define _OS_PFS_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -170,5 +169,3 @@ extern s32 osPfsNumFiles(OSPfs *, s32 *, s32 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_PFS_H_ */ diff --git a/include/ique/PR/os_pi.h b/include/ique/PR/os_pi.h index 9df269f5..756c22fa 100755 --- a/include/ique/PR/os_pi.h +++ b/include/ique/PR/os_pi.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_PI_H_ -#define _OS_PI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -220,5 +219,3 @@ extern s32 osEPiLinkHandle(OSPiHandle *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_PI_H_ */ diff --git a/include/ique/PR/os_rdp.h b/include/ique/PR/os_rdp.h index edc767c5..ae96543d 100755 --- a/include/ique/PR/os_rdp.h +++ b/include/ique/PR/os_rdp.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_RDP_H_ -#define _OS_RDP_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -88,5 +87,3 @@ extern s32 osDpSetNextBuffer(void *, u64); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_RDP_H_ */ diff --git a/include/ique/PR/os_reg.h b/include/ique/PR/os_reg.h index 3ec0c5ab..7981a907 100755 --- a/include/ique/PR/os_reg.h +++ b/include/ique/PR/os_reg.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_REG_H_ -#define _OS_REG_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -86,5 +85,3 @@ extern u32 osGetCount(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_REG_H_ */ diff --git a/include/ique/PR/os_rsp.h b/include/ique/PR/os_rsp.h index d02d544c..4201a5d7 100755 --- a/include/ique/PR/os_rsp.h +++ b/include/ique/PR/os_rsp.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_RSP_H_ -#define _OS_RSP_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -82,5 +81,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_RSP_H_ */ diff --git a/include/ique/PR/os_si.h b/include/ique/PR/os_si.h index de5094fc..cf555132 100755 --- a/include/ique/PR/os_si.h +++ b/include/ique/PR/os_si.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_SI_H_ -#define _OS_SI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -82,5 +81,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_SI_H_ */ diff --git a/include/ique/PR/os_system.h b/include/ique/PR/os_system.h index 168de781..e0516728 100755 --- a/include/ique/PR/os_system.h +++ b/include/ique/PR/os_system.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_SYSTEM_H_ -#define _OS_SYSTEM_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -114,5 +113,3 @@ extern s32 osAfterPreNMI(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_SYSTEM_H_ */ diff --git a/include/ique/PR/os_thread.h b/include/ique/PR/os_thread.h index 4ca4cbdf..f4170a9c 100755 --- a/include/ique/PR/os_thread.h +++ b/include/ique/PR/os_thread.h @@ -27,8 +27,7 @@ $Date: 2004/02/06 02:16:48 $ *---------------------------------------------------------------------*/ -#ifndef _OS_THREAD_H_ -#define _OS_THREAD_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -170,5 +169,3 @@ extern OSPri osGetThreadPri(OSThread *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_THREAD_H_ */ diff --git a/include/ique/PR/os_time.h b/include/ique/PR/os_time.h index f2dbf82a..b9707c46 100755 --- a/include/ique/PR/os_time.h +++ b/include/ique/PR/os_time.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_TIME_H_ -#define _OS_TIME_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -110,5 +109,3 @@ extern int osStopTimer(OSTimer *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_TIME_H_ */ diff --git a/include/ique/PR/os_tlb.h b/include/ique/PR/os_tlb.h index a27ed30b..34d5cf3a 100755 --- a/include/ique/PR/os_tlb.h +++ b/include/ique/PR/os_tlb.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_TLB_H_ -#define _OS_TLB_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -103,5 +102,3 @@ extern void osSetTLBASID(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_TLB_H_ */ diff --git a/include/ique/PR/os_usb.h b/include/ique/PR/os_usb.h index f2961844..eacff61b 100755 --- a/include/ique/PR/os_usb.h +++ b/include/ique/PR/os_usb.h @@ -26,8 +26,7 @@ $Date: 2004/09/03 03:52:47 $ *---------------------------------------------------------------------*/ -#ifndef _OS_USB_H_ -#define _OS_USB_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -168,5 +167,3 @@ extern s32 osBbUsbDevWrite(OSBbUsbHandle, u8 *, s32, u64); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_USB_H_ */ diff --git a/include/ique/PR/os_version.h b/include/ique/PR/os_version.h index 2be0c971..0acc34d3 100755 --- a/include/ique/PR/os_version.h +++ b/include/ique/PR/os_version.h @@ -7,10 +7,7 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#ifndef _OS_VERSION_H_ -#define _OS_VERSION_H_ +#pragma once #define OS_MAJOR_VERSION "2.0K" /* major version */ #define OS_MINOR_VERSION 0 /* patch level */ - -#endif /* !_OS_VERSION_H_ */ diff --git a/include/ique/PR/os_vi.h b/include/ique/PR/os_vi.h index c00498e7..46c4b228 100755 --- a/include/ique/PR/os_vi.h +++ b/include/ique/PR/os_vi.h @@ -27,8 +27,7 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#ifndef _OS_VI_H_ -#define _OS_VI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -294,5 +293,3 @@ extern void osCreateViManager(OSPri); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_VI_H_ */ diff --git a/include/ique/PR/os_voice.h b/include/ique/PR/os_voice.h index 207eb6f9..db499d37 100755 --- a/include/ique/PR/os_voice.h +++ b/include/ique/PR/os_voice.h @@ -7,8 +7,7 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#ifndef _OS_VOICE_H_ -#define _OS_VOICE_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -104,5 +103,3 @@ extern void osVoiceCountSyllables(u8 *, u32 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_VOICE_H_ */ diff --git a/include/ique/PR/ramrom.h b/include/ique/PR/ramrom.h index 7ac67d4c..bd2989e6 100755 --- a/include/ique/PR/ramrom.h +++ b/include/ique/PR/ramrom.h @@ -1,5 +1,4 @@ -#ifndef _RAMROM_H -#define _RAMROM_H +#pragma once /************************************************************************** * * @@ -114,5 +113,3 @@ typedef struct { void __RamRomInit(int key, void *romaddr); void __RamRomDestroy(int key); #endif /* _EMULATOR */ - -#endif /* !_RAMROM_H */ diff --git a/include/ique/PR/rcp.h b/include/ique/PR/rcp.h index 0a51d6c2..6108e334 100755 --- a/include/ique/PR/rcp.h +++ b/include/ique/PR/rcp.h @@ -1,5 +1,4 @@ -#ifndef _RCP_H_ -#define _RCP_H_ +#pragma once /************************************************************************** * * @@ -880,6 +879,3 @@ The Indy development board use cartridge domain 1: IO_READ(SP_STATUS_REG)) #endif - -#endif /* _RCP_H_ */ - diff --git a/include/ique/PR/rdb.h b/include/ique/PR/rdb.h index c2b9775d..c232dc52 100755 --- a/include/ique/PR/rdb.h +++ b/include/ique/PR/rdb.h @@ -7,8 +7,7 @@ * **************************************************************************/ -#ifndef _RDB_H -#define _RDB_H +#pragma once /* U64 side address */ #define RDB_BASE_REG 0xc0000000 @@ -103,5 +102,3 @@ extern unsigned int __osRdbWriteOK; extern unsigned int __osRdbSendMessage; #endif /* _LANGUAGE_C */ - -#endif /* !_RDB_H */ diff --git a/include/ique/PR/region.h b/include/ique/PR/region.h index f84d7c06..0a64647b 100755 --- a/include/ique/PR/region.h +++ b/include/ique/PR/region.h @@ -27,8 +27,7 @@ **************************************************************************/ -#ifndef _REGION_H_ -#define _REGION_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS @@ -116,8 +115,3 @@ extern s32 osGetRegionBufSize(void *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - - -#endif /* _REGION_H_ */ - - diff --git a/include/ique/PR/rmon.h b/include/ique/PR/rmon.h index e949a0f0..2d7ad5e7 100755 --- a/include/ique/PR/rmon.h +++ b/include/ique/PR/rmon.h @@ -18,8 +18,7 @@ * **************************************************************************/ -#ifndef _RMON_H_ -#define _RMON_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -49,5 +48,3 @@ extern void rmonPrintf( const char *, ... ); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_H */ diff --git a/include/ique/PR/rsp.h b/include/ique/PR/rsp.h index 2ae03153..dff1efc3 100755 --- a/include/ique/PR/rsp.h +++ b/include/ique/PR/rsp.h @@ -17,8 +17,7 @@ * **************************************************************************/ -#ifndef _RSP_H_ -#define _RSP_H_ 1 +#pragma once #define RSP_DMEM_BASE 0x04000000 #define RSP_IMEM_BASE 0x04001000 @@ -80,6 +79,3 @@ .name CMD_TMEM_BUSY, $c15 #endif - - -#endif diff --git a/include/ique/PR/rsp_ipc.h b/include/ique/PR/rsp_ipc.h index 7e5b74ff..1711f2db 100755 --- a/include/ique/PR/rsp_ipc.h +++ b/include/ique/PR/rsp_ipc.h @@ -15,8 +15,7 @@ * **************************************************************************/ -#ifndef _RSP_IPC_H_ -#define _RSP_IPC_H_ 1 +#pragma once #if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) @@ -65,5 +64,3 @@ extern int sem_signal(int id); extern int sem_op(int id, int value); #endif - -#endif diff --git a/include/ique/PR/sp.h b/include/ique/PR/sp.h index 4d7737c6..58f1ce90 100755 --- a/include/ique/PR/sp.h +++ b/include/ique/PR/sp.h @@ -20,8 +20,7 @@ * **************************************************************************/ -#ifndef _SP_H_ -#define _SP_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -192,5 +191,3 @@ void spFinish( Gfx **glistp ); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* _SP_H_ */ diff --git a/include/ique/PR/sptask.h b/include/ique/PR/sptask.h index ec4d8d4e..f6bdaba2 100755 --- a/include/ique/PR/sptask.h +++ b/include/ique/PR/sptask.h @@ -18,8 +18,7 @@ * **************************************************************************/ -#ifndef _SPTASK_H_ -#define _SPTASK_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -197,5 +196,3 @@ extern OSYieldResult osSpTaskYielded(OSTask *tp); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_SPTASK_H */ diff --git a/include/ique/PR/trace.h b/include/ique/PR/trace.h index 35dcd329..fb3d7ff2 100755 --- a/include/ique/PR/trace.h +++ b/include/ique/PR/trace.h @@ -1,5 +1,4 @@ -#ifndef _TRACE_H_ -#define _TRACE_H_ +#pragma once /************************************************************************** @@ -76,7 +75,3 @@ extern unsigned long Dflags; /* Global debug flag */ * Extern function prototypes * */ - - -#endif /* _TRACE_H_ */ - diff --git a/include/ique/PR/ucode.h b/include/ique/PR/ucode.h index 5389a017..8c730c9e 100644 --- a/include/ique/PR/ucode.h +++ b/include/ique/PR/ucode.h @@ -18,8 +18,7 @@ * **************************************************************************/ -#ifndef _UCODE_H_ -#define _UCODE_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -259,5 +258,3 @@ extern u64 rspF3DDataStart[], rspF3DDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_UCODE_H */ diff --git a/include/ique/PR/ucode_debug.h b/include/ique/PR/ucode_debug.h index f71a255b..518a2287 100755 --- a/include/ique/PR/ucode_debug.h +++ b/include/ique/PR/ucode_debug.h @@ -6,8 +6,7 @@ $Id: ucode_debug.h,v 1.1.1.1 2002/05/02 03:28:25 blythe Exp $ *---------------------------------------------------------------------*/ -#ifndef _UCODE_DEBUG_H_ -#define _UCODE_DEBUG_H_ +#pragma once #define DEBUG_DL_PTR() IO_READ(SP_DMEM_START+0xfc0) @@ -49,6 +48,5 @@ extern long long int gspS2DEX2d_xbusDataStart[], gspS2DEX2d_xbusDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif -#endif /* !_UCODE_DEBUG_H */ /*======== End of ucode_debug.h ========*/ diff --git a/include/ique/PR/ultraerror.h b/include/ique/PR/ultraerror.h index 33fce660..774b7e5e 100755 --- a/include/ique/PR/ultraerror.h +++ b/include/ique/PR/ultraerror.h @@ -26,8 +26,7 @@ * **************************************************************************/ -#ifndef __ULTRAERROR_H__ -#define __ULTRAERROR_H__ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -175,5 +174,3 @@ OSErrorHandler osSetErrorHandler(OSErrorHandler); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* __ULTRAERROR_H__ */ diff --git a/include/ique/PR/ultratypes.h b/include/ique/PR/ultratypes.h index 057d6ffd..f8bb0d49 100644 --- a/include/ique/PR/ultratypes.h +++ b/include/ique/PR/ultratypes.h @@ -1,5 +1,4 @@ -#ifndef _ULTRATYPES_H_ -#define _ULTRATYPES_H_ +#pragma once /************************************************************************** @@ -92,6 +91,3 @@ typedef volatile s64 vs64; #ifndef NULL #define NULL (void *)0 #endif - -#endif /* _ULTRATYPES_H_ */ - diff --git a/include/ique/PR/uportals.h b/include/ique/PR/uportals.h index 1692497c..1c2a19ac 100755 --- a/include/ique/PR/uportals.h +++ b/include/ique/PR/uportals.h @@ -30,8 +30,7 @@ -#ifndef __ULTRAPORTALS_H__ -#define __ULTRAPORTALS_H__ +#pragma once #include #include "matrix.h" @@ -130,5 +129,3 @@ extern upLocateData upLocator; /* also extern by test_portals.h */ #ifdef __Cplusplus } #endif - -#endif diff --git a/include/ique/PR/verify.h b/include/ique/PR/verify.h index 35141b3c..204293ba 100755 --- a/include/ique/PR/verify.h +++ b/include/ique/PR/verify.h @@ -1,5 +1,4 @@ -#ifndef _VERIFY_H_ -#define _VERIFY_H_ +#pragma once /************************************************************************** * * @@ -116,5 +115,3 @@ struct CVGHeader { #define ZB_END_ADDR 0x125800 #define EVAN_START_ADDR 0x130000 #define EVAN_END_ADDR 0x140000 - -#endif /* !_VERIFY_H_ */ diff --git a/include/ique/ultra64.h b/include/ique/ultra64.h index f6ebba04..750d1d18 100755 --- a/include/ique/ultra64.h +++ b/include/ique/ultra64.h @@ -19,8 +19,7 @@ * **************************************************************************/ -#ifndef _ULTRA64_H_ -#define _ULTRA64_H_ +#pragma once #include #include @@ -36,5 +35,3 @@ #include #include #include - -#endif diff --git a/include/level_commands.h b/include/level_commands.h index 630e46e6..e315145f 100644 --- a/include/level_commands.h +++ b/include/level_commands.h @@ -1,5 +1,4 @@ -#ifndef LEVEL_COMMANDS_H -#define LEVEL_COMMANDS_H +#pragma once #include "command_macros_base.h" @@ -361,5 +360,3 @@ #define GET_OR_SET(op, var) \ CMD_BBBB(0x3C, 0x04, op, var) - -#endif // LEVEL_COMMANDS_H diff --git a/include/level_misc_macros.h b/include/level_misc_macros.h index 91ccd784..72d37944 100644 --- a/include/level_misc_macros.h +++ b/include/level_misc_macros.h @@ -1,5 +1,4 @@ -#ifndef LEVEL_MISC_MACROS_H -#define LEVEL_MISC_MACROS_H +#pragma once #define MACRO_OBJECT_WITH_BEH_PARAM(preset, yaw, posX, posY, posZ, behParam) \ ((s16)((yaw * 0x10 / 45) << 9) | (preset + 0x1F)), posX, posY, posZ, behParam @@ -24,5 +23,3 @@ #define TRAJECTORY_END() \ -1 - -#endif // LEVEL_MISC_MACROS_H diff --git a/include/level_table.h b/include/level_table.h index 3ad47eb7..e1dfaa5e 100644 --- a/include/level_table.h +++ b/include/level_table.h @@ -1,5 +1,4 @@ -#ifndef LEVEL_TABLE_H -#define LEVEL_TABLE_H +#pragma once // For LEVEL_NAME defines, see level_defines.h. // Please include this file if you want to use them. @@ -21,5 +20,3 @@ enum LevelNum #undef STUB_LEVEL #undef DEFINE_LEVEL - -#endif // LEVEL_TABLE_H diff --git a/include/libc/math.h b/include/libc/math.h index 8cea459b..19278c3b 100644 --- a/include/libc/math.h +++ b/include/libc/math.h @@ -1,5 +1,4 @@ -#ifndef MATH_H -#define MATH_H +#pragma once #define M_PI 3.14159265358979323846 @@ -9,5 +8,3 @@ float cosf(float); double cos(double); float sqrtf(float); - -#endif diff --git a/include/libc/stdarg.h b/include/libc/stdarg.h index aa7e3393..3ae8ac0a 100644 --- a/include/libc/stdarg.h +++ b/include/libc/stdarg.h @@ -1,5 +1,4 @@ -#ifndef STDARG_H -#define STDARG_H +#pragma once // When not building with IDO, use the builtin vaarg macros for portability. #ifndef __sgi @@ -39,4 +38,3 @@ typedef char *va_list; #define va_end(__list) #endif -#endif diff --git a/include/libc/stddef.h b/include/libc/stddef.h index 7e72a7bb..b4f51cba 100644 --- a/include/libc/stddef.h +++ b/include/libc/stddef.h @@ -1,10 +1,7 @@ -#ifndef STDDEF_H -#define STDDEF_H +#pragma once #include "PR/ultratypes.h" #ifndef offsetof #define offsetof(st, m) ((size_t)&(((st *)0)->m)) #endif - -#endif diff --git a/include/libc/stdio.h b/include/libc/stdio.h index 1cd4d0a3..248b40e7 100644 --- a/include/libc/stdio.h +++ b/include/libc/stdio.h @@ -1,6 +1,3 @@ -#ifndef STDIO_H -#define STDIO_H +#pragma once extern int sprintf(char *s, const char *fmt, ...); - -#endif diff --git a/include/libc/stdlib.h b/include/libc/stdlib.h index c23b4542..d9e1ad70 100644 --- a/include/libc/stdlib.h +++ b/include/libc/stdlib.h @@ -1,5 +1,4 @@ -#ifndef STDLIB_H -#define STDLIB_H +#pragma once typedef struct lldiv_t { @@ -15,5 +14,3 @@ typedef struct ldiv_t lldiv_t lldiv(long long num, long long denom); ldiv_t ldiv(long num, long denom); - -#endif diff --git a/include/libc/string.h b/include/libc/string.h index 009d30f1..3064251e 100644 --- a/include/libc/string.h +++ b/include/libc/string.h @@ -1,5 +1,4 @@ -#ifndef STRING_H -#define STRING_H +#pragma once #include "PR/ultratypes.h" @@ -10,5 +9,3 @@ int memcmp(const void *buf1, const void *buf2, size_t count); void *memset(void* dst, int c, size_t count); char *strcat(char *str1, const char *str2); int strncmp(const char *str1, const char *str2, int n); - -#endif diff --git a/include/macro_preset_names.h b/include/macro_preset_names.h index 2700a8e8..1f6fa03d 100644 --- a/include/macro_preset_names.h +++ b/include/macro_preset_names.h @@ -1,5 +1,4 @@ -#ifndef MACRO_PRESET_NAMES_H -#define MACRO_PRESET_NAMES_H +#pragma once enum MacroPresets { macro_yellow_coin, @@ -369,5 +368,3 @@ enum MacroPresets { macro_empty_364, macro_empty_365 }; - -#endif // MACRO_PRESET_NAMES_H diff --git a/include/macro_presets.h b/include/macro_presets.h index 698e3bdf..6e8736ee 100644 --- a/include/macro_presets.h +++ b/include/macro_presets.h @@ -1,5 +1,4 @@ -#ifndef MACRO_PRESETS_H -#define MACRO_PRESETS_H +#pragma once #include "macro_preset_names.h" #include "behavior_data.h" @@ -380,5 +379,3 @@ struct MacroPreset MacroObjectPresets[] = { {bhvYellowCoin, MODEL_YELLOW_COIN, 0}, {bhvYellowCoin, MODEL_YELLOW_COIN, 0} }; - -#endif // MACRO_PRESETS_H diff --git a/include/macros.h b/include/macros.h index cfa3a6d3..fc00c67f 100644 --- a/include/macros.h +++ b/include/macros.h @@ -1,5 +1,4 @@ -#ifndef MACROS_H -#define MACROS_H +#pragma once #include "platform_info.h" @@ -71,6 +70,4 @@ #define MODE_NTSC 0 #define MODE_MPAL 1 -#define MODE_PAL 2 - -#endif // MACROS_H +#define MODE_PAL 2 diff --git a/include/make_const_nonconst.h b/include/make_const_nonconst.h index dbe5031e..f27db465 100644 --- a/include/make_const_nonconst.h +++ b/include/make_const_nonconst.h @@ -1,5 +1,4 @@ -#ifndef MAKE_CONST_NONCONST_H -#define MAKE_CONST_NONCONST_H +#pragma once #ifdef TARGET_N64 // IDO sometimes puts const variables in .rodata and sometimes in .data, which breaks ordering. @@ -7,5 +6,3 @@ // both IDO and gcc for TARGET_N64. #define const #endif - -#endif // MAKE_CONST_NONCONST_H diff --git a/include/mario_animation_ids.h b/include/mario_animation_ids.h index 1d22d3d1..f06d689a 100644 --- a/include/mario_animation_ids.h +++ b/include/mario_animation_ids.h @@ -1,5 +1,4 @@ -#ifndef MARIO_ANIMATION_IDS_H -#define MARIO_ANIMATION_IDS_H +#pragma once /* Mario Animation IDs */ @@ -215,5 +214,3 @@ enum MarioAnimID /* 0xCF */ MARIO_ANIM_FORWARD_SPINNING_FLIP, /* 0xD0 */ MARIO_ANIM_TRIPLE_JUMP_FLY }; - -#endif // MARIO_ANIMATION_IDS_H diff --git a/include/mario_geo_switch_case_ids.h b/include/mario_geo_switch_case_ids.h index 007d23b0..e06de50c 100644 --- a/include/mario_geo_switch_case_ids.h +++ b/include/mario_geo_switch_case_ids.h @@ -1,5 +1,4 @@ -#ifndef MARIO_GEO_SWITCH_CASE_IDS_H -#define MARIO_GEO_SWITCH_CASE_IDS_H +#pragma once /* Mario Geo-Switch-Case IDs */ @@ -41,5 +40,3 @@ enum MarioGrabPosGSCId /*0x02*/ GRAB_POS_HEAVY_OBJ, /*0x03*/ GRAB_POS_BOWSER }; - -#endif // MARIO_GEO_SWITCH_CASE_IDS_H diff --git a/include/model_ids.h b/include/model_ids.h index a8434c17..b7a69838 100644 --- a/include/model_ids.h +++ b/include/model_ids.h @@ -1,5 +1,4 @@ -#ifndef MODEL_IDS_H -#define MODEL_IDS_H +#pragma once #define ACT_1 (1 << 0) #define ACT_2 (1 << 1) @@ -582,5 +581,3 @@ #define MODEL_THI_WARP_PIPE MODEL_LEVEL_GEOMETRY_16 // warp_pipe_geo #define MODEL_VCUTM_WARP_PIPE MODEL_LEVEL_GEOMETRY_16 // warp_pipe_geo #define MODEL_CASTLE_GROUNDS_WARP_PIPE MODEL_LEVEL_GEOMETRY_16 // warp_pipe_geo - -#endif // MODEL_IDS_H diff --git a/include/moving_texture_macros.h b/include/moving_texture_macros.h index a7067d6d..09e0f0f0 100644 --- a/include/moving_texture_macros.h +++ b/include/moving_texture_macros.h @@ -1,5 +1,4 @@ -#ifndef MOVING_TEXTURE_MACROS_H -#define MOVING_TEXTURE_MACROS_H +#pragma once #include "game/moving_texture.h" @@ -68,5 +67,3 @@ // End of moving texture load if movTexRotTris was used, only used in SSL #define MOV_TEX_ROT_END() \ 0, 0 - -#endif // MOVING_TEXTURE_MACROS_H diff --git a/include/n64/PR/PRimage.h b/include/n64/PR/PRimage.h index aacc6567..5ece9de6 100644 --- a/include/n64/PR/PRimage.h +++ b/include/n64/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__ */ diff --git a/include/n64/PR/R4300.h b/include/n64/PR/R4300.h index fd70d07f..8962d712 100644 --- a/include/n64/PR/R4300.h +++ b/include/n64/PR/R4300.h @@ -18,8 +18,7 @@ * **************************************************************************/ -#ifndef __R4300_H__ -#define __R4300_H__ +#pragma once #include @@ -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 */ diff --git a/include/n64/PR/abi.h b/include/n64/PR/abi.h index b73cb726..4c811756 100644 --- a/include/n64/PR/abi.h +++ b/include/n64/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_ */ diff --git a/include/n64/PR/gbi-poslight.h b/include/n64/PR/gbi-poslight.h index 7b93aea0..7eb1faa0 100644 --- a/include/n64/PR/gbi-poslight.h +++ b/include/n64/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_ */ diff --git a/include/n64/PR/gbi.h b/include/n64/PR/gbi.h index 16968a8e..93a61a0c 100644 --- a/include/n64/PR/gbi.h +++ b/include/n64/PR/gbi.h @@ -17,8 +17,7 @@ * **************************************************************************/ -#ifndef _GBI_H_ -#define _GBI_H_ +#pragma once #include #include @@ -4873,6 +4872,3 @@ typedef union { #endif #endif /* _LANGUAGE_C */ - - -#endif /* _GBI_H_ */ diff --git a/include/n64/PR/gs2dex.h b/include/n64/PR/gs2dex.h index ced46855..8acaa0e5 100644 --- a/include/n64/PR/gs2dex.h +++ b/include/n64/PR/gs2dex.h @@ -9,8 +9,7 @@ $Id: gs2dex.h,v 1.21 1998/05/28 00:14:49 has Exp $ ---------------------------------------------------------------------*/ -#ifndef _GS2DEX_H_ -#define _GS2DEX_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -387,6 +386,5 @@ extern void guS2DInitBg(uObjBg *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif -#endif /* _GS2DEX_H_ */ /*======== End of gs2dex.h ========*/ diff --git a/include/n64/PR/gt.h b/include/n64/PR/gt.h index 09b6ba2d..32557b2a 100644 --- a/include/n64/PR/gt.h +++ b/include/n64/PR/gt.h @@ -44,8 +44,7 @@ * **************************************************************************/ -#ifndef _GT_H_ -#define _GT_H_ +#pragma once /* this file should be #included AFTER gbi.h */ @@ -361,5 +360,3 @@ typedef union { #ifdef _LANGUAGE_MAKEROM #endif /* _LANGUAGE_MAKEROM */ - -#endif /* _GT_H_ */ diff --git a/include/n64/PR/gu.h b/include/n64/PR/gu.h index aa83ba08..d6b250e8 100644 --- a/include/n64/PR/gu.h +++ b/include/n64/PR/gu.h @@ -1,5 +1,4 @@ -#ifndef _GU_H_ -#define _GU_H_ +#pragma once /************************************************************************** * * @@ -265,5 +264,3 @@ void guSprite2DInit(uSprite *SpritePointer, int SourceImageBitSize, int SourceImageOffsetS, int SourceImageOffsetT); - -#endif /* !_GU_H_ */ diff --git a/include/n64/PR/gzsort.h b/include/n64/PR/gzsort.h index eaa67ebf..d867eb87 100644 --- a/include/n64/PR/gzsort.h +++ b/include/n64/PR/gzsort.h @@ -6,8 +6,7 @@ $Id: gzsort.h,v 1.11 1998/01/06 01:28:21 yasu Exp $ *---------------------------------------------------------------------*/ -#ifndef _GZSORT_H_ -#define _GZSORT_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -626,6 +625,5 @@ extern u64 gspZSort_pl_fifoDataStart[], gspZSort_pl_fifoDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif -#endif /* _GZSORT_H_ */ /*======== End of gzsort.h ========*/ diff --git a/include/n64/PR/leo.h b/include/n64/PR/leo.h index 96f2edd1..665d9435 100644 --- a/include/n64/PR/leo.h +++ b/include/n64/PR/leo.h @@ -7,8 +7,7 @@ $Date: 1998/12/21 07:30:15 $ *---------------------------------------------------------------------*/ -#ifndef _LEO_H_ -#define _LEO_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -276,5 +275,3 @@ extern void LeoBootGame(void *entry); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_LEO_H */ diff --git a/include/n64/PR/libaudio.h b/include/n64/PR/libaudio.h index cb7a5b19..44e919a6 100644 --- a/include/n64/PR/libaudio.h +++ b/include/n64/PR/libaudio.h @@ -1,5 +1,4 @@ -#ifndef _ULTRA64_LIBAUDIO_H_ -#define _ULTRA64_LIBAUDIO_H_ +#pragma once #include "abi.h" @@ -47,5 +46,3 @@ typedef struct } ALSeqFile; void alSeqFileNew(ALSeqFile *f, u8 *base); - -#endif diff --git a/include/n64/PR/mbi.h b/include/n64/PR/mbi.h index ac900a54..abaeb8f9 100644 --- a/include/n64/PR/mbi.h +++ b/include/n64/PR/mbi.h @@ -1,5 +1,4 @@ -#ifndef _MBI_H_ -#define _MBI_H_ +#pragma once /************************************************************************** * * @@ -96,5 +95,3 @@ #ifndef NULL #define NULL 0 #endif - -#endif /* !_MBI_H_ */ diff --git a/include/n64/PR/os.h b/include/n64/PR/os.h index 4b52dfb2..046ec9c1 100644 --- a/include/n64/PR/os.h +++ b/include/n64/PR/os.h @@ -27,8 +27,7 @@ $Date: 2000/06/15 06:24:52 $ *---------------------------------------------------------------------*/ -#ifndef _OS_H_ -#define _OS_H_ +#pragma once #include #include @@ -104,5 +103,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_H */ diff --git a/include/n64/PR/os_ai.h b/include/n64/PR/os_ai.h index f89d87cf..547ea055 100644 --- a/include/n64/PR/os_ai.h +++ b/include/n64/PR/os_ai.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:04 $ *---------------------------------------------------------------------*/ -#ifndef _OS_AI_H_ -#define _OS_AI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -88,5 +87,3 @@ extern s32 osAiSetNextBuffer(void *, u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_AI_H_ */ diff --git a/include/n64/PR/os_cache.h b/include/n64/PR/os_cache.h index 54ed9230..0eed2e79 100644 --- a/include/n64/PR/os_cache.h +++ b/include/n64/PR/os_cache.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:04 $ *---------------------------------------------------------------------*/ -#ifndef _OS_CACHE_H_ -#define _OS_CACHE_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -92,5 +91,3 @@ extern void osWritebackDCacheAll(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_CACHE_H_ */ diff --git a/include/n64/PR/os_cont.h b/include/n64/PR/os_cont.h index a2bd8707..ebdf8289 100644 --- a/include/n64/PR/os_cont.h +++ b/include/n64/PR/os_cont.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:05 $ *---------------------------------------------------------------------*/ -#ifndef _OS_CONT_H_ -#define _OS_CONT_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -203,5 +202,3 @@ extern void osContGetReadData(OSContPad *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_CONT_H_ */ diff --git a/include/n64/PR/os_convert.h b/include/n64/PR/os_convert.h index 0a5da10a..afe67760 100644 --- a/include/n64/PR/os_convert.h +++ b/include/n64/PR/os_convert.h @@ -27,8 +27,7 @@ $Date: 1999/04/21 02:53:11 $ *---------------------------------------------------------------------*/ -#ifndef _OS_CONVERT_H_ -#define _OS_CONVERT_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -107,5 +106,3 @@ extern void * osPhysicalToVirtual(u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_CONVERT_H_ */ diff --git a/include/n64/PR/os_debug.h b/include/n64/PR/os_debug.h index 076c4020..76bda27a 100644 --- a/include/n64/PR/os_debug.h +++ b/include/n64/PR/os_debug.h @@ -27,9 +27,7 @@ $Date: 1999/06/30 03:04:08 $ *---------------------------------------------------------------------*/ -#ifndef _OS_DEBUG_H_ -#define _OS_DEBUG_H_ - +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -114,5 +112,3 @@ extern OSTime osThreadProfileReadTimeTh(OSThread*); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_DEBUG_H_ */ diff --git a/include/n64/PR/os_eeprom.h b/include/n64/PR/os_eeprom.h index b3bca814..9afb3997 100644 --- a/include/n64/PR/os_eeprom.h +++ b/include/n64/PR/os_eeprom.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:06 $ *---------------------------------------------------------------------*/ -#ifndef _OS_EEPROM_H_ -#define _OS_EEPROM_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -103,5 +102,3 @@ extern s32 osEepromLongWrite(OSMesgQueue *, u8, u8 *, int); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_EEPROM_H_ */ diff --git a/include/n64/PR/os_error.h b/include/n64/PR/os_error.h index f4c3b83c..696e39ca 100644 --- a/include/n64/PR/os_error.h +++ b/include/n64/PR/os_error.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:06 $ *---------------------------------------------------------------------*/ -#ifndef _OS_ERROR_H_ -#define _OS_ERROR_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -82,5 +81,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_ERROR_H_ */ diff --git a/include/n64/PR/os_exception.h b/include/n64/PR/os_exception.h index 245e5e69..22be2673 100644 --- a/include/n64/PR/os_exception.h +++ b/include/n64/PR/os_exception.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:07 $ *---------------------------------------------------------------------*/ -#ifndef _OS_EXCEPTION_H_ -#define _OS_EXCEPTION_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -115,5 +114,3 @@ extern OSIntMask osSetIntMask(OSIntMask); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_EXCEPTION_H_ */ diff --git a/include/n64/PR/os_flash.h b/include/n64/PR/os_flash.h index 4e0a129b..e33191e5 100644 --- a/include/n64/PR/os_flash.h +++ b/include/n64/PR/os_flash.h @@ -6,8 +6,7 @@ $Date: 2000/06/15 06:24:55 $ *---------------------------------------------------------------------*/ -#ifndef _OS_FLASH_H_ -#define _OS_FLASH_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -67,5 +66,3 @@ extern s32 osFlashCheckEraseEnd(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_FLASH_H_ */ diff --git a/include/n64/PR/os_gbpak.h b/include/n64/PR/os_gbpak.h index 0a999945..1fd99a8f 100644 --- a/include/n64/PR/os_gbpak.h +++ b/include/n64/PR/os_gbpak.h @@ -7,8 +7,7 @@ $Date: 1998/10/09 08:01:07 $ *---------------------------------------------------------------------*/ -#ifndef _OS_GBPAK_H_ -#define _OS_GBPAK_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -103,5 +102,3 @@ extern s32 osGbpakCheckConnector(OSPfs *, u8 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_GBPAK_H_ */ diff --git a/include/n64/PR/os_gio.h b/include/n64/PR/os_gio.h index ad3c020f..125b6382 100644 --- a/include/n64/PR/os_gio.h +++ b/include/n64/PR/os_gio.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:08 $ *---------------------------------------------------------------------*/ -#ifndef _OS_GIO_H_ -#define _OS_GIO_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -82,5 +81,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_GIO_H_ */ diff --git a/include/n64/PR/os_host.h b/include/n64/PR/os_host.h index 0cc1ae5b..ab3eb1bc 100644 --- a/include/n64/PR/os_host.h +++ b/include/n64/PR/os_host.h @@ -27,8 +27,7 @@ $Date: 1999/06/24 09:23:06 $ *---------------------------------------------------------------------*/ -#ifndef _OS_HOST_H_ -#define _OS_HOST_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -157,5 +156,3 @@ extern void osInitRdb(u8 *sendBuf, u32 sendSize); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_HOST_H_ */ diff --git a/include/n64/PR/os_internal.h b/include/n64/PR/os_internal.h index 754d1ee2..38659487 100644 --- a/include/n64/PR/os_internal.h +++ b/include/n64/PR/os_internal.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:09 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_H_ -#define _OS_INTERNAL_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -45,5 +44,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_H */ diff --git a/include/n64/PR/os_internal_debug.h b/include/n64/PR/os_internal_debug.h index 7b307d6e..ce3319c9 100644 --- a/include/n64/PR/os_internal_debug.h +++ b/include/n64/PR/os_internal_debug.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:09 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_DEBUG_H_ -#define _OS_INTERNAL_DEBUG_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -39,5 +38,3 @@ extern int __osAtomicDec(unsigned int *p); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_DEBUG_H */ diff --git a/include/n64/PR/os_internal_error.h b/include/n64/PR/os_internal_error.h index de188d23..0658943c 100644 --- a/include/n64/PR/os_internal_error.h +++ b/include/n64/PR/os_internal_error.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:10 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_ERROR_H_ -#define _OS_INTERNAL_ERROR_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -41,5 +40,3 @@ extern OSThread * __osGetNextFaultedThread(OSThread *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_ERROR_H */ diff --git a/include/n64/PR/os_internal_exception.h b/include/n64/PR/os_internal_exception.h index 730dc935..41d49543 100644 --- a/include/n64/PR/os_internal_exception.h +++ b/include/n64/PR/os_internal_exception.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:10 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_EXCEPTION_H_ -#define _OS_INTERNAL_EXCEPTION_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -45,5 +44,3 @@ extern void __osResetGlobalIntMask(OSHWIntr); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_EXCEPTION_H */ diff --git a/include/n64/PR/os_internal_gio.h b/include/n64/PR/os_internal_gio.h index ff133850..2ff9e748 100644 --- a/include/n64/PR/os_internal_gio.h +++ b/include/n64/PR/os_internal_gio.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:11 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_GIO_H_ -#define _OS_INTERNAL_GIO_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -41,5 +40,3 @@ extern void __osGIORawInterrupt(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_GIO_H */ diff --git a/include/n64/PR/os_internal_host.h b/include/n64/PR/os_internal_host.h index b6d19513..990fa96b 100644 --- a/include/n64/PR/os_internal_host.h +++ b/include/n64/PR/os_internal_host.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:11 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_HOST_H_ -#define _OS_INTERNAL_HOST_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -38,5 +37,3 @@ extern u32 __osRdbSend(u8 *buf, u32 size, u32 type); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_HOST_H */ diff --git a/include/n64/PR/os_internal_reg.h b/include/n64/PR/os_internal_reg.h index a1619981..34f2c486 100644 --- a/include/n64/PR/os_internal_reg.h +++ b/include/n64/PR/os_internal_reg.h @@ -18,8 +18,7 @@ $Date: 1999/03/10 12:19:14 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_REG_H_ -#define _OS_INTERNAL_REG_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -55,5 +54,3 @@ extern u32 __osGetFpcCsr(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_REG_H */ diff --git a/include/n64/PR/os_internal_rsp.h b/include/n64/PR/os_internal_rsp.h index 646e6679..89b1815b 100644 --- a/include/n64/PR/os_internal_rsp.h +++ b/include/n64/PR/os_internal_rsp.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:12 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_RSP_H_ -#define _OS_INTERNAL_RSP_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -44,5 +43,3 @@ extern s32 __osSpRawStartDma(s32, u32, void *, u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_RSP_H */ diff --git a/include/n64/PR/os_internal_si.h b/include/n64/PR/os_internal_si.h index d0eeedcc..d3636c84 100644 --- a/include/n64/PR/os_internal_si.h +++ b/include/n64/PR/os_internal_si.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:13 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_SI_H_ -#define _OS_INTERNAL_SI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -42,5 +41,3 @@ extern s32 __osSiRawStartDma(s32, void *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_SI_H */ diff --git a/include/n64/PR/os_internal_thread.h b/include/n64/PR/os_internal_thread.h index 1305eb58..b70e7506 100644 --- a/include/n64/PR/os_internal_thread.h +++ b/include/n64/PR/os_internal_thread.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:13 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_THREAD_H_ -#define _OS_INTERNAL_THREAD_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -39,5 +38,3 @@ extern OSThread * __osGetActiveQueue(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_THREAD_H */ diff --git a/include/n64/PR/os_internal_tlb.h b/include/n64/PR/os_internal_tlb.h index b92918ff..b7b05194 100644 --- a/include/n64/PR/os_internal_tlb.h +++ b/include/n64/PR/os_internal_tlb.h @@ -18,8 +18,7 @@ $Date: 1998/10/09 08:01:14 $ *---------------------------------------------------------------------*/ -#ifndef _OS_INTERNAL_TLB_H_ -#define _OS_INTERNAL_TLB_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -43,5 +42,3 @@ extern u32 __osGetTLBLo1(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_INTERNAL_TLB_H */ diff --git a/include/n64/PR/os_libc.h b/include/n64/PR/os_libc.h index ae7281fc..ed61487b 100644 --- a/include/n64/PR/os_libc.h +++ b/include/n64/PR/os_libc.h @@ -27,8 +27,7 @@ $Date: 1999/07/13 01:43:47 $ *---------------------------------------------------------------------*/ -#ifndef _OS_LIBC_H_ -#define _OS_LIBC_H_ +#pragma once #include "os_pfs.h" @@ -96,5 +95,3 @@ extern void osSyncPrintf(const char *fmt, ...); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_LIBC_H_ */ diff --git a/include/n64/PR/os_message.h b/include/n64/PR/os_message.h index 5bc565e3..eb320313 100644 --- a/include/n64/PR/os_message.h +++ b/include/n64/PR/os_message.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:15 $ *---------------------------------------------------------------------*/ -#ifndef _OS_MESSAGE_H_ -#define _OS_MESSAGE_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -159,5 +158,3 @@ extern void osSetEventMesg(OSEvent, OSMesgQueue *, OSMesg); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_MESSAGE_H_ */ diff --git a/include/n64/PR/os_motor.h b/include/n64/PR/os_motor.h index f8dcbd5a..12c91634 100644 --- a/include/n64/PR/os_motor.h +++ b/include/n64/PR/os_motor.h @@ -7,8 +7,7 @@ $Date: 1998/10/09 08:01:15 $ *---------------------------------------------------------------------*/ -#ifndef _OS_MOTOR_H_ -#define _OS_MOTOR_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -79,5 +78,3 @@ extern s32 osMotorStart(OSPfs *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_MOTOR_H_ */ diff --git a/include/n64/PR/os_pfs.h b/include/n64/PR/os_pfs.h index 188f9d28..1da74048 100644 --- a/include/n64/PR/os_pfs.h +++ b/include/n64/PR/os_pfs.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:16 $ *---------------------------------------------------------------------*/ -#ifndef _OS_PFS_H_ -#define _OS_PFS_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -170,5 +169,3 @@ extern s32 osPfsNumFiles(OSPfs *, s32 *, s32 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_PFS_H_ */ diff --git a/include/n64/PR/os_pi.h b/include/n64/PR/os_pi.h index 0c745978..794d7119 100644 --- a/include/n64/PR/os_pi.h +++ b/include/n64/PR/os_pi.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:16 $ *---------------------------------------------------------------------*/ -#ifndef _OS_PI_H_ -#define _OS_PI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -220,5 +219,3 @@ extern s32 osEPiLinkHandle(OSPiHandle *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_PI_H_ */ diff --git a/include/n64/PR/os_rdp.h b/include/n64/PR/os_rdp.h index 6b3d288c..640192e8 100644 --- a/include/n64/PR/os_rdp.h +++ b/include/n64/PR/os_rdp.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:16 $ *---------------------------------------------------------------------*/ -#ifndef _OS_RDP_H_ -#define _OS_RDP_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -88,5 +87,3 @@ extern s32 osDpSetNextBuffer(void *, u64); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_RDP_H_ */ diff --git a/include/n64/PR/os_reg.h b/include/n64/PR/os_reg.h index 50aa2188..8a247c95 100644 --- a/include/n64/PR/os_reg.h +++ b/include/n64/PR/os_reg.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:17 $ *---------------------------------------------------------------------*/ -#ifndef _OS_REG_H_ -#define _OS_REG_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -86,5 +85,3 @@ extern u32 osGetCount(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_REG_H_ */ diff --git a/include/n64/PR/os_rsp.h b/include/n64/PR/os_rsp.h index 12116053..226b371b 100644 --- a/include/n64/PR/os_rsp.h +++ b/include/n64/PR/os_rsp.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:17 $ *---------------------------------------------------------------------*/ -#ifndef _OS_RSP_H_ -#define _OS_RSP_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -82,5 +81,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_RSP_H_ */ diff --git a/include/n64/PR/os_si.h b/include/n64/PR/os_si.h index 23b07c07..8ea3ecb3 100644 --- a/include/n64/PR/os_si.h +++ b/include/n64/PR/os_si.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:18 $ *---------------------------------------------------------------------*/ -#ifndef _OS_SI_H_ -#define _OS_SI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -82,5 +81,3 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_SI_H_ */ diff --git a/include/n64/PR/os_system.h b/include/n64/PR/os_system.h index 1179189a..ccd5adce 100644 --- a/include/n64/PR/os_system.h +++ b/include/n64/PR/os_system.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:18 $ *---------------------------------------------------------------------*/ -#ifndef _OS_SYSTEM_H_ -#define _OS_SYSTEM_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -114,5 +113,3 @@ extern s32 osAfterPreNMI(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_SYSTEM_H_ */ diff --git a/include/n64/PR/os_thread.h b/include/n64/PR/os_thread.h index 7b82dc79..d386758d 100644 --- a/include/n64/PR/os_thread.h +++ b/include/n64/PR/os_thread.h @@ -27,8 +27,7 @@ $Date: 1999/06/15 12:39:40 $ *---------------------------------------------------------------------*/ -#ifndef _OS_THREAD_H_ -#define _OS_THREAD_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -150,5 +149,3 @@ extern OSPri osGetThreadPri(OSThread *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_THREAD_H_ */ diff --git a/include/n64/PR/os_time.h b/include/n64/PR/os_time.h index deaec659..291b8e47 100644 --- a/include/n64/PR/os_time.h +++ b/include/n64/PR/os_time.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:19 $ *---------------------------------------------------------------------*/ -#ifndef _OS_TIME_H_ -#define _OS_TIME_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -110,5 +109,3 @@ extern int osStopTimer(OSTimer *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_TIME_H_ */ diff --git a/include/n64/PR/os_tlb.h b/include/n64/PR/os_tlb.h index 2cdd5c9c..2f892d04 100644 --- a/include/n64/PR/os_tlb.h +++ b/include/n64/PR/os_tlb.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:20 $ *---------------------------------------------------------------------*/ -#ifndef _OS_TLB_H_ -#define _OS_TLB_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -103,5 +102,3 @@ extern void osSetTLBASID(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_TLB_H_ */ diff --git a/include/n64/PR/os_version.h b/include/n64/PR/os_version.h index c485a438..966c9ef4 100644 --- a/include/n64/PR/os_version.h +++ b/include/n64/PR/os_version.h @@ -7,10 +7,7 @@ $Date: 1999/06/17 01:33:01 $ *---------------------------------------------------------------------*/ -#ifndef _OS_VERSION_H_ -#define _OS_VERSION_H_ +#pragma once #define OS_MAJOR_VERSION "2.0K" /* major version */ #define OS_MINOR_VERSION 0 /* patch level */ - -#endif /* !_OS_VERSION_H_ */ diff --git a/include/n64/PR/os_vi.h b/include/n64/PR/os_vi.h index 5a17f258..00fd6a0b 100644 --- a/include/n64/PR/os_vi.h +++ b/include/n64/PR/os_vi.h @@ -27,8 +27,7 @@ $Date: 1998/10/09 08:01:20 $ *---------------------------------------------------------------------*/ -#ifndef _OS_VI_H_ -#define _OS_VI_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -294,5 +293,3 @@ extern void osCreateViManager(OSPri); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_VI_H_ */ diff --git a/include/n64/PR/os_voice.h b/include/n64/PR/os_voice.h index 4e3cf6ec..aeb13ae7 100644 --- a/include/n64/PR/os_voice.h +++ b/include/n64/PR/os_voice.h @@ -7,8 +7,7 @@ $Date: 1999/07/13 08:36:42 $ *---------------------------------------------------------------------*/ -#ifndef _OS_VOICE_H_ -#define _OS_VOICE_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -104,5 +103,3 @@ extern void osVoiceCountSyllables(u8 *, u32 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_VOICE_H_ */ diff --git a/include/n64/PR/ramrom.h b/include/n64/PR/ramrom.h index 42e5c2d5..85f7571f 100644 --- a/include/n64/PR/ramrom.h +++ b/include/n64/PR/ramrom.h @@ -1,5 +1,4 @@ -#ifndef _RAMROM_H -#define _RAMROM_H +#pragma once /************************************************************************** * * @@ -109,5 +108,3 @@ typedef struct { void __RamRomInit(int key, void *romaddr); void __RamRomDestroy(int key); #endif /* _EMULATOR */ - -#endif /* !_RAMROM_H */ diff --git a/include/n64/PR/rcp.h b/include/n64/PR/rcp.h index 980f21f0..a09796f0 100644 --- a/include/n64/PR/rcp.h +++ b/include/n64/PR/rcp.h @@ -1,5 +1,4 @@ -#ifndef _RCP_H_ -#define _RCP_H_ +#pragma once /************************************************************************** * * @@ -880,6 +879,3 @@ The Indy development board use cartridge domain 1: IO_READ(SP_STATUS_REG)) #endif - -#endif /* _RCP_H_ */ - diff --git a/include/n64/PR/rdb.h b/include/n64/PR/rdb.h index e0897493..3cda3bdd 100644 --- a/include/n64/PR/rdb.h +++ b/include/n64/PR/rdb.h @@ -7,8 +7,7 @@ * **************************************************************************/ -#ifndef _RDB_H -#define _RDB_H +#pragma once /* U64 side address */ #define RDB_BASE_REG 0xc0000000 @@ -89,5 +88,3 @@ extern unsigned int __osRdbWriteOK; extern unsigned int __osRdbSendMessage; #endif /* _LANGUAGE_C */ - -#endif /* !_RDB_H */ diff --git a/include/n64/PR/region.h b/include/n64/PR/region.h index 226e9a2c..2466a40e 100644 --- a/include/n64/PR/region.h +++ b/include/n64/PR/region.h @@ -27,8 +27,7 @@ **************************************************************************/ -#ifndef _REGION_H_ -#define _REGION_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS @@ -116,8 +115,3 @@ extern s32 osGetRegionBufSize(void *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - - -#endif /* _REGION_H_ */ - - diff --git a/include/n64/PR/rmon.h b/include/n64/PR/rmon.h index 199e5699..60c6b895 100644 --- a/include/n64/PR/rmon.h +++ b/include/n64/PR/rmon.h @@ -18,8 +18,7 @@ * **************************************************************************/ -#ifndef _RMON_H_ -#define _RMON_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -35,5 +34,3 @@ extern void rmonPrintf( const char *, ... ); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_OS_H */ diff --git a/include/n64/PR/rsp.h b/include/n64/PR/rsp.h index 16f5ca34..e942ad0a 100644 --- a/include/n64/PR/rsp.h +++ b/include/n64/PR/rsp.h @@ -17,8 +17,7 @@ * **************************************************************************/ -#ifndef _RSP_H_ -#define _RSP_H_ 1 +#pragma once #define RSP_DMEM_BASE 0x04000000 #define RSP_IMEM_BASE 0x04001000 @@ -80,6 +79,3 @@ .name CMD_TMEM_BUSY, $c15 #endif - - -#endif diff --git a/include/n64/PR/rsp_ipc.h b/include/n64/PR/rsp_ipc.h index af1a54d3..5b363838 100644 --- a/include/n64/PR/rsp_ipc.h +++ b/include/n64/PR/rsp_ipc.h @@ -15,8 +15,7 @@ * **************************************************************************/ -#ifndef _RSP_IPC_H_ -#define _RSP_IPC_H_ 1 +#pragma once #if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) @@ -65,5 +64,3 @@ extern int sem_signal(int id); extern int sem_op(int id, int value); #endif - -#endif diff --git a/include/n64/PR/sp.h b/include/n64/PR/sp.h index 8167ca23..11e89483 100644 --- a/include/n64/PR/sp.h +++ b/include/n64/PR/sp.h @@ -20,8 +20,7 @@ * **************************************************************************/ -#ifndef _SP_H_ -#define _SP_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -192,5 +191,3 @@ void spFinish( Gfx **glistp ); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* _SP_H_ */ diff --git a/include/n64/PR/sptask.h b/include/n64/PR/sptask.h index 960cab9b..4ef20744 100644 --- a/include/n64/PR/sptask.h +++ b/include/n64/PR/sptask.h @@ -18,8 +18,7 @@ * **************************************************************************/ -#ifndef _SPTASK_H_ -#define _SPTASK_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -197,5 +196,3 @@ extern OSYieldResult osSpTaskYielded(OSTask *tp); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_SPTASK_H */ diff --git a/include/n64/PR/trace.h b/include/n64/PR/trace.h index dc64a1a5..45b6b906 100644 --- a/include/n64/PR/trace.h +++ b/include/n64/PR/trace.h @@ -1,5 +1,4 @@ -#ifndef _TRACE_H_ -#define _TRACE_H_ +#pragma once /************************************************************************** @@ -76,7 +75,3 @@ extern unsigned long Dflags; /* Global debug flag */ * Extern function prototypes * */ - - -#endif /* _TRACE_H_ */ - diff --git a/include/n64/PR/ucode.h b/include/n64/PR/ucode.h index 7ca86216..aa40e93b 100644 --- a/include/n64/PR/ucode.h +++ b/include/n64/PR/ucode.h @@ -18,8 +18,7 @@ * **************************************************************************/ -#ifndef _UCODE_H_ -#define _UCODE_H_ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -271,5 +270,3 @@ extern u64 rspF3DDataStart[], rspF3DDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* !_UCODE_H */ diff --git a/include/n64/PR/ucode_debug.h b/include/n64/PR/ucode_debug.h index 189a7f21..b01dcc7f 100644 --- a/include/n64/PR/ucode_debug.h +++ b/include/n64/PR/ucode_debug.h @@ -6,8 +6,7 @@ $Id: ucode_debug.h,v 1.1 1998/12/25 01:06:21 has Exp $ *---------------------------------------------------------------------*/ -#ifndef _UCODE_DEBUG_H_ -#define _UCODE_DEBUG_H_ +#pragma once #define DEBUG_DL_PTR() IO_READ(SP_DMEM_START+0xfc0) @@ -49,6 +48,5 @@ extern long long int gspS2DEX2d_xbusDataStart[], gspS2DEX2d_xbusDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif -#endif /* !_UCODE_DEBUG_H */ /*======== End of ucode_debug.h ========*/ diff --git a/include/n64/PR/ultraerror.h b/include/n64/PR/ultraerror.h index b05b24a6..29ba0ad4 100644 --- a/include/n64/PR/ultraerror.h +++ b/include/n64/PR/ultraerror.h @@ -26,8 +26,7 @@ * **************************************************************************/ -#ifndef __ULTRAERROR_H__ -#define __ULTRAERROR_H__ +#pragma once #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -175,5 +174,3 @@ OSErrorHandler osSetErrorHandler(OSErrorHandler); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif - -#endif /* __ULTRAERROR_H__ */ diff --git a/include/n64/PR/ultratypes.h b/include/n64/PR/ultratypes.h index 057d6ffd..f8bb0d49 100644 --- a/include/n64/PR/ultratypes.h +++ b/include/n64/PR/ultratypes.h @@ -1,5 +1,4 @@ -#ifndef _ULTRATYPES_H_ -#define _ULTRATYPES_H_ +#pragma once /************************************************************************** @@ -92,6 +91,3 @@ typedef volatile s64 vs64; #ifndef NULL #define NULL (void *)0 #endif - -#endif /* _ULTRATYPES_H_ */ - diff --git a/include/n64/PR/uportals.h b/include/n64/PR/uportals.h index 129c47ce..17ac1b5b 100644 --- a/include/n64/PR/uportals.h +++ b/include/n64/PR/uportals.h @@ -29,9 +29,7 @@ **************************************************************************/ - -#ifndef __ULTRAPORTALS_H__ -#define __ULTRAPORTALS_H__ +#pragma once #include #include "matrix.h" @@ -130,5 +128,3 @@ extern upLocateData upLocator; /* also extern by test_portals.h */ #ifdef __Cplusplus } #endif - -#endif diff --git a/include/n64/ultra64.h b/include/n64/ultra64.h index 053db38e..c828eee1 100644 --- a/include/n64/ultra64.h +++ b/include/n64/ultra64.h @@ -19,8 +19,7 @@ * **************************************************************************/ -#ifndef _ULTRA64_H_ -#define _ULTRA64_H_ +#pragma once #include #include @@ -36,5 +35,3 @@ #include #include #include - -#endif diff --git a/include/object_constants.h b/include/object_constants.h index a157dd6f..27875101 100644 --- a/include/object_constants.h +++ b/include/object_constants.h @@ -1,5 +1,4 @@ -#ifndef OBJECT_CONSTANTS_H -#define OBJECT_CONSTANTS_H +#pragma once // This file contains macros that provide descriptive names for // field-specific and object-specific constants, e.g. actions. @@ -1096,5 +1095,3 @@ /* oBehParams2ndByte */ #define MR_BLIZZARD_STYPE_NO_CAP 0 #define MR_BLIZZARD_STYPE_JUMPING 1 - -#endif // OBJECT_CONSTANTS_H diff --git a/include/object_fields.h b/include/object_fields.h index d1a7f90d..5b67c91e 100644 --- a/include/object_fields.h +++ b/include/object_fields.h @@ -1,5 +1,4 @@ -#ifndef OBJECT_FIELDS_H -#define OBJECT_FIELDS_H +#pragma once /** * The array [0x88, 0x1C8) in struct Object consists of fields that can vary by @@ -1341,6 +1340,3 @@ os16112*/ #define /*0x10E*/ os1610E OBJECT_FIELD_S16(0x21, 1) #define /*0x110*/ os16110 OBJECT_FIELD_S16(0x22, 0) #define /*0x112*/ os16112 OBJECT_FIELD_S16(0x22, 1) - - -#endif // OBJECT_FIELDS_H diff --git a/include/platform_info.h b/include/platform_info.h index 310aa4d1..a3298879 100644 --- a/include/platform_info.h +++ b/include/platform_info.h @@ -1,5 +1,4 @@ -#ifndef PLATFORM_INFO_H -#define PLATFORM_INFO_H +#pragma once #ifdef TARGET_N64 #define IS_64_BIT 0 @@ -11,5 +10,3 @@ #endif #define DOUBLE_SIZE_ON_64_BIT(size) ((size) * (sizeof(void *) / 4)) - -#endif // PLATFORM_INFO_H diff --git a/include/prevent_bss_reordering.h b/include/prevent_bss_reordering.h index 51a85ade..29681003 100644 --- a/include/prevent_bss_reordering.h +++ b/include/prevent_bss_reordering.h @@ -1,5 +1,4 @@ -#ifndef PREVENT_BSS_REORDERING_H -#define PREVENT_BSS_REORDERING_H +#pragma once /** * To determine variable order for .bss, the compiler sorts variables by their @@ -79,5 +78,3 @@ struct Dummy60 { int x; }; struct Dummy61 { int x; }; struct Dummy62 { int x; }; typedef int Dummy63; - -#endif // PREVENT_BSS_REORDERING_H diff --git a/include/rnc.h b/include/rnc.h index eb02f4e0..5103f459 100755 --- a/include/rnc.h +++ b/include/rnc.h @@ -1,5 +1,4 @@ -#ifndef _IE_PACK_H -#define _IE_PACK_H +#pragma once typedef struct s_Propack { @@ -20,5 +19,3 @@ typedef struct s_Propack extern void Propack_UnpackM1(void *FilePtr, void *OutputBuffer); extern void Propack_UnpackM2(void *FilePtr, void *OutputBuffer); - -#endif // _IE_PACK_H diff --git a/include/segment_symbols.h b/include/segment_symbols.h index eba62dc8..b7e10d2e 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -1,5 +1,4 @@ -#ifndef SEGMENT_SYMBOLS_H -#define SEGMENT_SYMBOLS_H +#pragma once #ifndef NO_SEGMENTED_MEMORY #define DECLARE_SEGMENT(name) \ @@ -143,5 +142,3 @@ DECLARE_SEGMENT(translation_fr_mio0) #endif #endif - -#endif // SEGMENT_SYMBOLS_H diff --git a/include/segments.h b/include/segments.h index 963cd3e3..18eb03a1 100644 --- a/include/segments.h +++ b/include/segments.h @@ -1,5 +1,4 @@ -#ifndef SEGMENTS_H -#define SEGMENTS_H +#pragma once #ifndef LINKER #include "segment_symbols.h" @@ -28,5 +27,3 @@ #define SEG_POOL_START _framebuffersSegmentBssEnd // 0x0165000 in size #define POOL_SIZE RAM_END - SEG_POOL_START - -#endif // SEGMENTS_H diff --git a/include/seq_ids.h b/include/seq_ids.h index 8166de64..666edd6f 100644 --- a/include/seq_ids.h +++ b/include/seq_ids.h @@ -1,5 +1,4 @@ -#ifndef SEQ_IDS_H -#define SEQ_IDS_H +#pragma once // Sometimes a sequence id is represented as one of the below ids (the base id), // optionally OR'd with SEQ_VARIATION. @@ -46,5 +45,3 @@ enum SeqId { SEQ_EVENT_CUTSCENE_LAKITU, // 0x22 (not in JP) SEQ_COUNT }; - -#endif // SEQ_IDS_H diff --git a/include/sm64.h b/include/sm64.h index 9d7bcdc2..e991781f 100644 --- a/include/sm64.h +++ b/include/sm64.h @@ -1,5 +1,4 @@ -#ifndef SM64_H -#define SM64_H +#pragma once // Global header for Super Mario 64 @@ -465,5 +464,3 @@ U_CBUTTONS | D_CBUTTONS | L_CBUTTONS | R_CBUTTONS ) #define C_BUTTONS (U_CBUTTONS | D_CBUTTONS | L_CBUTTONS | R_CBUTTONS ) - -#endif // SM64_H diff --git a/include/sounds.h b/include/sounds.h index f40759ca..67706bea 100644 --- a/include/sounds.h +++ b/include/sounds.h @@ -1,5 +1,4 @@ -#ifndef SOUNDS_H -#define SOUNDS_H +#pragma once // Sound Magic Definition: // First Byte (Upper Nibble): Sound Bank (not the same as audio bank!) @@ -592,5 +591,3 @@ #define SOUND_OBJ2_MONTY_MOLE_APPEAR /* 0x90678080 */ SOUND_ARG_LOAD(SOUND_BANK_OBJ2, 0x67, 0x80, SOUND_DISCRETE) #define SOUND_OBJ2_BOSS_DIALOG_GRUNT /* 0x90694080 */ SOUND_ARG_LOAD(SOUND_BANK_OBJ2, 0x69, 0x40, SOUND_DISCRETE) #define SOUND_OBJ2_MRI_SPINNING /* 0x906B0080 */ SOUND_ARG_LOAD(SOUND_BANK_OBJ2, 0x6B, 0x00, SOUND_DISCRETE) - -#endif // SOUNDS_H diff --git a/include/special_preset_names.h b/include/special_preset_names.h index 229d2878..d9457713 100644 --- a/include/special_preset_names.h +++ b/include/special_preset_names.h @@ -1,5 +1,4 @@ -#ifndef SPECIAL_PRESET_NAMES_H -#define SPECIAL_PRESET_NAMES_H +#pragma once enum SpecialPresets { special_null_start, @@ -89,5 +88,3 @@ enum SpecialPresets { special_null_end = 0xFF }; - -#endif // SPECIAL_PRESET_NAMES_H diff --git a/include/special_presets.h b/include/special_presets.h index a9be6ec2..52720e61 100644 --- a/include/special_presets.h +++ b/include/special_presets.h @@ -1,5 +1,4 @@ -#ifndef SPECIAL_PRESETS_H -#define SPECIAL_PRESETS_H +#pragma once #include "special_preset_names.h" #include "behavior_data.h" @@ -109,5 +108,3 @@ static struct SpecialPreset SpecialObjectPresets[] = {0x87, SPTYPE_PARAMS_AND_YROT , 0x00, MODEL_UNKNOWN_DOOR_2B, bhvDoorWarp}, {0xFF, SPTYPE_NO_YROT_OR_PARAMS , 0x00, MODEL_NONE, NULL} }; - -#endif // SPECIAL_PRESETS_H diff --git a/include/surface_terrains.h b/include/surface_terrains.h index 6a13429b..03afb334 100644 --- a/include/surface_terrains.h +++ b/include/surface_terrains.h @@ -1,5 +1,4 @@ -#ifndef SURFACE_TERRAINS_H -#define SURFACE_TERRAINS_H +#pragma once #include "config.h" @@ -226,5 +225,3 @@ // Water Box #define COL_WATER_BOX(id, x1, z1, x2, z2, y) id, x1, z1, x2, z2, y - -#endif // SURFACE_TERRAINS_H diff --git a/include/text_menu_strings.h.in b/include/text_menu_strings.h.in index 3ac477eb..01acc300 100644 --- a/include/text_menu_strings.h.in +++ b/include/text_menu_strings.h.in @@ -1,5 +1,4 @@ -#ifndef TEXT_MENU_STRINGS_H -#define TEXT_MENU_STRINGS_H +#pragma once // These strings use a different table defined in menu_hud_lut // Unlike text_strings.h.in, the charmap is different and @@ -14,5 +13,3 @@ #define TEXT_JPHUD_COPY_FILE _("＜ゃ潟若") #define TEXT_JPHUD_ERASE_FILE _("＜ゃ") #define TEXT_JPHUD_SOUND_SELECT _("泣潟祉") - -#endif // TEXT_MENU_STRINGS_H diff --git a/include/text_strings.h.in b/include/text_strings.h.in index c5ee3fa8..88442809 100644 --- a/include/text_strings.h.in +++ b/include/text_strings.h.in @@ -1,5 +1,4 @@ -#ifndef TEXT_STRINGS_H -#define TEXT_STRINGS_H +#pragma once #include "text_menu_strings.h" @@ -539,5 +538,3 @@ #define TEXT_MENU_NONE_DE _("") #define TEXT_MENU_STARS_DE _(" GEHEIME STERNE") #endif // VERSION_EU - -#endif // TEXT_STRINGS_H diff --git a/include/textures.h b/include/textures.h index 4df137cb..7b766d83 100644 --- a/include/textures.h +++ b/include/textures.h @@ -1,5 +1,4 @@ -#ifndef TEXTURES_H -#define TEXTURES_H +#pragma once #include #include @@ -277,5 +276,3 @@ extern const Gfx title_screen_bg_dl_0A000178[]; extern const Gfx title_screen_bg_dl_end[]; extern const u8 *const mario_title_texture_table[]; extern const u8 *const game_over_texture_table[]; - -#endif // TEXTURES_H diff --git a/include/types.h b/include/types.h index dcce4d0b..94de29dc 100644 --- a/include/types.h +++ b/include/types.h @@ -1,5 +1,4 @@ -#ifndef TYPES_H -#define TYPES_H +#pragma once // This file contains various data types used in Super Mario 64 that don't yet // have an appropriate header. @@ -378,5 +377,3 @@ struct MarioState /*0xC0*/ f32 quicksandDepth; /*0xC4*/ f32 windGravity; }; - -#endif // TYPES_H diff --git a/levels/bbh/header.h b/levels/bbh/header.h index 74f49d83..271f2026 100644 --- a/levels/bbh/header.h +++ b/levels/bbh/header.h @@ -1,5 +1,4 @@ -#ifndef BBH_HEADER_H -#define BBH_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -110,5 +109,3 @@ extern const struct MovtexQuadCollection bbh_movtex_merry_go_round_water_side[]; // script extern const LevelScript level_bbh_entry[]; - -#endif diff --git a/levels/bitdw/header.h b/levels/bitdw/header.h index 15dbd35d..02c021f8 100644 --- a/levels/bitdw/header.h +++ b/levels/bitdw/header.h @@ -1,5 +1,4 @@ -#ifndef BITDW_HEADER_H -#define BITDW_HEADER_H +#pragma once #include "types.h" @@ -73,5 +72,3 @@ extern const Collision bitdw_seg7_collision_0700FD9C[]; // script extern const LevelScript level_bitdw_entry[]; - -#endif diff --git a/levels/bitfs/header.h b/levels/bitfs/header.h index 1958b163..cb984ed0 100644 --- a/levels/bitfs/header.h +++ b/levels/bitfs/header.h @@ -1,5 +1,4 @@ -#ifndef BITFS_HEADER_H -#define BITFS_HEADER_H +#pragma once #include "types.h" @@ -93,5 +92,3 @@ extern const Gfx bitfs_dl_lava_floor[]; // script extern const LevelScript level_bitfs_entry[]; - -#endif diff --git a/levels/bits/header.h b/levels/bits/header.h index de32cf7c..e6030ae1 100644 --- a/levels/bits/header.h +++ b/levels/bits/header.h @@ -1,5 +1,4 @@ -#ifndef BITS_HEADER_H -#define BITS_HEADER_H +#pragma once #include "types.h" @@ -88,5 +87,3 @@ extern const Collision bits_seg7_collision_0701B734[]; // script extern const LevelScript level_bits_entry[]; - -#endif diff --git a/levels/bob/header.h b/levels/bob/header.h index 207e07e5..8ce256a9 100644 --- a/levels/bob/header.h +++ b/levels/bob/header.h @@ -1,5 +1,4 @@ -#ifndef BOB_HEADER_H -#define BOB_HEADER_H +#pragma once #include "types.h" @@ -30,5 +29,3 @@ extern const Trajectory bob_seg7_trajectory_koopa[]; // script extern const LevelScript level_bob_entry[]; - -#endif diff --git a/levels/bowser_1/header.h b/levels/bowser_1/header.h index 97119eeb..40a7dc93 100644 --- a/levels/bowser_1/header.h +++ b/levels/bowser_1/header.h @@ -1,5 +1,4 @@ -#ifndef BOWSER_1_HEADER_H -#define BOWSER_1_HEADER_H +#pragma once #include "types.h" @@ -12,5 +11,3 @@ extern const Collision bowser_1_seg7_collision_level[]; // script extern const LevelScript level_bowser_1_entry[]; - -#endif diff --git a/levels/bowser_2/header.h b/levels/bowser_2/header.h index 3d77b0b1..76435d4f 100644 --- a/levels/bowser_2/header.h +++ b/levels/bowser_2/header.h @@ -1,5 +1,4 @@ -#ifndef BOWSER_2_HEADER_H -#define BOWSER_2_HEADER_H +#pragma once #include "types.h" @@ -16,5 +15,3 @@ extern const Collision bowser_2_seg7_collision_tilting_platform[]; // script extern const LevelScript level_bowser_2_entry[]; - -#endif diff --git a/levels/bowser_3/header.h b/levels/bowser_3/header.h index 622aa5c2..74410e44 100644 --- a/levels/bowser_3/header.h +++ b/levels/bowser_3/header.h @@ -1,5 +1,4 @@ -#ifndef BOWSER_3_HEADER_H -#define BOWSER_3_HEADER_H +#pragma once #include "types.h" @@ -44,5 +43,3 @@ extern const Collision bowser_3_seg7_collision_07005038[]; // script extern const LevelScript level_bowser_3_entry[]; - -#endif diff --git a/levels/castle_courtyard/header.h b/levels/castle_courtyard/header.h index d5a7e18c..ae66e54e 100644 --- a/levels/castle_courtyard/header.h +++ b/levels/castle_courtyard/header.h @@ -1,5 +1,4 @@ -#ifndef CASTLE_COURTYARD_HEADER_H -#define CASTLE_COURTYARD_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -19,5 +18,3 @@ extern const struct MovtexQuadCollection castle_courtyard_movtex_star_statue_wat // script extern const LevelScript level_castle_courtyard_entry[]; - -#endif diff --git a/levels/castle_grounds/header.h b/levels/castle_grounds/header.h index 5e32ed94..68787bd5 100644 --- a/levels/castle_grounds/header.h +++ b/levels/castle_grounds/header.h @@ -1,5 +1,4 @@ -#ifndef CASTLE_GROUNDS_HEADER_H -#define CASTLE_GROUNDS_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -40,5 +39,3 @@ extern const Gfx castle_grounds_dl_waterfall[]; // script extern const LevelScript level_castle_grounds_entry[]; - -#endif diff --git a/levels/castle_inside/header.h b/levels/castle_inside/header.h index dfd63923..fb4d109c 100644 --- a/levels/castle_inside/header.h +++ b/levels/castle_inside/header.h @@ -1,5 +1,4 @@ -#ifndef CASTLE_INSIDE_HEADER_H -#define CASTLE_INSIDE_HEADER_H +#pragma once #include "types.h" #include "game/paintings.h" @@ -153,5 +152,3 @@ extern const struct MovtexQuadCollection inside_castle_movtex_moat_water[]; // script extern const LevelScript level_castle_inside_entry[]; - -#endif diff --git a/levels/ccm/header.h b/levels/ccm/header.h index 7c35d003..42747626 100644 --- a/levels/ccm/header.h +++ b/levels/ccm/header.h @@ -1,5 +1,4 @@ -#ifndef CCM_HEADER_H -#define CCM_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -56,5 +55,3 @@ extern const Trajectory ccm_seg7_trajectory_penguin_race[]; // script extern const LevelScript level_ccm_entry[]; - -#endif diff --git a/levels/cotmc/header.h b/levels/cotmc/header.h index d788998d..0d711a3d 100644 --- a/levels/cotmc/header.h +++ b/levels/cotmc/header.h @@ -1,5 +1,4 @@ -#ifndef COTMC_HEADER_H -#define COTMC_HEADER_H +#pragma once #include "types.h" @@ -19,5 +18,3 @@ extern const Gfx cotmc_dl_water[]; // script extern const LevelScript level_cotmc_entry[]; - -#endif diff --git a/levels/ddd/header.h b/levels/ddd/header.h index 0d946f1a..1eafff10 100644 --- a/levels/ddd/header.h +++ b/levels/ddd/header.h @@ -1,5 +1,4 @@ -#ifndef DDD_HEADER_H -#define DDD_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -39,5 +38,3 @@ extern const struct MovtexQuadCollection ddd_movtex_area2_water[]; // script extern const LevelScript level_ddd_entry[]; - -#endif diff --git a/levels/ending/header.h b/levels/ending/header.h index 30bee900..236a97d3 100644 --- a/levels/ending/header.h +++ b/levels/ending/header.h @@ -1,5 +1,4 @@ -#ifndef ENDING_HEADER_H -#define ENDING_HEADER_H +#pragma once #include "types.h" @@ -19,5 +18,3 @@ extern const Gfx dl_cake_end_screen[]; // script extern const LevelScript level_ending_entry[]; - -#endif diff --git a/levels/entry.h b/levels/entry.h index 2bfc2021..5910674c 100644 --- a/levels/entry.h +++ b/levels/entry.h @@ -1,9 +1,6 @@ -#ifndef ENTRY_H -#define ENTRY_H +#pragma once #include "types.h" // script extern const LevelScript level_script_entry[]; - -#endif diff --git a/levels/hmc/header.h b/levels/hmc/header.h index 6cf715a6..3a98c93b 100644 --- a/levels/hmc/header.h +++ b/levels/hmc/header.h @@ -1,5 +1,4 @@ -#ifndef HMC_HEADER_H -#define HMC_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -89,5 +88,3 @@ extern const struct MovtexQuadCollection hmc_movtex_toxic_maze_mist[]; // script extern const LevelScript level_hmc_entry[]; - -#endif diff --git a/levels/intro/header.h b/levels/intro/header.h index 5197daf0..226606fe 100644 --- a/levels/intro/header.h +++ b/levels/intro/header.h @@ -1,5 +1,4 @@ -#ifndef INTRO_HEADER_H -#define INTRO_HEADER_H +#pragma once #include "types.h" @@ -25,5 +24,3 @@ extern const LevelScript script_intro_level_select[]; extern const LevelScript script_intro_main_level_entry_stop_music[]; extern const LevelScript script_intro_main_level_entry[]; extern const LevelScript script_intro_splash_screen[]; - -#endif diff --git a/levels/jrb/header.h b/levels/jrb/header.h index c6887382..3426d3b6 100644 --- a/levels/jrb/header.h +++ b/levels/jrb/header.h @@ -1,5 +1,4 @@ -#ifndef JRB_HEADER_H -#define JRB_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -62,5 +61,3 @@ extern const struct MovtexQuadCollection jrb_movtex_sinked_boat_water[]; // script extern const LevelScript level_jrb_entry[]; - -#endif diff --git a/levels/lll/header.h b/levels/lll/header.h index b558a9c6..e85526e4 100644 --- a/levels/lll/header.h +++ b/levels/lll/header.h @@ -1,5 +1,4 @@ -#ifndef LLL_HEADER_H -#define LLL_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -127,5 +126,3 @@ extern const Gfx lll_dl_lavafall_volcano[]; // script extern const LevelScript level_lll_entry[]; - -#endif diff --git a/levels/menu/header.h b/levels/menu/header.h index 59bfb341..2c3927e3 100644 --- a/levels/menu/header.h +++ b/levels/menu/header.h @@ -1,5 +1,4 @@ -#ifndef MENU_HEADER_H -#define MENU_HEADER_H +#pragma once #include "types.h" @@ -48,5 +47,3 @@ extern const u8 eu_course_strings_de_table[]; // script extern const LevelScript level_main_menu_entry_file_select[]; extern const LevelScript level_main_menu_entry_act_select[]; - -#endif diff --git a/levels/pss/header.h b/levels/pss/header.h index 830cae6a..63da2160 100644 --- a/levels/pss/header.h +++ b/levels/pss/header.h @@ -1,5 +1,4 @@ -#ifndef PSS_HEADER_H -#define PSS_HEADER_H +#pragma once #include "types.h" @@ -19,5 +18,3 @@ extern const MacroObject pss_seg7_macro_objs[]; // script extern const LevelScript level_pss_entry[]; - -#endif diff --git a/levels/rr/header.h b/levels/rr/header.h index 162d3847..f75a3396 100644 --- a/levels/rr/header.h +++ b/levels/rr/header.h @@ -1,5 +1,4 @@ -#ifndef RR_HEADER_H -#define RR_HEADER_H +#pragma once #include "types.h" @@ -109,5 +108,3 @@ extern const Trajectory rr_seg7_trajectory_0702EEE0[]; // script extern const LevelScript level_rr_entry[]; - -#endif diff --git a/levels/sa/header.h b/levels/sa/header.h index e8c5cf47..5563139a 100644 --- a/levels/sa/header.h +++ b/levels/sa/header.h @@ -1,5 +1,4 @@ -#ifndef SA_HEADER_H -#define SA_HEADER_H +#pragma once #include "types.h" @@ -14,5 +13,3 @@ extern const MacroObject sa_seg7_macro_objs[]; // script extern const LevelScript level_sa_entry[]; - -#endif diff --git a/levels/scripts.h b/levels/scripts.h index dc019682..98192a7d 100644 --- a/levels/scripts.h +++ b/levels/scripts.h @@ -1,5 +1,4 @@ -#ifndef SCRIPTS_H -#define SCRIPTS_H +#pragma once #include "types.h" #include "game/puppycam2.h" @@ -24,5 +23,3 @@ extern const LevelScript script_func_global_15[]; extern const LevelScript script_func_global_16[]; extern const LevelScript script_func_global_17[]; extern const LevelScript script_func_global_18[]; - -#endif diff --git a/levels/sl/header.h b/levels/sl/header.h index 457fb093..7f06f528 100644 --- a/levels/sl/header.h +++ b/levels/sl/header.h @@ -1,5 +1,4 @@ -#ifndef SL_HEADER_H -#define SL_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -36,5 +35,3 @@ extern const struct MovtexQuadCollection sl_movtex_water[]; // script extern const LevelScript level_sl_entry[]; - -#endif diff --git a/levels/ssl/header.h b/levels/ssl/header.h index a38845cd..4e626b1e 100644 --- a/levels/ssl/header.h +++ b/levels/ssl/header.h @@ -1,5 +1,4 @@ -#ifndef SSL_HEADER_H -#define SSL_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -84,5 +83,3 @@ extern const Gfx ssl_dl_pyramid_sand_pathway_side_end[]; // script extern const LevelScript level_ssl_entry[]; - -#endif diff --git a/levels/thi/header.h b/levels/thi/header.h index a3b7ea1a..00f5f5ce 100644 --- a/levels/thi/header.h +++ b/levels/thi/header.h @@ -1,5 +1,4 @@ -#ifndef THI_HEADER_H -#define THI_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -38,5 +37,3 @@ extern const struct MovtexQuadCollection thi_movtex_area2_water[]; // script extern const LevelScript level_thi_entry[]; - -#endif diff --git a/levels/totwc/header.h b/levels/totwc/header.h index 8579fa4b..dc43858e 100644 --- a/levels/totwc/header.h +++ b/levels/totwc/header.h @@ -1,5 +1,4 @@ -#ifndef TOTWC_HEADER_H -#define TOTWC_HEADER_H +#pragma once #include "types.h" @@ -17,5 +16,3 @@ extern const MacroObject totwc_seg7_macro_objs[]; // script extern const LevelScript level_totwc_entry[]; - -#endif diff --git a/levels/ttc/header.h b/levels/ttc/header.h index 30edd607..f77c958d 100644 --- a/levels/ttc/header.h +++ b/levels/ttc/header.h @@ -1,5 +1,4 @@ -#ifndef TTC_HEADER_H -#define TTC_HEADER_H +#pragma once #include "types.h" @@ -64,5 +63,3 @@ extern const Gfx ttc_dl_surface_treadmill[]; // script extern const LevelScript level_ttc_entry[]; - -#endif diff --git a/levels/ttm/header.h b/levels/ttm/header.h index 3c060526..d6382f7b 100644 --- a/levels/ttm/header.h +++ b/levels/ttm/header.h @@ -1,5 +1,4 @@ -#ifndef TTM_HEADER_H -#define TTM_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -110,5 +109,3 @@ extern const MacroObject ttm_seg7_area_4_macro_objs[]; // script extern const LevelScript level_ttm_entry[]; - -#endif diff --git a/levels/vcutm/header.h b/levels/vcutm/header.h index eb88d731..7febcec2 100644 --- a/levels/vcutm/header.h +++ b/levels/vcutm/header.h @@ -1,5 +1,4 @@ -#ifndef VCUTM_HEADER_H -#define VCUTM_HEADER_H +#pragma once #include "types.h" @@ -19,5 +18,3 @@ extern const Collision vcutm_seg7_collision_0700AC44[]; // script extern const LevelScript level_vcutm_entry[]; - -#endif diff --git a/levels/wdw/header.h b/levels/wdw/header.h index 63cddc3b..35acb27d 100644 --- a/levels/wdw/header.h +++ b/levels/wdw/header.h @@ -1,5 +1,4 @@ -#ifndef WDW_HEADER_H -#define WDW_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -45,5 +44,3 @@ extern const struct MovtexQuadCollection wdw_movtex_area2_water[]; // script extern const LevelScript level_wdw_entry[]; - -#endif diff --git a/levels/wf/header.h b/levels/wf/header.h index 44f3cf14..416593d8 100644 --- a/levels/wf/header.h +++ b/levels/wf/header.h @@ -1,5 +1,4 @@ -#ifndef WF_HEADER_H -#define WF_HEADER_H +#pragma once #include "types.h" #include "game/moving_texture.h" @@ -98,5 +97,3 @@ extern const struct MovtexQuadCollection wf_movtex_water[]; // script extern const LevelScript level_wf_entry[]; - -#endif diff --git a/levels/wmotr/header.h b/levels/wmotr/header.h index d411d8c8..ee58aeea 100644 --- a/levels/wmotr/header.h +++ b/levels/wmotr/header.h @@ -1,5 +1,4 @@ -#ifndef WMOTR_HEADER_H -#define WMOTR_HEADER_H +#pragma once #include "types.h" @@ -15,5 +14,3 @@ extern const MacroObject wmotr_seg7_macro_objs[]; // script extern const LevelScript level_wmotr_entry[]; - -#endif diff --git a/src/audio/data.h b/src/audio/data.h index 2e0c37aa..503201f7 100644 --- a/src/audio/data.h +++ b/src/audio/data.h @@ -1,5 +1,4 @@ -#ifndef AUDIO_DATA_H -#define AUDIO_DATA_H +#pragma once #include @@ -161,5 +160,3 @@ extern u16 D_SH_80315EF4; extern u16 D_SH_80315EF8; extern u16 D_SH_80315EFC; #endif - -#endif // AUDIO_DATA_H diff --git a/src/audio/effects.h b/src/audio/effects.h index a6de1ab9..20c5a13e 100644 --- a/src/audio/effects.h +++ b/src/audio/effects.h @@ -1,5 +1,4 @@ -#ifndef AUDIO_EFFECTS_H -#define AUDIO_EFFECTS_H +#pragma once #include @@ -42,5 +41,3 @@ f32 adsr_update(struct AdsrState *adsr); #else s32 adsr_update(struct AdsrState *adsr); #endif - -#endif // AUDIO_EFFECTS_H diff --git a/src/audio/external.h b/src/audio/external.h index d26723ce..46b9e6df 100644 --- a/src/audio/external.h +++ b/src/audio/external.h @@ -1,5 +1,4 @@ -#ifndef AUDIO_EXTERNAL_H -#define AUDIO_EXTERNAL_H +#pragma once #include @@ -65,5 +64,3 @@ void sound_reset(u8 presetId); void audio_set_sound_mode(u8 arg0); void audio_init(void); // in load.c - -#endif // AUDIO_EXTERNAL_H diff --git a/src/audio/heap.h b/src/audio/heap.h index e8c839b7..1120005a 100644 --- a/src/audio/heap.h +++ b/src/audio/heap.h @@ -1,5 +1,4 @@ -#ifndef AUDIO_HEAP_H -#define AUDIO_HEAP_H +#pragma once #include @@ -140,5 +139,3 @@ u8 *func_sh_802f1d90(u32 size, s32 bank, u8 *arg2, s8 medium); void *unk_pool1_lookup(s32 poolIdx, s32 id); void *unk_pool1_alloc(s32 poolIndex, s32 arg1, u32 size); #endif - -#endif // AUDIO_HEAP_H diff --git a/src/audio/internal.h b/src/audio/internal.h index fb38a43e..56c5dd54 100644 --- a/src/audio/internal.h +++ b/src/audio/internal.h @@ -1,5 +1,4 @@ -#ifndef AUDIO_INTERNAL_H -#define AUDIO_INTERNAL_H +#pragma once #include @@ -897,5 +896,3 @@ struct UnkStruct80343D00 { extern s32 D_SH_80343CF0; extern struct UnkStruct80343D00 D_SH_80343D00; #endif - -#endif // AUDIO_INTERNAL_H diff --git a/src/audio/load.h b/src/audio/load.h index 506e4202..23fe51c7 100644 --- a/src/audio/load.h +++ b/src/audio/load.h @@ -1,5 +1,4 @@ -#ifndef AUDIO_LOAD_H -#define AUDIO_LOAD_H +#pragma once #include @@ -111,5 +110,3 @@ void func_sh_802f30f4(s32 arg0, s32 arg1, s32 arg2, OSMesgQueue *arg3); void func_sh_802f3288(s32 idx); #endif - -#endif // AUDIO_LOAD_H diff --git a/src/audio/playback.h b/src/audio/playback.h index e2e15bf9..b60fbbb9 100644 --- a/src/audio/playback.h +++ b/src/audio/playback.h @@ -1,5 +1,4 @@ -#ifndef AUDIO_PLAYBACK_H -#define AUDIO_PLAYBACK_H +#pragma once #include @@ -45,6 +44,3 @@ void note_set_frequency(struct Note *note, f32 frequency); void note_enable(struct Note *note); void note_disable(struct Note *note); #endif - - -#endif // AUDIO_PLAYBACK_H diff --git a/src/audio/seqplayer.h b/src/audio/seqplayer.h index d2fc1344..191ba26c 100644 --- a/src/audio/seqplayer.h +++ b/src/audio/seqplayer.h @@ -1,5 +1,4 @@ -#ifndef AUDIO_SEQPLAYER_H -#define AUDIO_SEQPLAYER_H +#pragma once #include @@ -14,5 +13,3 @@ void *audio_list_pop_back(struct AudioListItem *list); void process_sequences(s32 iterationsRemaining); void init_sequence_player(u32 player); void init_sequence_players(void); - -#endif // AUDIO_SEQPLAYER_H diff --git a/src/audio/synthesis.h b/src/audio/synthesis.h index 7ee69ad7..91b861b9 100644 --- a/src/audio/synthesis.h +++ b/src/audio/synthesis.h @@ -1,5 +1,4 @@ -#ifndef AUDIO_SYNTHESIS_H -#define AUDIO_SYNTHESIS_H +#pragma once #include "internal.h" @@ -127,5 +126,3 @@ void note_set_frequency(struct Note *note, f32 frequency); void note_enable(struct Note *note); void note_disable(struct Note *note); #endif - -#endif // AUDIO_SYNTHESIS_H diff --git a/src/boot/slidec.h b/src/boot/slidec.h index 74d7c1fd..29dfc4fd 100644 --- a/src/boot/slidec.h +++ b/src/boot/slidec.h @@ -1,8 +1,5 @@ -#ifndef SLIDEC_H -#define SLIDEC_H +#pragma once void slidstart(unsigned char*, unsigned char *); void decompress(void *mio0, void *dest); - -#endif // SLIDEC_H diff --git a/src/buffers/buffers.h b/src/buffers/buffers.h index f063a023..da2f7ef4 100644 --- a/src/buffers/buffers.h +++ b/src/buffers/buffers.h @@ -1,5 +1,4 @@ -#ifndef BUFFERS_H -#define BUFFERS_H +#pragma once #include #include @@ -34,5 +33,3 @@ extern u64 hvq_yieldbuf[]; /* RSP task yield buffer */ extern HVQM2Info hvq_spfifo[]; /* Data area for HVQM2 microcode */ extern u16 hvqwork[]; /* Work buffer for HVQM2 decoder */ extern u8 hvqbuf[]; /* Buffer for video records (HVQM2) */ - -#endif // BUFFERS_H diff --git a/src/buffers/framebuffers.h b/src/buffers/framebuffers.h index 39e86801..7bfa11dc 100644 --- a/src/buffers/framebuffers.h +++ b/src/buffers/framebuffers.h @@ -1,5 +1,4 @@ -#ifndef FRAMEBUFFERS_H -#define FRAMEBUFFERS_H +#pragma once #include @@ -12,5 +11,3 @@ extern u16 gFrameBuffers[3][SCREEN_WIDTH * SCREEN_HEIGHT]; #define gFrameBuffer0 gFrameBuffers[0] #define gFrameBuffer1 gFrameBuffers[1] #define gFrameBuffer2 gFrameBuffers[2] - -#endif // FRAMEBUFFERS_H diff --git a/src/buffers/gfx_output_buffer.h b/src/buffers/gfx_output_buffer.h index 8f6ded2f..9ba2e87a 100644 --- a/src/buffers/gfx_output_buffer.h +++ b/src/buffers/gfx_output_buffer.h @@ -1,8 +1,5 @@ -#ifndef GFX_OUTPUT_BUFFER_H -#define GFX_OUTPUT_BUFFER_H +#pragma once #include extern u64 gGfxSPTaskOutputBuffer[0x2fc0]; - -#endif // GFX_OUTPUT_BUFFER_H diff --git a/src/buffers/zbuffer.h b/src/buffers/zbuffer.h index bb02f597..17440610 100644 --- a/src/buffers/zbuffer.h +++ b/src/buffers/zbuffer.h @@ -1,5 +1,4 @@ -#ifndef ZBUFFER_H -#define ZBUFFER_H +#pragma once #include @@ -7,5 +6,3 @@ #include "macros.h" extern u16 gZBuffer[SCREEN_WIDTH * SCREEN_HEIGHT]; - -#endif // ZBUFFER_H diff --git a/src/engine/behavior_script.h b/src/engine/behavior_script.h index 2d1ff214..77f007b2 100644 --- a/src/engine/behavior_script.h +++ b/src/engine/behavior_script.h @@ -1,5 +1,4 @@ -#ifndef BEHAVIOR_SCRIPT_H -#define BEHAVIOR_SCRIPT_H +#pragma once #include @@ -24,5 +23,3 @@ float random_float(void); s32 random_sign(void); void cur_obj_update(void); - -#endif // BEHAVIOR_SCRIPT_H diff --git a/src/engine/extended_bounds.h b/src/engine/extended_bounds.h index 591a183e..0323f13e 100644 --- a/src/engine/extended_bounds.h +++ b/src/engine/extended_bounds.h @@ -1,5 +1,4 @@ -#ifndef __EXTENDED_BOUNDS_H__ -#define __EXTENDED_BOUNDS_H__ +#pragma once /* Better Extended Bounds by anonymous_moose @@ -75,6 +74,3 @@ STATIC_ASSERT(LEVEL_BOUNDARY_MAX != 0, "You must set a valid extended bounds mod #define NOT_ENOUGH_ROOM_FOR_SURFACES (1 << 0) #define NOT_ENOUGH_ROOM_FOR_NODES (1 << 1) - - -#endif // __EXTENDED_BOUNDS_H__ diff --git a/src/engine/geo_layout.h b/src/engine/geo_layout.h index 103311db..ba23837d 100644 --- a/src/engine/geo_layout.h +++ b/src/engine/geo_layout.h @@ -1,5 +1,4 @@ -#ifndef GEO_LAYOUT_H -#define GEO_LAYOUT_H +#pragma once #include @@ -77,5 +76,3 @@ void geo_layout_cmd_node_culling_radius(void); void geo_layout_cmd_bone(void); struct GraphNode *process_geo_layout(struct AllocOnlyPool *pool, void *segptr); - -#endif // GEO_LAYOUT_H diff --git a/src/engine/graph_node.h b/src/engine/graph_node.h index 72a54511..cbeee9e1 100644 --- a/src/engine/graph_node.h +++ b/src/engine/graph_node.h @@ -1,5 +1,4 @@ -#ifndef GRAPH_NODE_H -#define GRAPH_NODE_H +#pragma once #include #include @@ -455,5 +454,3 @@ s16 *read_vec3s_to_vec3f(Vec3f, s16 *src); s16 *read_vec3s(Vec3s dst, s16 *src); s16 *read_vec3s_angle(Vec3s dst, s16 *src); void register_scene_graph_node(struct GraphNode *graphNode); - -#endif // GRAPH_NODE_H diff --git a/src/engine/level_script.h b/src/engine/level_script.h index d41a91c8..45befb03 100644 --- a/src/engine/level_script.h +++ b/src/engine/level_script.h @@ -1,5 +1,4 @@ -#ifndef LEVEL_SCRIPT_H -#define LEVEL_SCRIPT_H +#pragma once #include @@ -8,5 +7,3 @@ struct LevelCommand; extern u8 level_script_entry[]; struct LevelCommand *level_script_execute(struct LevelCommand *cmd); - -#endif // LEVEL_SCRIPT_H diff --git a/src/engine/math_util.h b/src/engine/math_util.h index 416fab54..faf6a6d9 100644 --- a/src/engine/math_util.h +++ b/src/engine/math_util.h @@ -1,5 +1,4 @@ -#ifndef MATH_UTIL_H -#define MATH_UTIL_H +#pragma once #include @@ -383,5 +382,3 @@ void spline_get_weights(Vec4f result, f32 t, UNUSED s32 c); void anim_spline_init(Vec4s *keyFrames); s32 anim_spline_poll(Vec3f result); extern void find_surface_on_ray(Vec3f orig, Vec3f dir, struct Surface **hit_surface, Vec3f hit_pos, s32 flags); - -#endif // MATH_UTIL_H diff --git a/src/engine/surface_collision.h b/src/engine/surface_collision.h index c5f062cf..6cfe6ce5 100644 --- a/src/engine/surface_collision.h +++ b/src/engine/surface_collision.h @@ -1,5 +1,4 @@ -#ifndef SURFACE_COLLISION_H -#define SURFACE_COLLISION_H +#pragma once #include @@ -39,5 +38,3 @@ s32 find_water_level_and_floor(s32 x, s32 z, struct Surface **pfloor); s32 find_water_level(s32 x, s32 z); s32 find_poison_gas_level(s32 x, s32 z); void debug_surface_list_info(f32 xPos, f32 zPos); - -#endif // SURFACE_COLLISION_H diff --git a/src/engine/surface_load.h b/src/engine/surface_load.h index 0f8fea57..f3011d45 100644 --- a/src/engine/surface_load.h +++ b/src/engine/surface_load.h @@ -1,5 +1,4 @@ -#ifndef SURFACE_LOAD_H -#define SURFACE_LOAD_H +#pragma once #include @@ -40,5 +39,3 @@ u32 get_area_terrain_size(TerrainData *data); void load_area_terrain(s32 index, TerrainData *data, RoomData *surfaceRooms, s16 *macroObjects); void clear_dynamic_surfaces(void); void load_object_collision_model(void); - -#endif // SURFACE_LOAD_H diff --git a/src/game/area.h b/src/game/area.h index c8f073c4..30115c23 100644 --- a/src/game/area.h +++ b/src/game/area.h @@ -1,5 +1,4 @@ -#ifndef AREA_H -#define AREA_H +#pragma once #include @@ -172,5 +171,3 @@ void area_update_objects(void); void play_transition(s16 transType, s16 time, u8 red, u8 green, u8 blue); void play_transition_after_delay(s16 transType, s16 time, u8 red, u8 green, u8 blue, s16 delay); void render_game(void); - -#endif // AREA_H diff --git a/src/game/behavior_actions.h b/src/game/behavior_actions.h index 37701670..45dd7f4d 100644 --- a/src/game/behavior_actions.h +++ b/src/game/behavior_actions.h @@ -1,5 +1,4 @@ -#ifndef BEHAVIOR_ACTIONS_H -#define BEHAVIOR_ACTIONS_H +#pragma once void spawn_mist_particles_variable(s32 count, s32 offsetY, f32 size); void bhv_spawn_star_no_level_exit(u32); @@ -574,5 +573,3 @@ Gfx *geo_scale_bowser_key(s32 run, struct GraphNode *node, UNUSED f32 mtx[4][4]) // Water splash extern struct WaterDropletParams gShallowWaterSplashDropletParams; extern struct WaterDropletParams gShallowWaterWaveDropletParams; - -#endif // BEHAVIOR_ACTIONS_H diff --git a/src/game/camera.h b/src/game/camera.h index da826ee4..b75e598c 100644 --- a/src/game/camera.h +++ b/src/game/camera.h @@ -1,5 +1,4 @@ -#ifndef CAMERA_H -#define CAMERA_H +#pragma once #include @@ -766,5 +765,3 @@ void set_fov_shake_from_point_preset(u8 preset, f32 posX, f32 posY, f32 posZ); void obj_rotate_towards_point(struct Object *o, Vec3f point, s16 pitchOff, s16 yawOff, s16 pitchDiv, s16 yawDiv); Gfx *geo_camera_fov(s32 callContext, struct GraphNode *g, UNUSED void *context); - -#endif // CAMERA_H diff --git a/src/game/debug.h b/src/game/debug.h index 7e89296c..50848572 100644 --- a/src/game/debug.h +++ b/src/game/debug.h @@ -1,5 +1,4 @@ -#ifndef DEBUG_H -#define DEBUG_H +#pragma once #include @@ -24,5 +23,3 @@ void stub_debug_5(void); void try_print_debug_mario_object_info(void); void try_do_mario_debug_object_spawn(void); void try_print_debug_mario_level_info(void); - -#endif // DEBUG_H diff --git a/src/game/debug_box.h b/src/game/debug_box.h index 2a8ba2f8..2b4bcc4d 100644 --- a/src/game/debug_box.h +++ b/src/game/debug_box.h @@ -1,5 +1,4 @@ -#ifndef DEBUG_BOX_H -#define DEBUG_BOX_H +#pragma once #ifdef VISUAL_DEBUG @@ -37,5 +36,3 @@ void render_debug_boxes(s32 type); extern void visual_surface_loop(void); #endif - -#endif /* DEBUG_BOX_H */ diff --git a/src/game/debug_course.h b/src/game/debug_course.h index 8d094e09..a1de9cc1 100644 --- a/src/game/debug_course.h +++ b/src/game/debug_course.h @@ -1,6 +1,3 @@ -#ifndef DEBUG_COURSE_H -#define DEBUG_COURSE_H +#pragma once void nop_change_course(void); - -#endif // DEBUG_COURSE_H diff --git a/src/game/envfx_bubbles.h b/src/game/envfx_bubbles.h index 024c3fe0..9a72336d 100644 --- a/src/game/envfx_bubbles.h +++ b/src/game/envfx_bubbles.h @@ -1,5 +1,4 @@ -#ifndef ENVFX_BUBBLES_H -#define ENVFX_BUBBLES_H +#pragma once #include #include @@ -18,5 +17,3 @@ // Used to communicate from whirlpool behavior to envfx extern s16 gEnvFxBubbleConfig[10]; Gfx *envfx_update_bubbles(s32 mode, Vec3s marioPos, Vec3s camTo, Vec3s camFrom); - -#endif // ENVFX_BUBBLES_H diff --git a/src/game/envfx_snow.h b/src/game/envfx_snow.h index a8e1e9cb..5292f7e4 100644 --- a/src/game/envfx_snow.h +++ b/src/game/envfx_snow.h @@ -1,5 +1,4 @@ -#ifndef ENVFX_SNOW_H -#define ENVFX_SNOW_H +#pragma once #include #include "types.h" @@ -37,5 +36,3 @@ extern s16 gSnowParticleCount; Gfx *envfx_update_particles(s32 snowMode, Vec3s marioPos, Vec3s camTo, Vec3s camFrom); void orbit_from_positions(Vec3s from, Vec3s to, s16 *radius, s16 *pitch, s16 *yaw); void rotate_triangle_vertices(Vec3s vertex1, Vec3s vertex2, Vec3s vertex3, s16 pitch, s16 yaw); - -#endif // ENVFX_SNOW_H diff --git a/src/game/farcall_helpers.h b/src/game/farcall_helpers.h index d42daf15..9aaddcef 100644 --- a/src/game/farcall_helpers.h +++ b/src/game/farcall_helpers.h @@ -1,5 +1,4 @@ -#ifndef OBJ_BEHAVIORS_2_NONSTATIC_H -#define OBJ_BEHAVIORS_2_NONSTATIC_H +#pragma once #include "object_fields.h" #include "object_constants.h" @@ -80,5 +79,3 @@ s32 obj_update_standard_actions(f32 scale); s32 obj_check_attacks(struct ObjectHitbox *hitbox, s32 attackedMarioAction); s32 obj_move_for_one_second(s32 endAction); void treat_far_home_as_mario(f32 threshold); - -#endif diff --git a/src/game/game_init.h b/src/game/game_init.h index 0c1d170d..4be7423a 100644 --- a/src/game/game_init.h +++ b/src/game/game_init.h @@ -1,5 +1,4 @@ -#ifndef GAME_INIT_H -#define GAME_INIT_H +#pragma once #include #include @@ -89,5 +88,3 @@ void end_master_display_list(void); void render_init(void); void select_gfx_pool(void); void display_and_vsync(void); - -#endif // GAME_INIT_H diff --git a/src/game/geo_misc.h b/src/game/geo_misc.h index 904633af..6c2dab63 100644 --- a/src/game/geo_misc.h +++ b/src/game/geo_misc.h @@ -1,5 +1,4 @@ -#ifndef GEO_MISC_H -#define GEO_MISC_H +#pragma once #include #include @@ -37,5 +36,3 @@ extern Gfx *geo_exec_cake_end_screen(s32 callContext, struct GraphNode *node, UN gDPLoadSync((dl)); \ gDPLoadBlock((dl), G_TX_LOADTILE, 0, 0, (width) * (height) - 1, CALC_DXT((width), G_IM_SIZ_16b_BYTES)) \ } - -#endif // GEO_MISC_H diff --git a/src/game/hud.h b/src/game/hud.h index bfa44fa5..15082f9a 100644 --- a/src/game/hud.h +++ b/src/game/hud.h @@ -1,5 +1,4 @@ -#ifndef HUD_H -#define HUD_H +#pragma once #include #include @@ -23,5 +22,3 @@ enum CameraHUDLut { void set_hud_camera_status(s16 status); void render_hud(void); - -#endif // HUD_H diff --git a/src/game/ingame_menu.h b/src/game/ingame_menu.h index 30c17aa3..020a2d7d 100644 --- a/src/game/ingame_menu.h +++ b/src/game/ingame_menu.h @@ -1,5 +1,4 @@ -#ifndef INGAME_MENU_H -#define INGAME_MENU_H +#pragma once #include @@ -163,5 +162,3 @@ void do_cutscene_handler(void); void render_hud_cannon_reticle(void); void reset_red_coins_collected(void); s16 render_menus_and_dialogs(void); - -#endif // INGAME_MENU_H diff --git a/src/game/interaction.h b/src/game/interaction.h index 9fec1702..27a7c25a 100644 --- a/src/game/interaction.h +++ b/src/game/interaction.h @@ -1,5 +1,4 @@ -#ifndef INTERACTION_H -#define INTERACTION_H +#pragma once #include @@ -121,5 +120,3 @@ u32 mario_check_object_grab(struct MarioState *m); u32 get_door_save_file_flag(struct Object *door); void mario_process_interactions(struct MarioState *m); void mario_handle_special_floors(struct MarioState *m); - -#endif // INTERACTION_H diff --git a/src/game/level_geo.h b/src/game/level_geo.h index e4b4016c..65b94235 100644 --- a/src/game/level_geo.h +++ b/src/game/level_geo.h @@ -1,10 +1,7 @@ -#ifndef LEVEL_GEO_H -#define LEVEL_GEO_H +#pragma once #include #include Gfx *geo_envfx_main(s32 callContext, struct GraphNode *node, Mat4 mtxf); Gfx *geo_skybox_main(s32 callContext, struct GraphNode *node, UNUSED Mat4 *mtx); - -#endif // LEVEL_GEO_H diff --git a/src/game/level_update.h b/src/game/level_update.h index a8bd0e3c..1da93e5c 100644 --- a/src/game/level_update.h +++ b/src/game/level_update.h @@ -1,5 +1,4 @@ -#ifndef LEVEL_UPDATE_H -#define LEVEL_UPDATE_H +#pragma once #include @@ -138,5 +137,3 @@ s32 lvl_init_from_save_file(UNUSED s16 arg0, s32 levelNum); s32 lvl_set_current_level(UNUSED s16 arg0, s32 levelNum); s32 lvl_play_the_end_screen_sound(UNUSED s16 arg0, UNUSED s32 arg1); void basic_update(UNUSED s16 *arg); - -#endif // LEVEL_UPDATE_H diff --git a/src/game/macro_special_objects.h b/src/game/macro_special_objects.h index 1996aac5..96de3cac 100644 --- a/src/game/macro_special_objects.h +++ b/src/game/macro_special_objects.h @@ -1,5 +1,4 @@ -#ifndef MACRO_SPECIAL_OBJECTS_H -#define MACRO_SPECIAL_OBJECTS_H +#pragma once #include @@ -17,5 +16,3 @@ void spawn_special_objects(s32 areaIndex, TerrainData **specialObjList); #ifdef NO_SEGMENTED_MEMORY u32 get_special_objects_size(s16 *data); #endif - -#endif // MACRO_SPECIAL_OBJECTS_H diff --git a/src/game/main.h b/src/game/main.h index e175a768..f7fad8ba 100644 --- a/src/game/main.h +++ b/src/game/main.h @@ -1,5 +1,4 @@ -#ifndef MAIN_H -#define MAIN_H +#pragma once #include "config.h" @@ -71,5 +70,3 @@ extern s8 gShowDebugText; void set_vblank_handler(s32 index, struct VblankHandler *handler, OSMesgQueue *queue, OSMesg *msg); void dispatch_audio_sptask(struct SPTask *spTask); void exec_display_list(struct SPTask *spTask); - -#endif // MAIN_H diff --git a/src/game/mario.h b/src/game/mario.h index 48d28655..36033378 100644 --- a/src/game/mario.h +++ b/src/game/mario.h @@ -1,5 +1,4 @@ -#ifndef MARIO_H -#define MARIO_H +#pragma once #include @@ -49,5 +48,3 @@ s32 set_water_plunge_action(struct MarioState *m); s32 execute_mario_action(UNUSED struct Object *o); void init_mario(void); void init_mario_from_save_file(void); - -#endif // MARIO_H diff --git a/src/game/mario_actions_airborne.h b/src/game/mario_actions_airborne.h index 116a20d0..8fb62552 100644 --- a/src/game/mario_actions_airborne.h +++ b/src/game/mario_actions_airborne.h @@ -1,10 +1,7 @@ -#ifndef MARIO_ACTIONS_AIRBORNE_H -#define MARIO_ACTIONS_AIRBORNE_H +#pragma once #include #include "types.h" s32 mario_execute_airborne_action(struct MarioState *m); - -#endif // MARIO_ACTIONS_AIRBORNE_H diff --git a/src/game/mario_actions_automatic.h b/src/game/mario_actions_automatic.h index 46855b32..66519854 100644 --- a/src/game/mario_actions_automatic.h +++ b/src/game/mario_actions_automatic.h @@ -1,10 +1,7 @@ -#ifndef MARIO_ACTIONS_AUTOMATIC_H -#define MARIO_ACTIONS_AUTOMATIC_H +#pragma once #include #include "types.h" s32 mario_execute_automatic_action(struct MarioState *m); - -#endif // MARIO_ACTIONS_AUTOMATIC_H diff --git a/src/game/mario_actions_cutscene.h b/src/game/mario_actions_cutscene.h index 75a62929..b9d1e73e 100644 --- a/src/game/mario_actions_cutscene.h +++ b/src/game/mario_actions_cutscene.h @@ -1,5 +1,4 @@ -#ifndef MARIO_ACTIONS_CUTSCENE_H -#define MARIO_ACTIONS_CUTSCENE_H +#pragma once #include @@ -26,5 +25,3 @@ s32 set_mario_npc_dialog(s32 actionArg); s32 mario_execute_cutscene_action(struct MarioState *m); extern Vp sEndCutsceneVp; extern struct CreditsEntry *sDispCreditsEntry; - -#endif // MARIO_ACTIONS_CUTSCENE_H diff --git a/src/game/mario_actions_object.h b/src/game/mario_actions_object.h index d398eabe..13845dcd 100644 --- a/src/game/mario_actions_object.h +++ b/src/game/mario_actions_object.h @@ -1,5 +1,4 @@ -#ifndef MARIO_ACTIONS_OBJECT_H -#define MARIO_ACTIONS_OBJECT_H +#pragma once #include @@ -7,5 +6,3 @@ s32 mario_update_punch_sequence(struct MarioState *m); s32 mario_execute_object_action(struct MarioState *m); - -#endif // MARIO_ACTIONS_OBJECT_H diff --git a/src/game/mario_actions_submerged.h b/src/game/mario_actions_submerged.h index addef2fc..9ee09590 100644 --- a/src/game/mario_actions_submerged.h +++ b/src/game/mario_actions_submerged.h @@ -1,10 +1,7 @@ -#ifndef MARIO_ACTIONS_SUBMERGED_H -#define MARIO_ACTIONS_SUBMERGED_H +#pragma once #include #include "types.h" s32 mario_execute_submerged_action(struct MarioState *m); - -#endif // MARIO_ACTIONS_SUBMERGED_H diff --git a/src/game/mario_misc.h b/src/game/mario_misc.h index 7053ca34..8943c597 100644 --- a/src/game/mario_misc.h +++ b/src/game/mario_misc.h @@ -1,5 +1,4 @@ -#ifndef MARIO_MISC_H -#define MARIO_MISC_H +#pragma once #include @@ -30,5 +29,3 @@ Gfx *geo_mario_rotate_wing_cap_wings(s32 callContext, struct GraphNode *node, UN Gfx *geo_switch_mario_hand_grab_pos(s32 callContext, struct GraphNode *b, Mat4 *mtx); Gfx *geo_render_mirror_mario(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c); Gfx *geo_mirror_mario_backface_culling(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c); - -#endif // MARIO_MISC_H diff --git a/src/game/mario_step.h b/src/game/mario_step.h index 792445c0..1948f1de 100644 --- a/src/game/mario_step.h +++ b/src/game/mario_step.h @@ -1,5 +1,4 @@ -#ifndef MARIO_STEP_H -#define MARIO_STEP_H +#pragma once #include @@ -32,5 +31,3 @@ void stop_and_set_height_to_floor(struct MarioState *m); s32 stationary_ground_step(struct MarioState *m); s32 perform_ground_step(struct MarioState *m); s32 perform_air_step(struct MarioState *m, u32 stepArg); - -#endif // MARIO_STEP_H diff --git a/src/game/memory.h b/src/game/memory.h index 592ab2c7..ea4a5f4e 100644 --- a/src/game/memory.h +++ b/src/game/memory.h @@ -1,5 +1,4 @@ -#ifndef MEMORY_H -#define MEMORY_H +#pragma once #include @@ -84,5 +83,3 @@ void mem_pool_free(struct MemoryPool *pool, void *addr); void *alloc_display_list(u32 size); void setup_dma_table_list(struct DmaHandlerList *list, void *srcAddr, void *buffer); s32 load_patchable_table(struct DmaHandlerList *list, s32 index); - -#endif // MEMORY_H diff --git a/src/game/moving_texture.h b/src/game/moving_texture.h index 9d2e3db1..10211a92 100644 --- a/src/game/moving_texture.h +++ b/src/game/moving_texture.h @@ -1,5 +1,4 @@ -#ifndef MOVING_TEXTURE_H -#define MOVING_TEXTURE_H +#pragma once #include @@ -120,5 +119,3 @@ Gfx *geo_movtex_draw_colored_no_update(s32 callContext, struct GraphNode *node, Gfx *geo_movtex_draw_colored_2_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx); Gfx *geo_movtex_update_horizontal(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx); Gfx *geo_movtex_draw_colored_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx); - -#endif // MOVING_TEXTURE_H diff --git a/src/game/obj_behaviors.h b/src/game/obj_behaviors.h index bb4f740c..c5278c02 100644 --- a/src/game/obj_behaviors.h +++ b/src/game/obj_behaviors.h @@ -1,5 +1,4 @@ -#ifndef OBJ_BEHAVIORS_H -#define OBJ_BEHAVIORS_H +#pragma once #include @@ -161,5 +160,3 @@ void bhv_free_bowling_ball_loop(void); /* likely unused */ void bhv_rr_cruiser_wing_init(void); void bhv_rr_cruiser_wing_loop(void); void spawn_default_star(f32 x, f32 y, f32 z); - -#endif // OBJ_BEHAVIORS_H diff --git a/src/game/obj_behaviors_2.h b/src/game/obj_behaviors_2.h index 74c97b2c..a43d66ab 100644 --- a/src/game/obj_behaviors_2.h +++ b/src/game/obj_behaviors_2.h @@ -1,5 +1,4 @@ -#ifndef OBJ_BEHAVIORS_2_H -#define OBJ_BEHAVIORS_2_H +#pragma once #include @@ -19,5 +18,3 @@ void shelled_koopa_attack_handler(s32 attackType); void obj_spit_fire(s16 relativePosX, s16 relativePosY, s16 relativePosZ, f32 scale, s32 model, f32 startSpeed, f32 endSpeed, s16 movePitch); void obj_set_speed_to_zero(void); - -#endif // OBJ_BEHAVIORS_2_H diff --git a/src/game/object_collision.h b/src/game/object_collision.h index 3357d197..cbcfdac1 100644 --- a/src/game/object_collision.h +++ b/src/game/object_collision.h @@ -1,6 +1,3 @@ -#ifndef OBJECT_COLLISION_H -#define OBJECT_COLLISION_H +#pragma once void detect_object_collisions(void); - -#endif // OBJECT_COLLISION_H diff --git a/src/game/object_helpers.h b/src/game/object_helpers.h index 7040dcfa..b02b819a 100644 --- a/src/game/object_helpers.h +++ b/src/game/object_helpers.h @@ -1,5 +1,4 @@ -#ifndef OBJECT_HELPERS_H -#define OBJECT_HELPERS_H +#pragma once #include @@ -285,5 +284,3 @@ void obj_set_model(struct Object *obj, s32 modelID); s32 obj_has_model(struct Object *obj, u16 modelID); u32 obj_get_model_id(struct Object *obj); // End of HackerSM64 stuff - -#endif // OBJECT_HELPERS_H diff --git a/src/game/object_list_processor.h b/src/game/object_list_processor.h index 1f2be9cd..176f09f3 100644 --- a/src/game/object_list_processor.h +++ b/src/game/object_list_processor.h @@ -1,5 +1,4 @@ -#ifndef OBJECT_LIST_PROCESSOR_H -#define OBJECT_LIST_PROCESSOR_H +#pragma once #include @@ -120,6 +119,3 @@ void unload_objects_from_area(UNUSED s32 unused, s32 areaIndex); void spawn_objects_from_info(UNUSED s32 unused, struct SpawnInfo *spawnInfo); void clear_objects(void); void update_objects(UNUSED s32 unused); - - -#endif // OBJECT_LIST_PROCESSOR_H diff --git a/src/game/paintings.h b/src/game/paintings.h index 3f4334b4..6910b069 100644 --- a/src/game/paintings.h +++ b/src/game/paintings.h @@ -1,5 +1,4 @@ -#ifndef PAINTINGS_H -#define PAINTINGS_H +#pragma once #include #include @@ -137,5 +136,3 @@ extern s8 gDddPaintingStatus; Gfx *geo_painting_draw(s32 callContext, struct GraphNode *node, UNUSED void *context); Gfx *geo_painting_update(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 c); - -#endif // PAINTINGS_H diff --git a/src/game/platform_displacement.h b/src/game/platform_displacement.h index 5eef98d9..4a3894fb 100644 --- a/src/game/platform_displacement.h +++ b/src/game/platform_displacement.h @@ -1,5 +1,4 @@ -#ifndef PLATFORM_DISPLACEMENT_H -#define PLATFORM_DISPLACEMENT_H +#pragma once #include @@ -26,5 +25,3 @@ void set_mario_pos(f32 x, f32 y, f32 z); #endif void apply_mario_platform_displacement(void); void clear_mario_platform(void); - -#endif // PLATFORM_DISPLACEMENT_H diff --git a/src/game/print.h b/src/game/print.h index 95597e8a..1f3dc9d9 100644 --- a/src/game/print.h +++ b/src/game/print.h @@ -1,5 +1,4 @@ -#ifndef PRINT_H -#define PRINT_H +#pragma once #include @@ -29,5 +28,3 @@ void print_text_fmt_int(s32 x, s32 y, const char *str, s32 n); void print_text(s32 x, s32 y, const char *str); void print_text_centered(s32 x, s32 y, const char *str); void render_text_labels(void); - -#endif // PRINT_H diff --git a/src/game/printf.h b/src/game/printf.h index 5d798a19..f55ad455 100644 --- a/src/game/printf.h +++ b/src/game/printf.h @@ -1,5 +1,4 @@ -#ifndef _PRINTF_H_ -#define _PRINTF_H_ +#pragma once #include typedef struct @@ -33,4 +32,3 @@ typedef struct s32 _Printf(char *(*prout)(char *, const char *, size_t), char *dst, const char *fmt, va_list args); void _Litob(printf_struct *args, u8 type); void _Ldtob(printf_struct *args, u8 type); -#endif diff --git a/src/game/profiler.h b/src/game/profiler.h index 0bb66a58..4fcce589 100644 --- a/src/game/profiler.h +++ b/src/game/profiler.h @@ -1,5 +1,4 @@ -#ifndef PROFILER_H -#define PROFILER_H +#pragma once #include #include @@ -47,5 +46,3 @@ void profiler_log_thread4_time(void); void profiler_log_gfx_time(enum ProfilerGfxEvent eventID); void profiler_log_vblank_time(void); void draw_profiler(void); - -#endif // PROFILER_H diff --git a/src/game/puppycam2.h b/src/game/puppycam2.h index 13d1ec7f..c9f8e9fd 100644 --- a/src/game/puppycam2.h +++ b/src/game/puppycam2.h @@ -1,5 +1,4 @@ -#ifndef PUPPYCAM2_H -#define PUPPYCAM2_H +#pragma once #ifdef PUPPYCAM @@ -195,5 +194,3 @@ extern void puppycam_warp(f32 displacementX, f32 displacementY, f32 displacement extern s32 puppycam_move_spline(struct sPuppySpline splinePos[], struct sPuppySpline splineFocus[], s32 mode, s32 index); #endif - -#endif // PUPPYCAM2_H diff --git a/src/game/puppylights.h b/src/game/puppylights.h index c8a642a7..62481443 100644 --- a/src/game/puppylights.h +++ b/src/game/puppylights.h @@ -1,6 +1,6 @@ +#pragma once + #ifdef PUPPYLIGHTS -#ifndef PUPPYLIGHTS_H -#define PUPPYLIGHTS_H #include "types.h" #include "command_macros_base.h" @@ -54,4 +54,3 @@ extern void puppylights_allocate(void); extern void delete_lights(void); #endif -#endif diff --git a/src/game/puppyprint.h b/src/game/puppyprint.h index cb54e509..e62492a5 100644 --- a/src/game/puppyprint.h +++ b/src/game/puppyprint.h @@ -1,5 +1,4 @@ -#ifndef PUPPYPRINT_H -#define PUPPYPRINT_H +#pragma once #ifdef PUPPYPRINT @@ -74,5 +73,3 @@ extern void append_puppyprint_log(const char *str, ...); extern char consoleLogTable[LOG_BUFFER_SIZE][255]; #endif - -#endif // PUPPYPRINT_H diff --git a/src/game/rendering_graph_node.h b/src/game/rendering_graph_node.h index d096a30a..be122e98 100644 --- a/src/game/rendering_graph_node.h +++ b/src/game/rendering_graph_node.h @@ -1,5 +1,4 @@ -#ifndef RENDERING_GRAPH_NODE_H -#define RENDERING_GRAPH_NODE_H +#pragma once #include @@ -55,5 +54,3 @@ extern f32 gWorldScale; void geo_process_node_and_siblings(struct GraphNode *firstNode); void geo_process_root(struct GraphNodeRoot *node, Vp *b, Vp *c, s32 clearColor); - -#endif // RENDERING_GRAPH_NODE_H diff --git a/src/game/rumble_init.h b/src/game/rumble_init.h index 91951d95..d565eba9 100644 --- a/src/game/rumble_init.h +++ b/src/game/rumble_init.h @@ -1,5 +1,4 @@ -#ifndef RUMBLE_INIT_H -#define RUMBLE_INIT_H +#pragma once #include @@ -23,5 +22,3 @@ void create_thread_6(void); void rumble_thread_update_vi(void); #endif // ENABLE_RUMBLE - -#endif // RUMBLE_INIT_H diff --git a/src/game/save_file.h b/src/game/save_file.h index 46f3cc9d..6daae8d2 100644 --- a/src/game/save_file.h +++ b/src/game/save_file.h @@ -1,5 +1,4 @@ -#ifndef SAVE_FILE_H -#define SAVE_FILE_H +#pragma once #include @@ -194,5 +193,3 @@ enum EuLanguages { void eu_set_language(u16 language); u16 eu_get_language(void); #endif - -#endif // SAVE_FILE_H diff --git a/src/game/screen_transition.h b/src/game/screen_transition.h index 70b3c21a..df00eedf 100644 --- a/src/game/screen_transition.h +++ b/src/game/screen_transition.h @@ -1,5 +1,4 @@ -#ifndef SCREEN_TRANSITION_H -#define SCREEN_TRANSITION_H +#pragma once #include #include @@ -23,5 +22,3 @@ enum TextureTransitionType s32 render_screen_transition(s8 fadeTimer, s8 transType, u8 transTime, struct WarpTransitionData *transData); Gfx *geo_cannon_circle_base(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx); - -#endif // SCREEN_TRANSITION_H diff --git a/src/game/segment2.h b/src/game/segment2.h index 7eecce54..25415ae6 100644 --- a/src/game/segment2.h +++ b/src/game/segment2.h @@ -1,5 +1,4 @@ -#ifndef SEGMENT2_H -#define SEGMENT2_H +#pragma once #include #include @@ -63,5 +62,3 @@ extern Gfx dl_billboard_num_6[]; extern Gfx dl_billboard_num_7[]; extern Gfx dl_billboard_num_8[]; extern Gfx dl_billboard_num_9[]; - -#endif // SEGMENT2_H diff --git a/src/game/segment7.h b/src/game/segment7.h index c552be2e..f9d69aa2 100644 --- a/src/game/segment7.h +++ b/src/game/segment7.h @@ -1,5 +1,4 @@ -#ifndef SEGMENT7_H -#define SEGMENT7_H +#pragma once #include #include @@ -28,5 +27,3 @@ extern Gfx *intro_seg7_dl_main_logo; extern Gfx *intro_seg7_dl_copyright_trademark; extern f32 intro_seg7_table_scale_1[]; extern f32 intro_seg7_table_scale_2[]; - -#endif // SEGMENT7_H diff --git a/src/game/shadow.h b/src/game/shadow.h index 528659a2..0e306a4f 100644 --- a/src/game/shadow.h +++ b/src/game/shadow.h @@ -1,5 +1,4 @@ -#ifndef SHADOW_H -#define SHADOW_H +#pragma once #include #include @@ -50,5 +49,3 @@ extern s8 gMarioOnIceOrCarpet; * with the given initial solidity and "shadowType" (described above). */ Gfx *create_shadow_below_xyz(f32 xPos, f32 yPos, f32 zPos, s16 shadowScale, u8 shadowSolidity, s8 shadowType); - -#endif // SHADOW_H diff --git a/src/game/skybox.h b/src/game/skybox.h index 39220447..c1769ec0 100644 --- a/src/game/skybox.h +++ b/src/game/skybox.h @@ -1,5 +1,4 @@ -#ifndef SKYBOX_H -#define SKYBOX_H +#pragma once #include #include @@ -7,5 +6,3 @@ Gfx *create_skybox_facing_camera(s8 player, s8 background, f32 fov, f32 posX, f32 posY, f32 posZ, f32 focX, f32 focY, f32 focZ); - -#endif // SKYBOX_H diff --git a/src/game/sound_init.h b/src/game/sound_init.h index a03c5d84..dab73a69 100644 --- a/src/game/sound_init.h +++ b/src/game/sound_init.h @@ -1,5 +1,4 @@ -#ifndef SOUND_INIT_H -#define SOUND_INIT_H +#pragma once #include @@ -38,5 +37,3 @@ void fadeout_cap_music(void); void stop_cap_music(void); void audio_game_loop_tick(void); void thread4_sound(UNUSED void *arg); - -#endif // SOUND_INIT_H diff --git a/src/game/spawn_object.h b/src/game/spawn_object.h index 78ac92b8..eec4ebe8 100644 --- a/src/game/spawn_object.h +++ b/src/game/spawn_object.h @@ -1,5 +1,4 @@ -#ifndef SPAWN_OBJECT_H -#define SPAWN_OBJECT_H +#pragma once #include "types.h" @@ -7,5 +6,3 @@ void init_free_object_list(void); void clear_object_lists(struct ObjectNode *objLists); void unload_object(struct Object *obj); struct Object *create_object(const BehaviorScript *bhvScript); - -#endif // SPAWN_OBJECT_H diff --git a/src/game/spawn_sound.h b/src/game/spawn_sound.h index c00a13be..322b8f56 100644 --- a/src/game/spawn_sound.h +++ b/src/game/spawn_sound.h @@ -1,5 +1,4 @@ -#ifndef SPAWN_SOUND_H -#define SPAWN_SOUND_H +#pragma once #include @@ -20,5 +19,3 @@ void cur_obj_play_sound_1(s32 soundMagic); void cur_obj_play_sound_2(s32 soundMagic); void create_sound_spawner(s32 soundMagic); void exec_anim_sound_state(struct SoundState *soundStates); - -#endif // SPAWN_SOUND_H diff --git a/src/game/sram.h b/src/game/sram.h index 98f13ac6..f1c51f91 100644 --- a/src/game/sram.h +++ b/src/game/sram.h @@ -1,5 +1,4 @@ -#ifndef SRAM_H -#define SRAM_H +#pragma once /*----------------------------------------------------------------------*/ @@ -26,5 +25,3 @@ extern int nuPiReadWriteSram(u32 addr, void* buf_ptr, u32 size, s32 flag); /*----------------------------------------------------------------------*/ #define nuPiWriteSram(addr, buf_ptr, size) \ nuPiReadWriteSram(addr, buf_ptr, size, OS_WRITE) - -#endif // SRAM_H \ No newline at end of file diff --git a/src/game/vc_check.h b/src/game/vc_check.h index 71d29e23..0260c402 100644 --- a/src/game/vc_check.h +++ b/src/game/vc_check.h @@ -1,5 +1,4 @@ -#ifndef VC_CHECK_H -#define VC_CHECK_H +#pragma once #include "sm64.h" @@ -18,5 +17,3 @@ f32 round_double_to_float(f64); * RTZ will output not 1.0f, RTN will output exactly 1.0f */ #define IS_VC() (1.0f != round_double_to_float(0.9999999999999999)) - -#endif diff --git a/src/game/version.h b/src/game/version.h index ba4d54b1..7eb9c82c 100644 --- a/src/game/version.h +++ b/src/game/version.h @@ -1,9 +1,6 @@ -#ifndef VER_H -#define VER_H +#pragma once extern char __username__[]; extern char __datetime__[]; extern char __compiler__[]; extern char __linker__[]; - -#endif diff --git a/src/goddard/debug_utils.h b/src/goddard/debug_utils.h index 4c2bcafb..688c4517 100644 --- a/src/goddard/debug_utils.h +++ b/src/goddard/debug_utils.h @@ -1,5 +1,4 @@ -#ifndef GD_DEBUGGING_UTILS_H -#define GD_DEBUGGING_UTILS_H +#pragma once #include @@ -89,5 +88,3 @@ extern s32 gd_fread(s8 *, s32, s32, struct GdFile *); extern void gd_fclose(struct GdFile *); extern u32 gd_get_file_size(struct GdFile *); extern s32 gd_fread_line(char *, u32, struct GdFile *); - -#endif // GD_DEBUGGING_UTILS_H diff --git a/src/goddard/draw_objects.h b/src/goddard/draw_objects.h index efe0e53b..cbd6eab9 100644 --- a/src/goddard/draw_objects.h +++ b/src/goddard/draw_objects.h @@ -1,5 +1,4 @@ -#ifndef GD_DRAW_OBJECTS_H -#define GD_DRAW_OBJECTS_H +#pragma once #include @@ -46,5 +45,3 @@ void create_gddl_for_shapes(struct ObjGroup *grp); void map_face_materials(struct ObjGroup *faces, struct ObjGroup *mtls); void map_vertices(struct ObjGroup *facegrp, struct ObjGroup *vtxgrp); void update_view(struct ObjView *view); - -#endif // GD_DRAW_OBJECTS_H diff --git a/src/goddard/dynlist_proc.h b/src/goddard/dynlist_proc.h index f4641baf..35e862c4 100644 --- a/src/goddard/dynlist_proc.h +++ b/src/goddard/dynlist_proc.h @@ -1,5 +1,4 @@ -#ifndef GD_DYNLIST_PROCESSOR_H -#define GD_DYNLIST_PROCESSOR_H +#pragma once #include @@ -95,5 +94,3 @@ void d_set_i_matrix(Mat4f *src); Mat4f *d_get_matrix_ptr(void); Mat4f *d_get_i_mtx_ptr(void); f32 d_calc_world_dist_btwn(struct GdObj *obj1, struct GdObj *obj2); - -#endif // GD_DYNLIST_PROCESSOR_H diff --git a/src/goddard/dynlists/animdata.h b/src/goddard/dynlists/animdata.h index 28e69269..1aa81375 100644 --- a/src/goddard/dynlists/animdata.h +++ b/src/goddard/dynlists/animdata.h @@ -1,5 +1,4 @@ -#ifndef GD_ANIMDATA_H -#define GD_ANIMDATA_H +#pragma once #include "../gd_types.h" #define END_ANIMDATA_INFO_ARR { -1, GD_ANIM_EMPTY, NULL } @@ -29,5 +28,3 @@ extern struct AnimDataInfo anim_mario_eyelid_right[]; extern struct AnimDataInfo anim_mario_intro[]; extern struct AnimDataInfo anim_silver_star[]; extern struct AnimDataInfo anim_red_star[]; - -#endif // GD_ANIMDATA_H diff --git a/src/goddard/dynlists/dynlist_macros.h b/src/goddard/dynlists/dynlist_macros.h index cbde7263..58c40c64 100644 --- a/src/goddard/dynlists/dynlist_macros.h +++ b/src/goddard/dynlists/dynlist_macros.h @@ -1,5 +1,4 @@ -#ifndef GD_DYNLIST_MACROS_H -#define GD_DYNLIST_MACROS_H +#pragma once /* DynListCmd Macros */ @@ -398,5 +397,3 @@ /* Make a new Net from Shape double pointer PTR */ #define MakeNetFromShapePtrPtr(w1) \ { 55, {(void *)(w1)}, {0}, {0.0, 0.0, 0.0} } - -#endif // GD_DYNLIST_MACROS_H diff --git a/src/goddard/dynlists/dynlists.h b/src/goddard/dynlists/dynlists.h index c134a21c..9afcc69c 100644 --- a/src/goddard/dynlists/dynlists.h +++ b/src/goddard/dynlists/dynlists.h @@ -1,5 +1,4 @@ -#ifndef GD_DYNLISTS_H -#define GD_DYNLISTS_H +#pragma once #include "../gd_types.h" @@ -144,5 +143,3 @@ extern struct DynList dynlist_mario_eyebrow_right_shape[]; extern struct DynList dynlist_mario_eyebrow_left_shape[]; extern struct DynList dynlist_mario_mustache_shape[]; extern struct DynList dynlist_mario_master[]; - -#endif // GD_DYNLISTS_H diff --git a/src/goddard/gd_macros.h b/src/goddard/gd_macros.h index 299f2b61..a13a9393 100644 --- a/src/goddard/gd_macros.h +++ b/src/goddard/gd_macros.h @@ -1,5 +1,4 @@ -#ifndef GD_MACROS_H -#define GD_MACROS_H +#pragma once /** * @file gd_macros.h @@ -15,5 +14,3 @@ #ifndef ALIGN #define ALIGN(VAL_, ALIGNMENT_) (((VAL_) + ((ALIGNMENT_) - 1)) & ~((ALIGNMENT_) - 1)) #endif - -#endif // GD_MACROS_H diff --git a/src/goddard/gd_main.h b/src/goddard/gd_main.h index d4c8bc0b..7c1820aa 100644 --- a/src/goddard/gd_main.h +++ b/src/goddard/gd_main.h @@ -1,5 +1,4 @@ -#ifndef GD_MAIN_H -#define GD_MAIN_H +#pragma once #include @@ -81,5 +80,3 @@ extern s32 gGdUseVtxNormal; // bss extern struct GdControl gGdCtrl; extern struct GdControl gGdCtrlPrev; - -#endif // GD_MAIN_H diff --git a/src/goddard/gd_math.h b/src/goddard/gd_math.h index 1028dc83..74835854 100644 --- a/src/goddard/gd_math.h +++ b/src/goddard/gd_math.h @@ -1,5 +1,4 @@ -#ifndef GD_MATH_H -#define GD_MATH_H +#pragma once #include @@ -52,5 +51,3 @@ void gd_mult_mat4f(const Mat4f *mA, const Mat4f *mB, Mat4f *dst); void gd_print_vec(UNUSED const char *prefix, const struct GdVec3f *vec); void gd_print_bounding_box(UNUSED const char *prefix, const struct GdBoundingBox *p); void gd_print_mtx(UNUSED const char *prefix, const Mat4f *mtx); - -#endif // GD_MATH_H diff --git a/src/goddard/gd_memory.h b/src/goddard/gd_memory.h index ea6e6ff7..57aadc67 100644 --- a/src/goddard/gd_memory.h +++ b/src/goddard/gd_memory.h @@ -1,5 +1,4 @@ -#ifndef GD_MEMORY_H -#define GD_MEMORY_H +#pragma once #include @@ -31,5 +30,3 @@ extern void *gd_request_mem(u32 size, u8 permanence); extern struct GMemBlock *gd_add_mem_to_heap(u32 size, void *addr, u8 permanence); extern void init_mem_block_lists(void); extern void mem_stats(void); - -#endif // GD_MEMORY_H diff --git a/src/goddard/gd_types.h b/src/goddard/gd_types.h index 06a9ed4c..f59c38e2 100644 --- a/src/goddard/gd_types.h +++ b/src/goddard/gd_types.h @@ -1,5 +1,4 @@ -#ifndef GD_TYPES_H -#define GD_TYPES_H +#pragma once #include @@ -652,5 +651,3 @@ struct ObjUnk200000 { /* 0x30 */ struct ObjVertex *unk30; //not sure; guessing for Unknown801781DC; 30 and 34 could switch with ObjZone /* 0x34 */ struct ObjFace *unk34; //not sure; guessing for Unknown801781DC }; /* sizeof = 0x38*/ - -#endif // GD_TYPES_H diff --git a/src/goddard/joints.h b/src/goddard/joints.h index a78c7a7a..032b5d5c 100644 --- a/src/goddard/joints.h +++ b/src/goddard/joints.h @@ -1,5 +1,4 @@ -#ifndef GD_JOINTS_H -#define GD_JOINTS_H +#pragma once #include @@ -27,5 +26,3 @@ void reset_joint(struct ObjJoint *j); void func_80191824(struct ObjJoint *j); void func_80191E88(struct ObjGroup *grp); void reset_joint_counts(void); - -#endif // GD_JOINTS_H diff --git a/src/goddard/objects.h b/src/goddard/objects.h index 20981ea4..b97d8263 100644 --- a/src/goddard/objects.h +++ b/src/goddard/objects.h @@ -1,5 +1,4 @@ -#ifndef GD_OBJECTS_H -#define GD_OBJECTS_H +#pragma once #include @@ -98,5 +97,3 @@ void move_lights_in_grp(struct ObjGroup *group); void proc_view_movement(struct ObjView *view); void reset_nets_and_gadgets(struct ObjGroup *group); void null_obj_lists(void); - -#endif // GD_OBJECTS_H diff --git a/src/goddard/old_menu.h b/src/goddard/old_menu.h index bf6117f0..a0bb3396 100644 --- a/src/goddard/old_menu.h +++ b/src/goddard/old_menu.h @@ -1,5 +1,4 @@ -#ifndef GD_OLD_MENU_H -#define GD_OLD_MENU_H +#pragma once #include @@ -11,5 +10,3 @@ struct ObjGadget *make_gadget(UNUSED s32 a0, s32 a1); void reset_gadget(struct ObjGadget *gdgt); void reset_gadgets_in_grp(struct ObjGroup *grp); struct ObjLabel *make_label(struct ObjValPtr *ptr, char *str, s32 a2, f32 x, f32 y, f32 z); - -#endif // GD_OLD_MENU_H diff --git a/src/goddard/particles.h b/src/goddard/particles.h index 3ea34999..18c598c3 100644 --- a/src/goddard/particles.h +++ b/src/goddard/particles.h @@ -1,5 +1,4 @@ -#ifndef GD_PARTICLES_H -#define GD_PARTICLES_H +#pragma once #include @@ -9,5 +8,3 @@ void func_801823A0(struct ObjNet *net); struct ObjParticle *make_particle(u32 a, s32 b, f32 x, f32 y, f32 z); void move_particles_in_grp(struct ObjGroup *group); - -#endif // GD_PARTICLES_H diff --git a/src/goddard/renderer.h b/src/goddard/renderer.h index 799f2164..f807274f 100644 --- a/src/goddard/renderer.h +++ b/src/goddard/renderer.h @@ -1,5 +1,4 @@ -#ifndef GD_RENDERER_H -#define GD_RENDERER_H +#pragma once #include #include @@ -120,5 +119,3 @@ void store_in_pickbuf(s16 data); s32 get_cur_pickbuf_offset(UNUSED s16 *arg0); void set_vtx_tc_buf(f32 tcS, f32 tcT); struct GdObj *load_dynlist(struct DynList *dynlist); - -#endif // GD_RENDERER_H diff --git a/src/goddard/sfx.h b/src/goddard/sfx.h index 8865afc6..51e245ea 100644 --- a/src/goddard/sfx.h +++ b/src/goddard/sfx.h @@ -1,5 +1,4 @@ -#ifndef GD_SFX_H -#define GD_SFX_H +#pragma once #include @@ -21,5 +20,3 @@ void gd_reset_sfx(void); u32 gd_new_sfx_to_play(void); void gd_sfx_update(void); void gd_play_sfx(enum GdSfx sfx); - -#endif // GD_SFX_H diff --git a/src/goddard/shape_helper.h b/src/goddard/shape_helper.h index 8f52dcd8..ad3a9336 100644 --- a/src/goddard/shape_helper.h +++ b/src/goddard/shape_helper.h @@ -1,5 +1,4 @@ -#ifndef GD_SHAPE_HELPER_H -#define GD_SHAPE_HELPER_H +#pragma once #include @@ -25,5 +24,3 @@ void animate_mario_head_normal(struct ObjAnimator *self); s32 load_mario_head(void (*aniFn)(struct ObjAnimator *)); void load_shapes2(void); struct ObjFace* make_face_with_colour(f32 r, f32 g, f32 b); - -#endif // GD_SHAPE_HELPER_H diff --git a/src/goddard/skin.h b/src/goddard/skin.h index 428b3639..58f6f53c 100644 --- a/src/goddard/skin.h +++ b/src/goddard/skin.h @@ -1,5 +1,4 @@ -#ifndef GD_SKIN_H -#define GD_SKIN_H +#pragma once #include @@ -16,5 +15,3 @@ void convert_net_verts(struct ObjNet *net); void move_nets(struct ObjGroup *group); void func_80193848(struct ObjGroup *group); void reset_net_count(void); - -#endif // GD_SKIN_H diff --git a/src/goddard/skin_movement.h b/src/goddard/skin_movement.h index c98c2c93..87d5df1d 100644 --- a/src/goddard/skin_movement.h +++ b/src/goddard/skin_movement.h @@ -1,5 +1,4 @@ -#ifndef GD_SKIN_MOVEMENT_H -#define GD_SKIN_MOVEMENT_H +#pragma once #include "gd_types.h" @@ -7,5 +6,3 @@ void scale_verts(struct ObjGroup *a0); void move_skin(struct ObjNet *net); void func_80181894(struct ObjJoint *joint); void reset_joint_weights(struct ObjJoint *joint); - -#endif // GD_SKIN_MOVEMENT_H diff --git a/src/hvqm/hvqm.h b/src/hvqm/hvqm.h index 867194d3..ae1f8a7e 100644 --- a/src/hvqm/hvqm.h +++ b/src/hvqm/hvqm.h @@ -1,6 +1,4 @@ -#ifndef HVQM_H -#define HVQM_H - +#pragma once /* * Size of the data area for the HVQ microcode @@ -113,6 +111,3 @@ int get_cfb(); typedef u32 (*tkAudioProc)(void *pcmbuf); typedef tkAudioProc (*tkRewindProc)(void); - - -#endif // HVQM_H \ No newline at end of file diff --git a/src/libz/zconf.h b/src/libz/zconf.h index 6caefe30..a238db6a 100644 --- a/src/libz/zconf.h +++ b/src/libz/zconf.h @@ -5,8 +5,7 @@ /* @(#) $Id: zconf.h,v 1.1 2004/06/24 00:04:39 jprincen Exp $ */ -#ifndef ZCONF_H -#define ZCONF_H +#pragma once /* * If you *really* need a unique prefix for all types and library functions, @@ -319,5 +318,3 @@ typedef uLong FAR uLongf; # pragma map(inflate_fast,"INFA") # pragma map(inflate_copyright,"INCOPY") #endif - -#endif /* ZCONF_H */ diff --git a/src/libz/zlib.h b/src/libz/zlib.h index b4ca270a..2d7f3d75 100644 --- a/src/libz/zlib.h +++ b/src/libz/zlib.h @@ -28,8 +28,7 @@ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). */ -#ifndef ZLIB_H -#define ZLIB_H +#pragma once #include "zconf.h" @@ -1185,9 +1184,9 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits, ZLIB_VERSION, sizeof(z_stream)) -#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; /* hack for buggy compilers */ -#endif +// #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) +// struct internal_state {int dummy;}; /* hack for buggy compilers */ +// #endif ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); @@ -1195,5 +1194,3 @@ ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); #ifdef __cplusplus } #endif - -#endif /* ZLIB_H */ diff --git a/src/libz/zutil.c b/src/libz/zutil.c index a5f0034d..589946af 100644 --- a/src/libz/zutil.c +++ b/src/libz/zutil.c @@ -7,9 +7,9 @@ #include "zutil.h" -#ifndef NO_DUMMY_DECL -struct internal_state {int dummy;}; /* for buggy compilers */ -#endif +// #ifndef NO_DUMMY_DECL +// struct internal_state {int dummy;}; /* for buggy compilers */ +// #endif #ifndef STDC extern void exit OF((int)); diff --git a/src/libz/zutil.h b/src/libz/zutil.h index 872ef977..9d97abf6 100644 --- a/src/libz/zutil.h +++ b/src/libz/zutil.h @@ -10,8 +10,7 @@ /* @(#) $Id: zutil.h,v 1.1 2004/06/24 00:04:39 jprincen Exp $ */ -#ifndef ZUTIL_H -#define ZUTIL_H +#pragma once #define ZLIB_INTERNAL #include "zlib.h" @@ -254,5 +253,3 @@ void zcfree OF((voidpf opaque, voidpf ptr)); (*((strm)->zalloc))((strm)->opaque, (items), (size)) #define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) #define TRY_FREE(s, p) {if (p) ZFREE(s, p);} - -#endif /* ZUTIL_H */ diff --git a/src/menu/debug_level_select.h b/src/menu/debug_level_select.h index 8ec23ebb..09bdc826 100644 --- a/src/menu/debug_level_select.h +++ b/src/menu/debug_level_select.h @@ -1,5 +1,4 @@ -#ifndef DEBUG_LEVEL_SELECT_H -#define DEBUG_LEVEL_SELECT_H +#pragma once #include @@ -13,5 +12,3 @@ extern const Gfx debug_level_select_dl_070048C8[]; extern const Gfx debug_level_select_dl_07005558[]; extern const Gfx debug_level_select_dl_070059F8[]; extern const Gfx debug_level_select_dl_070063B0[]; - -#endif // DEBUG_LEVEL_SELECT_H diff --git a/src/menu/file_select.h b/src/menu/file_select.h index 47f72844..0fc95e9b 100644 --- a/src/menu/file_select.h +++ b/src/menu/file_select.h @@ -1,5 +1,4 @@ -#ifndef FILE_SELECT_H -#define FILE_SELECT_H +#pragma once #include #include @@ -136,5 +135,3 @@ void bhv_menu_button_manager_loop(void); Gfx *geo_file_select_strings_and_menu_cursor(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 mtx); s32 lvl_init_menu_values_and_cursor_pos(UNUSED s32 arg, UNUSED s32 unused); s32 lvl_update_obj_and_load_file_selected(UNUSED s32 arg, UNUSED s32 unused); - -#endif // FILE_SELECT_H diff --git a/src/menu/intro_geo.h b/src/menu/intro_geo.h index 3f882621..5875f9ec 100644 --- a/src/menu/intro_geo.h +++ b/src/menu/intro_geo.h @@ -1,5 +1,4 @@ -#ifndef INTRO_GEO_H -#define INTRO_GEO_H +#pragma once #include #include @@ -18,5 +17,3 @@ Gfx *geo_intro_face_easter_egg(s32 state, struct GraphNode *node, UNUSED void *c #if ENABLE_RUMBLE Gfx *geo_intro_rumble_pak_graphic(s32 state, struct GraphNode *node, UNUSED void *context); #endif - -#endif // INTRO_GEO_H diff --git a/src/menu/star_select.h b/src/menu/star_select.h index 1fa7f39a..f8b24a26 100644 --- a/src/menu/star_select.h +++ b/src/menu/star_select.h @@ -1,5 +1,4 @@ -#ifndef STAR_SELECT_H -#define STAR_SELECT_H +#pragma once #include #include @@ -16,5 +15,3 @@ enum StarSelectorTypes Gfx *geo_act_selector_strings(s16 callContext, UNUSED struct GraphNode *node, UNUSED void *context); s32 lvl_init_act_selector_values_and_stars(UNUSED s32 arg, UNUSED s32 unused); s32 lvl_update_obj_and_load_act_button_actions(UNUSED s32 arg, UNUSED s32 unused); - -#endif // STAR_SELECT_H diff --git a/src/menu/title_screen.h b/src/menu/title_screen.h index 4893158f..3a48912f 100644 --- a/src/menu/title_screen.h +++ b/src/menu/title_screen.h @@ -1,5 +1,4 @@ -#ifndef TITLE_SCREEN_H -#define TITLE_SCREEN_H +#pragma once #include @@ -13,5 +12,3 @@ enum LevelScriptIntroArgs { }; s32 lvl_intro_update(s16 arg, UNUSED s32 unusedArg); - -#endif // TITLE_SCREEN_H diff --git a/src/s2d_engine/config.h b/src/s2d_engine/config.h index e14f22cb..4eb86e61 100644 --- a/src/s2d_engine/config.h +++ b/src/s2d_engine/config.h @@ -1,7 +1,6 @@ #include -#ifndef S2D_CONFIG_H -#define S2D_CONFIG_H +#pragma once /** * SET YOUR FONT NAME HERE @@ -94,5 +93,3 @@ extern char *proutSprintf(char *dst, const char *src, size_t count); #define TEX_RES 1 #define _NUM_CACHE (4096 / (TEX_WIDTH * TEX_HEIGHT * (TEX_BITDEPTH / 8))) - -#endif \ No newline at end of file diff --git a/src/s2d_engine/debug.h b/src/s2d_engine/debug.h index c2649ab6..f7021f88 100644 --- a/src/s2d_engine/debug.h +++ b/src/s2d_engine/debug.h @@ -1,5 +1,4 @@ -#ifndef DEBUG_H -#define DEBUG_H +#pragma once // #define init_cond (CONTROLLER_HELD_INPUT & R_CBUTTONS) // #define tex_cond (CONTROLLER_HELD_INPUT & D_CBUTTONS) @@ -11,5 +10,3 @@ #define spr_cond (1) #define init_cond (1) #define deinit_cond (1) - -#endif diff --git a/src/s2d_engine/s2d_draw.h b/src/s2d_engine/s2d_draw.h index 4cd386e3..879bfc83 100644 --- a/src/s2d_engine/s2d_draw.h +++ b/src/s2d_engine/s2d_draw.h @@ -1,5 +1,4 @@ -#ifndef S2D_DRAW_H -#define S2D_DRAW_H +#pragma once #include extern float myScale; @@ -19,5 +18,3 @@ extern void mtx_pipeline(uObjMtx *m, int x, int y); extern void draw_s2d_glyph(char c, int x, int y, uObjMtx *mt); extern void draw_s2d_shadow(char c, int x, int y, uObjMtx *ds); - -#endif \ No newline at end of file diff --git a/src/s2d_engine/s2d_error.h b/src/s2d_engine/s2d_error.h index d4b5703a..6810b06b 100644 --- a/src/s2d_engine/s2d_error.h +++ b/src/s2d_engine/s2d_error.h @@ -1,9 +1,6 @@ -#ifndef S2D_ERROR_H -#define S2D_ERROR_H +#pragma once extern int s2d_check_align(int align); extern int s2d_check_str(const char *str); extern int s2d_error_y; - -#endif \ No newline at end of file diff --git a/src/usb/debug.h b/src/usb/debug.h index d9c2f583..98126c3d 100644 --- a/src/usb/debug.h +++ b/src/usb/debug.h @@ -1,156 +1,153 @@ -#ifndef UNFL_DEBUG_H -#define UNFL_DEBUG_H +#pragma once - /********************************* - Settings macros - *********************************/ +/********************************* + Settings macros +*********************************/ - // Settings - #define DEBUG_MODE 1 // Enable/Disable debug mode - #define DEBUG_INIT_MSG 1 // Print a message when debug mode has initialized - #define USE_FAULTTHREAD 1 // Create a fault detection thread (libultra only) - #define OVERWRITE_OSPRINT 1 // Replaces osSyncPrintf calls with debug_printf (libultra only) - #define MAX_COMMANDS 25 // The max amount of user defined commands possible +// Settings +#define DEBUG_MODE 1 // Enable/Disable debug mode +#define DEBUG_INIT_MSG 1 // Print a message when debug mode has initialized +#define USE_FAULTTHREAD 1 // Create a fault detection thread (libultra only) +#define OVERWRITE_OSPRINT 1 // Replaces osSyncPrintf calls with debug_printf (libultra only) +#define MAX_COMMANDS 25 // The max amount of user defined commands possible - // Fault thread definitions (libultra only) - #define FAULT_THREAD_ID 13 - #define FAULT_THREAD_PRI 125 - #define FAULT_THREAD_STACK 0x2000 +// Fault thread definitions (libultra only) +#define FAULT_THREAD_ID 13 +#define FAULT_THREAD_PRI 125 +#define FAULT_THREAD_STACK 0x2000 - // USB thread definitions (libultra only) - #define USB_THREAD_ID 14 - #define USB_THREAD_PRI 126 - #define USB_THREAD_STACK 0x2000 +// USB thread definitions (libultra only) +#define USB_THREAD_ID 14 +#define USB_THREAD_PRI 126 +#define USB_THREAD_STACK 0x2000 - /********************************* - Debug Functions - *********************************/ +/********************************* + Debug Functions +*********************************/ - #if DEBUG_MODE +#if DEBUG_MODE - /*============================== - debug_initialize - Initializes the debug and USB library. - ==============================*/ + /*============================== + debug_initialize + Initializes the debug and USB library. + ==============================*/ - extern void debug_initialize(); + extern void debug_initialize(); - /*============================== - debug_printf - Prints a formatted message to the developer's command prompt. - Supports up to 256 characters. - @param A string to print - @param variadic arguments to print as well - ==============================*/ + /*============================== + debug_printf + Prints a formatted message to the developer's command prompt. + Supports up to 256 characters. + @param A string to print + @param variadic arguments to print as well + ==============================*/ - extern void debug_printf(const char* message, ...); + extern void debug_printf(const char* message, ...); - /*============================== - debug_dumpbinary - Dumps a binary file through USB - @param The file to dump - @param The size of the file - ==============================*/ + /*============================== + debug_dumpbinary + Dumps a binary file through USB + @param The file to dump + @param The size of the file + ==============================*/ - extern void debug_dumpbinary(void* file, int size); + extern void debug_dumpbinary(void* file, int size); - /*============================== - debug_screenshot - Sends the currently displayed framebuffer through USB. - DOES NOT PAUSE DRAWING THREAD! Using outside the drawing - thread may lead to a screenshot with visible tearing - ==============================*/ + /*============================== + debug_screenshot + Sends the currently displayed framebuffer through USB. + DOES NOT PAUSE DRAWING THREAD! Using outside the drawing + thread may lead to a screenshot with visible tearing + ==============================*/ - extern void debug_screenshot(); + extern void debug_screenshot(); - /*============================== - debug_assert - Halts the program if the expression fails. - @param The expression to test - ==============================*/ + /*============================== + debug_assert + Halts the program if the expression fails. + @param The expression to test + ==============================*/ - #define debug_assert(expr) (expr) ? ((void)0) : _debug_assert(#expr, __FILE__, __LINE__) + #define debug_assert(expr) (expr) ? ((void)0) : _debug_assert(#expr, __FILE__, __LINE__) - /*============================== - debug_pollcommands - Check the USB for incoming commands. - ==============================*/ + /*============================== + debug_pollcommands + Check the USB for incoming commands. + ==============================*/ - extern void debug_pollcommands(); + extern void debug_pollcommands(); - /*============================== - debug_addcommand - Adds a command for the USB to read. - @param The command name - @param The command description - @param The function pointer to execute - ==============================*/ + /*============================== + debug_addcommand + Adds a command for the USB to read. + @param The command name + @param The command description + @param The function pointer to execute + ==============================*/ - extern void debug_addcommand(char* command, char* description, char*(*execute)()); + extern void debug_addcommand(char* command, char* description, char*(*execute)()); - /*============================== - debug_parsecommand - Stores the next part of the incoming command into the provided buffer. - Make sure the buffer can fit the amount of data from debug_sizecommand! - If you pass NULL, it skips this command. - @param The buffer to store the data in - ==============================*/ + /*============================== + debug_parsecommand + Stores the next part of the incoming command into the provided buffer. + Make sure the buffer can fit the amount of data from debug_sizecommand! + If you pass NULL, it skips this command. + @param The buffer to store the data in + ==============================*/ - extern void debug_parsecommand(void* buffer); + extern void debug_parsecommand(void* buffer); - /*============================== - debug_sizecommand - Returns the size of the data from this part of the command. - @return The size of the data in bytes, or 0 - ==============================*/ + /*============================== + debug_sizecommand + Returns the size of the data from this part of the command. + @return The size of the data in bytes, or 0 + ==============================*/ - extern int debug_sizecommand(); + extern int debug_sizecommand(); - /*============================== - debug_printcommands - Prints a list of commands to the developer's command prompt. - ==============================*/ + /*============================== + debug_printcommands + Prints a list of commands to the developer's command prompt. + ==============================*/ - extern void debug_printcommands(); + extern void debug_printcommands(); - // Ignore this, use the macro instead - extern void _debug_assert(const char* expression, const char* file, int line); + // Ignore this, use the macro instead + extern void _debug_assert(const char* expression, const char* file, int line); - // Include usb.h automatically - #include "usb.h" + // Include usb.h automatically + #include "usb.h" - #else +#else - // Overwrite library functions with useless macros if debug mode is disabled - #define debug_initialize() - #define debug_printf(__VA_ARGS__) - #define debug_screenshot(a, b, c) - #define debug_assert(a) - #define debug_pollcommands() - #define debug_addcommand(a, b, c) - #define debug_parsecommand() NULL - #define debug_sizecommand() 0 - #define debug_printcommands() - #define usb_initialize() 0 - #define usb_getcart() 0 - #define usb_write(a, b, c) - #define usb_poll() 0 - #define usb_read(a, b) - #define usb_skip(a) - #define usb_rewind(a) - #define usb_purge() + // Overwrite library functions with useless macros if debug mode is disabled + #define debug_initialize() + #define debug_printf(__VA_ARGS__) + #define debug_screenshot(a, b, c) + #define debug_assert(a) + #define debug_pollcommands() + #define debug_addcommand(a, b, c) + #define debug_parsecommand() NULL + #define debug_sizecommand() 0 + #define debug_printcommands() + #define usb_initialize() 0 + #define usb_getcart() 0 + #define usb_write(a, b, c) + #define usb_poll() 0 + #define usb_read(a, b) + #define usb_skip(a) + #define usb_rewind(a) + #define usb_purge() - #endif - -#endif \ No newline at end of file +#endif diff --git a/src/usb/usb.h b/src/usb/usb.h index bcbe812b..fce824e8 100644 --- a/src/usb/usb.h +++ b/src/usb/usb.h @@ -1,121 +1,118 @@ -#ifndef UNFL_USB_H -#define UNFL_USB_H +#pragma once - /********************************* - DataType macros - *********************************/ +/********************************* + DataType macros +*********************************/ - // UNCOMMENT THE #DEFINE IF USING LIBDRAGON - //#define LIBDRAGON +// UNCOMMENT THE #DEFINE IF USING LIBDRAGON +//#define LIBDRAGON - // Settings - #define USE_OSRAW 0 // Use if you're doing USB operations without the PI Manager (libultra only) - #define DEBUG_ADDRESS_SIZE 8*1024*1024 // Max size of USB I/O. The bigger this value, the more ROM you lose! +// Settings +#define USE_OSRAW 0 // Use if you're doing USB operations without the PI Manager (libultra only) +#define DEBUG_ADDRESS_SIZE 8*1024*1024 // Max size of USB I/O. The bigger this value, the more ROM you lose! - // Cart definitions - #define CART_NONE 0 - #define CART_64DRIVE 1 - #define CART_EVERDRIVE 2 - #define CART_SC64 3 +// Cart definitions +#define CART_NONE 0 +#define CART_64DRIVE 1 +#define CART_EVERDRIVE 2 +#define CART_SC64 3 - // Data types defintions - #define DATATYPE_TEXT 0x01 - #define DATATYPE_RAWBINARY 0x02 - #define DATATYPE_HEADER 0x03 - #define DATATYPE_SCREENSHOT 0x04 +// Data types defintions +#define DATATYPE_TEXT 0x01 +#define DATATYPE_RAWBINARY 0x02 +#define DATATYPE_HEADER 0x03 +#define DATATYPE_SCREENSHOT 0x04 - extern int usb_datatype; - extern int usb_datasize; - extern int usb_dataleft; - extern int usb_readblock; +extern int usb_datatype; +extern int usb_datasize; +extern int usb_dataleft; +extern int usb_readblock; - /********************************* - Convenience macros - *********************************/ +/********************************* + Convenience macros +*********************************/ - // Use these to conveniently read the header from usb_poll() - #define USBHEADER_GETTYPE(header) ((header & 0xFF000000) >> 24) - #define USBHEADER_GETSIZE(header) ((header & 0x00FFFFFF)) +// Use these to conveniently read the header from usb_poll() +#define USBHEADER_GETTYPE(header) ((header & 0xFF000000) >> 24) +#define USBHEADER_GETSIZE(header) ((header & 0x00FFFFFF)) - /********************************* - USB Functions - *********************************/ +/********************************* + USB Functions +*********************************/ - /*============================== - usb_initialize - Initializes the USB buffers and pointers - @return 1 if the USB initialization was successful, 0 if not - ==============================*/ +/*============================== + usb_initialize + Initializes the USB buffers and pointers + @return 1 if the USB initialization was successful, 0 if not +==============================*/ - extern char usb_initialize(); +extern char usb_initialize(); - /*============================== - usb_getcart - Returns which flashcart is currently connected - @return The CART macro that corresponds to the identified flashcart - ==============================*/ +/*============================== + usb_getcart + Returns which flashcart is currently connected + @return The CART macro that corresponds to the identified flashcart +==============================*/ - extern char usb_getcart(); +extern char usb_getcart(); - /*============================== - usb_write - Writes data to the USB. - Will not write if there is data to read from USB - @param The DATATYPE that is being sent - @param A buffer with the data to send - @param The size of the data being sent - ==============================*/ +/*============================== + usb_write + Writes data to the USB. + Will not write if there is data to read from USB + @param The DATATYPE that is being sent + @param A buffer with the data to send + @param The size of the data being sent +==============================*/ - extern void usb_write(int datatype, const void* data, int size); +extern void usb_write(int datatype, const void* data, int size); - /*============================== - usb_poll - Returns the header of data being received via USB - The first byte contains the data type, the next 3 the number of bytes left to read - @return The data header, or 0 - ==============================*/ +/*============================== + usb_poll + Returns the header of data being received via USB + The first byte contains the data type, the next 3 the number of bytes left to read + @return The data header, or 0 +==============================*/ - extern unsigned long usb_poll(); +extern unsigned long usb_poll(); - /*============================== - usb_read - Reads bytes from USB into the provided buffer - @param The buffer to put the read data in - @param The number of bytes to read - ==============================*/ +/*============================== + usb_read + Reads bytes from USB into the provided buffer + @param The buffer to put the read data in + @param The number of bytes to read +==============================*/ - extern void usb_read(void* buffer, int size); +extern void usb_read(void* buffer, int size); - /*============================== - usb_skip - Skips a USB read by the specified amount of bytes - @param The number of bytes to skip - ==============================*/ +/*============================== + usb_skip + Skips a USB read by the specified amount of bytes + @param The number of bytes to skip +==============================*/ - extern void usb_skip(int nbytes); +extern void usb_skip(int nbytes); - /*============================== - usb_rewind - Rewinds a USB read by the specified amount of bytes - @param The number of bytes to rewind - ==============================*/ +/*============================== + usb_rewind + Rewinds a USB read by the specified amount of bytes + @param The number of bytes to rewind +==============================*/ - extern void usb_rewind(int nbytes); +extern void usb_rewind(int nbytes); - /*============================== - usb_purge - Purges the incoming USB data - ==============================*/ +/*============================== + usb_purge + Purges the incoming USB data +==============================*/ - extern void usb_purge(); - -#endif \ No newline at end of file +extern void usb_purge(); diff --git a/tools/hashtable.h b/tools/hashtable.h index 91e5460e..7a353bb0 100644 --- a/tools/hashtable.h +++ b/tools/hashtable.h @@ -1,5 +1,4 @@ -#ifndef HASHTABLE_H_ -#define HASHTABLE_H_ +#pragma once typedef unsigned int (*HashFunc)(const void *item); typedef int (*HashValueCmpFunc)(const void *a, const void *b); @@ -9,5 +8,3 @@ struct HashTable *hashtable_new(HashFunc func, HashValueCmpFunc cmp, int size, i void hashtable_free(struct HashTable *ht); void hashtable_insert(struct HashTable *ht, const void *value); void *hashtable_query(struct HashTable *ht, const void *value); - -#endif // HASHTABLE_H_ diff --git a/tools/libmio0.h b/tools/libmio0.h index 5b38ac77..75775205 100644 --- a/tools/libmio0.h +++ b/tools/libmio0.h @@ -1,5 +1,4 @@ -#ifndef LIBMIO0_H_ -#define LIBMIO0_H_ +#pragma once // defines @@ -46,5 +45,3 @@ int mio0_decode_file(const char *in_file, unsigned long offset, const char *out_ // in_file: input filename containing raw data to be encoded // out_file: output filename to write MIO0 compressed data to int mio0_encode_file(const char *in_file, const char *out_file); - -#endif // LIBMIO0_H_ diff --git a/tools/n64cksum.h b/tools/n64cksum.h index cf6b9ba4..9125a37d 100644 --- a/tools/n64cksum.h +++ b/tools/n64cksum.h @@ -1,5 +1,4 @@ -#ifndef N64CKSUM_H_ -#define N64CKSUM_H_ +#pragma once #include @@ -12,5 +11,3 @@ void n64cksum_calc_6102(unsigned char *buf, unsigned int cksum[]); // buf: buffer containing ROM data // checksums are written into the buffer void n64cksum_update_checksums(uint8_t *buf); - -#endif // N64CKSUM_H_ diff --git a/tools/n64graphics.h b/tools/n64graphics.h index 9ced50e7..61cf33c7 100644 --- a/tools/n64graphics.h +++ b/tools/n64graphics.h @@ -1,5 +1,4 @@ -#ifndef N64GRAPHICS_H_ -#define N64GRAPHICS_H_ +#pragma once #include @@ -96,5 +95,3 @@ const char *n64graphics_get_read_version(void); // get version of underlying graphics writing library const char *n64graphics_get_write_version(void); - -#endif // N64GRAPHICS_H_ diff --git a/tools/n64graphics_ci_dir/n64graphics_ci.h b/tools/n64graphics_ci_dir/n64graphics_ci.h index 91423143..6bb16c01 100644 --- a/tools/n64graphics_ci_dir/n64graphics_ci.h +++ b/tools/n64graphics_ci_dir/n64graphics_ci.h @@ -1,5 +1,4 @@ -#ifndef N64GRAPHICS_CI_H_ -#define N64GRAPHICS_CI_H_ +#pragma once #include @@ -38,5 +37,3 @@ const char *n64graphics_get_read_version(void); // get version of underlying graphics writing library const char *n64graphics_get_write_version(void); - -#endif diff --git a/tools/n64graphics_ci_dir/utils.h b/tools/n64graphics_ci_dir/utils.h index f038653f..4e80bfb0 100644 --- a/tools/n64graphics_ci_dir/utils.h +++ b/tools/n64graphics_ci_dir/utils.h @@ -1,5 +1,4 @@ -#ifndef UTILS_H_ -#define UTILS_H_ +#pragma once #include @@ -149,5 +148,3 @@ void dir_list_free(dir_list *list); // suffix: string to see if 'str' ends with // returns 1 if 'str' ends with 'suffix' int str_ends_with(const char *str, const char *suffix); - -#endif // UTILS_H_ diff --git a/tools/utf8.h b/tools/utf8.h index 113bb73e..69a38226 100644 --- a/tools/utf8.h +++ b/tools/utf8.h @@ -1,6 +1,3 @@ -#ifndef UTF8_H_ -#define UTF8_H_ +#pragma once char *utf8_decode(char *str, uint32_t *codep); - -#endif // UTF8_H_ diff --git a/tools/utils.h b/tools/utils.h index f5675f03..0b5a1a02 100644 --- a/tools/utils.h +++ b/tools/utils.h @@ -1,5 +1,4 @@ -#ifndef UTILS_H_ -#define UTILS_H_ +#pragma once #include #include @@ -148,5 +147,3 @@ void dir_list_free(dir_list *list); // suffix: string to see if 'str' ends with // returns 1 if 'str' ends with 'suffix' int str_ends_with(const char *str, const char *suffix); - -#endif // UTILS_H_