From 3285da57dc15e3e5ae1cadb37f2dfbd5d627a986 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 24 May 2025 02:41:19 +0200 Subject: [PATCH] include libc headers without libc/ prefix --- include/audio/soundfont_file.h | 2 +- include/inflate.h | 4 ++-- include/is_debug.h | 2 +- include/sfx.h | 2 +- include/ultra64.h | 16 ++++++++-------- include/yaz0.h | 4 ++-- include/z64ss_sram.h | 2 +- include/z_lib.h | 2 +- src/boot/inflate.c | 4 ++-- src/libleo/api/cacreateleomanager.c | 2 +- src/libleo/api/cjcreateleomanager.c | 2 +- src/libultra/bb/sa/common.c | 2 +- .../gamestates/ovl_file_choose/file_select.h | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/audio/soundfont_file.h b/include/audio/soundfont_file.h index 3f320a6e56..9456429774 100644 --- a/include/audio/soundfont_file.h +++ b/include/audio/soundfont_file.h @@ -1,7 +1,7 @@ #ifndef SOUNDFONT_FILE_H #define SOUNDFONT_FILE_H -#include "libc/stdbool.h" +#include "stdbool.h" #include "alignment.h" #include "attributes.h" #include "z64audio.h" diff --git a/include/inflate.h b/include/inflate.h index f26f7e496b..6da7255f55 100644 --- a/include/inflate.h +++ b/include/inflate.h @@ -1,8 +1,8 @@ #ifndef INFLATE_H #define INFLATE_H -#include "libc/stddef.h" -#include "libc/stdint.h" +#include "stddef.h" +#include "stdint.h" #include "ultra64.h" void gzip_decompress(uintptr_t romStart, u8* dst, size_t size); diff --git a/include/is_debug.h b/include/is_debug.h index e5f03bb784..18125dc16c 100644 --- a/include/is_debug.h +++ b/include/is_debug.h @@ -1,7 +1,7 @@ #ifndef IS_DEBUG_H #define IS_DEBUG_H -#include "libc/stddef.h" +#include "stddef.h" #include "attributes.h" #if DEBUG_FEATURES diff --git a/include/sfx.h b/include/sfx.h index 4dfb96f9b4..f7d86d87ac 100644 --- a/include/sfx.h +++ b/include/sfx.h @@ -4,7 +4,7 @@ #include "ultra64.h" #include "versions.h" #include "z64math.h" -#include "libc/assert.h" +#include "assert.h" #define MAX_CHANNELS_PER_BANK 3 diff --git a/include/ultra64.h b/include/ultra64.h index 4a8696a841..c7607ac921 100644 --- a/include/ultra64.h +++ b/include/ultra64.h @@ -1,14 +1,14 @@ #ifndef ULTRA64_H #define ULTRA64_H -#include "libc/assert.h" -#include "libc/math.h" -#include "libc/stdarg.h" -#include "libc/stdbool.h" -#include "libc/stddef.h" -#include "libc/stdint.h" -#include "libc/stdlib.h" -#include "libc/string.h" +#include "assert.h" +#include "math.h" +#include "stdarg.h" +#include "stdbool.h" +#include "stddef.h" +#include "stdint.h" +#include "stdlib.h" +#include "string.h" #include "ultra64/ultratypes.h" #include "unk.h" diff --git a/include/yaz0.h b/include/yaz0.h index 52f5ba951e..b42c8e3ff8 100644 --- a/include/yaz0.h +++ b/include/yaz0.h @@ -1,8 +1,8 @@ #ifndef YAZ0_H #define YAZ0_H -#include "libc/stddef.h" -#include "libc/stdint.h" +#include "stddef.h" +#include "stdint.h" #include "ultra64.h" void Yaz0_Decompress(uintptr_t romStart, u8* dst, size_t size); diff --git a/include/z64ss_sram.h b/include/z64ss_sram.h index ffd628239d..4168446263 100644 --- a/include/z64ss_sram.h +++ b/include/z64ss_sram.h @@ -1,7 +1,7 @@ #ifndef Z64SS_SRAM_H #define Z64SS_SRAM_H -#include "libc/stddef.h" +#include "stddef.h" #include "ultra64/ultratypes.h" void SsSram_Init(s32 addr, u8 handleType, u8 handleDomain, u8 handleLatency, u8 handlePageSize, u8 handleRelDuration, diff --git a/include/z_lib.h b/include/z_lib.h index 1e9052f93b..24fa806914 100644 --- a/include/z_lib.h +++ b/include/z_lib.h @@ -1,7 +1,7 @@ #ifndef Z_LIB_H #define Z_LIB_H -#include "libc/stddef.h" +#include "stddef.h" #include "libu64/pad.h" #include "z64math.h" #include "color.h" diff --git a/src/boot/inflate.c b/src/boot/inflate.c index 391ce0368f..d9fc7c3f8d 100644 --- a/src/boot/inflate.c +++ b/src/boot/inflate.c @@ -98,8 +98,8 @@ #include "inflate.h" #include "ultra64/ultratypes.h" -#include "libc/stddef.h" -#include "libc/stdint.h" +#include "stddef.h" +#include "stdint.h" #include "alignment.h" #include "attributes.h" #include "z64dma.h" diff --git a/src/libleo/api/cacreateleomanager.c b/src/libleo/api/cacreateleomanager.c index d4f6f5100b..4ae1c7bd9e 100644 --- a/src/libleo/api/cacreateleomanager.c +++ b/src/libleo/api/cacreateleomanager.c @@ -2,7 +2,7 @@ #include "ultra64/leo.h" #include "ultra64/leoappli.h" #include "ultra64/leodrive.h" -#include "libc/stdint.h" +#include "stdint.h" #include "attributes.h" #include "ultra64.h" diff --git a/src/libleo/api/cjcreateleomanager.c b/src/libleo/api/cjcreateleomanager.c index 23f9da8226..1daf54ca12 100644 --- a/src/libleo/api/cjcreateleomanager.c +++ b/src/libleo/api/cjcreateleomanager.c @@ -2,7 +2,7 @@ #include "ultra64/leo.h" #include "ultra64/leoappli.h" #include "ultra64/leodrive.h" -#include "libc/stdint.h" +#include "stdint.h" #include "attributes.h" #include "ultra64.h" diff --git a/src/libultra/bb/sa/common.c b/src/libultra/bb/sa/common.c index 667af02b7f..a18735f4a5 100644 --- a/src/libultra/bb/sa/common.c +++ b/src/libultra/bb/sa/common.c @@ -1,4 +1,4 @@ -#include "libc/stddef.h" +#include "stddef.h" int strcmp(const char* s, const char* t) { while (*s == *t) { diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h index ae41c4dced..69d71f71d5 100644 --- a/src/overlays/gamestates/ovl_file_choose/file_select.h +++ b/src/overlays/gamestates/ovl_file_choose/file_select.h @@ -1,7 +1,7 @@ #ifndef FILE_SELECT_H #define FILE_SELECT_H -#include "libc/stddef.h" +#include "stddef.h" #include "ultra64.h" #include "gfx.h" #include "versions.h"