From 195f6d1125c3480abde8145321d7b2da7bb8c145 Mon Sep 17 00:00:00 2001 From: Antonio Date: Tue, 30 Nov 2021 18:41:54 -0800 Subject: [PATCH] Updated #include guards. --- include/audio_internal.h | 4 ++-- include/controller.h | 5 +++-- include/libultra_internal.h | 1 + include/sched.h | 1 + include/siint.h | 5 +++-- include/ultra64.h | 1 - include/viint.h | 5 +++-- src/asset_loading.h | 4 ++-- src/audio.h | 4 ++-- src/camera.h | 4 ++-- src/controller_pak.h | 4 ++-- src/menu.h | 4 ++-- src/object_models.h | 4 ++-- src/textures_sprites.h | 4 ++-- src/unknown_0ABDF0.h | 4 ++-- 15 files changed, 29 insertions(+), 25 deletions(-) diff --git a/include/audio_internal.h b/include/audio_internal.h index e1790d48..95e104a3 100644 --- a/include/audio_internal.h +++ b/include/audio_internal.h @@ -1,5 +1,5 @@ -#ifndef _AUDIO_INTERNAL_H -#define _AUDIO_INTERNAL_H +#ifndef _AUDIO_INTERNAL_H_ +#define _AUDIO_INTERNAL_H_ #include "PR/libaudio.h" diff --git a/include/controller.h b/include/controller.h index 7b0f66be..3da78fa4 100644 --- a/include/controller.h +++ b/include/controller.h @@ -1,5 +1,6 @@ -#ifndef _CONTROLLER_H -#define _CONTROLLER_H +#ifndef _CONTROLLER_H_ +#define _CONTROLLER_H_ + #include "libultra_internal.h" //#include diff --git a/include/libultra_internal.h b/include/libultra_internal.h index d39c66d6..df20d090 100644 --- a/include/libultra_internal.h +++ b/include/libultra_internal.h @@ -1,5 +1,6 @@ #ifndef _LIBULTRA_INTERNAL_H_ #define _LIBULTRA_INTERNAL_H_ + #include #endif diff --git a/include/sched.h b/include/sched.h index 74f51d5d..44d8d8bc 100644 --- a/include/sched.h +++ b/include/sched.h @@ -1,5 +1,6 @@ #ifndef _SCHED_H_ #define _SCHED_H_ + #include "types.h" #include "macros.h" #include "f3ddkr.h" diff --git a/include/siint.h b/include/siint.h index 9ce09884..e9fb2b83 100644 --- a/include/siint.h +++ b/include/siint.h @@ -1,5 +1,6 @@ -#ifndef _SIINT_H -#define _SIINT_H +#ifndef _SIINT_H_ +#define _SIINT_H_ + #include "PR/os_internal.h" #include "PR/rcp.h" diff --git a/include/ultra64.h b/include/ultra64.h index b61d4b35..e6e3b468 100644 --- a/include/ultra64.h +++ b/include/ultra64.h @@ -1,4 +1,3 @@ - #ifndef _ULTRA64_H_ #define _ULTRA64_H_ diff --git a/include/viint.h b/include/viint.h index 74cee418..3578fb3e 100644 --- a/include/viint.h +++ b/include/viint.h @@ -1,5 +1,6 @@ -#ifndef _VIINT_H -#define _VIINT_H +#ifndef _VIINT_H_ +#define _VIINT_H_ + #include "libultra_internal.h" #define OS_TV_TYPE_PAL 0 diff --git a/src/asset_loading.h b/src/asset_loading.h index d0ec4648..2efbc112 100644 --- a/src/asset_loading.h +++ b/src/asset_loading.h @@ -1,5 +1,5 @@ -#ifndef _UNKNOWN_0777A0_H_ -#define _UNKNOWN_0777A0_H_ +#ifndef _ASSET_LOADING_H_ +#define _ASSET_LOADING_H_ #include "types.h" #include "gzip.h" diff --git a/src/audio.h b/src/audio.h index 32fda725..f968978a 100644 --- a/src/audio.h +++ b/src/audio.h @@ -1,5 +1,5 @@ -#ifndef _UNKNOWN_001050_H_ -#define _UNKNOWN_001050_H_ +#ifndef _AUDIO_H_ +#define _AUDIO_H_ #include "types.h" #include "audio_internal.h" diff --git a/src/camera.h b/src/camera.h index c5303459..c606842c 100644 --- a/src/camera.h +++ b/src/camera.h @@ -1,5 +1,5 @@ -#ifndef _UNKNOWN_066AA0_H_ -#define _UNKNOWN_066AA0_H_ +#ifndef _CAMERA_H_ +#define _CAMERA_H_ #include "types.h" #include "macros.h" diff --git a/src/controller_pak.h b/src/controller_pak.h index 65a67f31..4d1e59ab 100644 --- a/src/controller_pak.h +++ b/src/controller_pak.h @@ -1,5 +1,5 @@ -#ifndef _UNKNOWN_072E50_H_ -#define _UNKNOWN_072E50_H_ +#ifndef _CONTROLLER_PAK_H_ +#define _CONTROLLER_PAK_H_ #include "types.h" #include "structs.h" diff --git a/src/menu.h b/src/menu.h index c0f41ccf..2df2b9ca 100644 --- a/src/menu.h +++ b/src/menu.h @@ -1,5 +1,5 @@ -#ifndef _UNKNOWN_080500_H_ -#define _UNKNOWN_080500_H_ +#ifndef _MENU_H_ +#define _MENU_H_ #include "types.h" #include "structs.h" diff --git a/src/object_models.h b/src/object_models.h index 4a2eed19..77def6e7 100644 --- a/src/object_models.h +++ b/src/object_models.h @@ -1,5 +1,5 @@ -#ifndef _UNKNOWN_060450_H_ -#define _UNKNOWN_060450_H_ +#ifndef _OBJECT_MODELS_H_ +#define _OBJECT_MODELS_H_ #include "types.h" #include "PR/gbi.h" diff --git a/src/textures_sprites.h b/src/textures_sprites.h index 737b2e4c..5bdd4565 100644 --- a/src/textures_sprites.h +++ b/src/textures_sprites.h @@ -1,5 +1,5 @@ -#ifndef _UNKNOWN_07B870_H_ -#define _UNKNOWN_07B870_H_ +#ifndef _TEXTURES_SPRITES_H_ +#define _TEXTURES_SPRITES_H_ #include "asset_sections.h" #include "types.h" diff --git a/src/unknown_0ABDF0.h b/src/unknown_0ABDF0.h index e1d883c7..091976e2 100644 --- a/src/unknown_0ABDF0.h +++ b/src/unknown_0ABDF0.h @@ -1,5 +1,5 @@ -#ifndef _THREAD30_H_ -#define _THREAD30_H_ +#ifndef _UNKNOWN_0ABDF0_H_ +#define _UNKNOWN_0ABDF0_H_ #include "types.h" #include "textures_sprites.h"