From b1161c2ce85702abae79f5da4c64d7d145be598d Mon Sep 17 00:00:00 2001 From: coco875 <59367621+coco875@users.noreply.github.com> Date: Thu, 1 Aug 2024 05:10:19 +0200 Subject: [PATCH] fix typo include (#658) Co-authored-by: MegaMech --- include/PR/gu.h | 2 +- include/PR/os.h | 2 +- include/PR/ultratypes.h | 1 + include/bomb_kart.h | 2 +- include/common_structs.h | 2 +- include/decode.h | 2 +- include/libc/stddef.h | 2 +- include/libc/string.h | 2 +- include/objects.h | 2 +- include/save_data.h | 2 +- include/spline.h | 2 +- include/vehicles.h | 2 +- include/waypoints.h | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/PR/gu.h b/include/PR/gu.h index 9b34e19f0..7d3a2ee10 100644 --- a/include/PR/gu.h +++ b/include/PR/gu.h @@ -3,7 +3,7 @@ #include #include -#include "common_structs.h" +#include #define GU_PI 3.1415926 /* Functions */ diff --git a/include/PR/os.h b/include/PR/os.h index e710ccaa8..f36d17bda 100644 --- a/include/PR/os.h +++ b/include/PR/os.h @@ -36,7 +36,7 @@ extern "C" { #endif #include -#include "PR/os_message.h" +#include #if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) diff --git a/include/PR/ultratypes.h b/include/PR/ultratypes.h index 593a5fe39..3bcef2544 100644 --- a/include/PR/ultratypes.h +++ b/include/PR/ultratypes.h @@ -38,6 +38,7 @@ typedef double f64; typedef u32 size_t; typedef s32 ssize_t; typedef u32 uintptr_t; +typedef u8 uint8_t; typedef s32 intptr_t; typedef s32 ptrdiff_t; #else diff --git a/include/bomb_kart.h b/include/bomb_kart.h index 6f8bea8ca..528183949 100644 --- a/include/bomb_kart.h +++ b/include/bomb_kart.h @@ -1,7 +1,7 @@ #ifndef BOMB_KART_H #define BOMB_KART_H -#include "common_structs.h" +#include #include #define NUM_BOMB_KARTS_MAX 7 diff --git a/include/common_structs.h b/include/common_structs.h index 616889954..1c0bdb83e 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1,7 +1,7 @@ #ifndef _COMMON_STRUCTS_H_ #define _COMMON_STRUCTS_H_ -#include "ultra64.h" +#include typedef f32 Vec3f[3]; typedef f32 Vec4f[4]; diff --git a/include/decode.h b/include/decode.h index 0ea4f7b91..9577da7fb 100644 --- a/include/decode.h +++ b/include/decode.h @@ -1,7 +1,7 @@ #ifndef _FUNCTIONS_H_ #define _FUNCTIONS_H_ -#include "common_structs.h" +#include void mio0decode(u8* arg0, u8* arg1); diff --git a/include/libc/stddef.h b/include/libc/stddef.h index 7e72a7bb6..c31698cea 100644 --- a/include/libc/stddef.h +++ b/include/libc/stddef.h @@ -1,7 +1,7 @@ #ifndef STDDEF_H #define STDDEF_H -#include "PR/ultratypes.h" +#include #ifndef offsetof #define offsetof(st, m) ((size_t)&(((st *)0)->m)) diff --git a/include/libc/string.h b/include/libc/string.h index 183409eb5..f959a566a 100644 --- a/include/libc/string.h +++ b/include/libc/string.h @@ -1,7 +1,7 @@ #ifndef STRING_H #define STRING_H -#include "PR/ultratypes.h" +#include void *memcpy(void *dst, const void *src, size_t size); size_t strlen(const char *str); diff --git a/include/objects.h b/include/objects.h index 91e5f4cb5..89764390b 100644 --- a/include/objects.h +++ b/include/objects.h @@ -2,7 +2,7 @@ #define OBJECTS_H #include "spline.h" -#include "common_structs.h" +#include #define OBJECT_LIST_SIZE 0x226 #define SOME_OBJECT_INDEX_LIST_SIZE 32 diff --git a/include/save_data.h b/include/save_data.h index 78495bba5..38d82c287 100644 --- a/include/save_data.h +++ b/include/save_data.h @@ -1,7 +1,7 @@ #ifndef SAVE_DATA_H #define SAVE_DATA_H -#include "common_structs.h" +#include typedef struct { // 6 little endian 3-byte records. diff --git a/include/spline.h b/include/spline.h index 525faa6fa..a7f4d0c3b 100644 --- a/include/spline.h +++ b/include/spline.h @@ -1,7 +1,7 @@ #ifndef SPLINE_H #define SPLINE_H -#include "common_structs.h" +#include /* These are some very good videos about splines/Bezier curves in general diff --git a/include/vehicles.h b/include/vehicles.h index 17e80587e..87f0f2a39 100644 --- a/include/vehicles.h +++ b/include/vehicles.h @@ -1,7 +1,7 @@ #ifndef VEHICLES_H #define VEHICLES_H -#include "common_structs.h" +#include #define NUM_1P_PASSENGER_CARS 4 #define NUM_2P_PASSENGER_CARS 1 diff --git a/include/waypoints.h b/include/waypoints.h index bc5ef3237..9fc38dbd6 100644 --- a/include/waypoints.h +++ b/include/waypoints.h @@ -1,7 +1,7 @@ #ifndef WAYPOINTS_H #define WAYPOINTS_H -#include "common_structs.h" +#include typedef struct { /* 0x00 */ s16 posX;