diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2026-09-16 09:01:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-16 09:01:55 -0600 |
| commit | 60ac50c9628d25968bfe367e1b4b6f030078be64 (patch) | |
| tree | e03a0d825cfe443adcf076cb643c20692151f431 /include | |
| parent | 7adfdaa9abb18d76ae80f26bff58c2c4dc4f3f29 (diff) | |
| parent | 8fb42e50d70356300050048b57def3123e6d4552 (diff) | |
Merge branch 'main' into Caladius-patch-1Caladius-patch-1
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc/math.h | 2 | ||||
| -rw-r--r-- | include/macros.h | 2 | ||||
| -rw-r--r-- | include/stubs.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/libc/math.h b/include/libc/math.h index 8cea459bf..1f2e97736 100644 --- a/include/libc/math.h +++ b/include/libc/math.h @@ -1,7 +1,9 @@ #ifndef MATH_H #define MATH_H +#ifndef M_PI #define M_PI 3.14159265358979323846 +#endif float sinf(float); double sin(double); diff --git a/include/macros.h b/include/macros.h index d0b8d94fc..cedbb769c 100644 --- a/include/macros.h +++ b/include/macros.h @@ -128,7 +128,7 @@ #if IS_BIG_ENDIAN #define BSWAP16(x) (x) #else -#define BSWAP16(x) (((x) & 0xff) << 8 | (((x) >> 8) & 0xff)) +#include "ship/utils/binarytools/endianness.h" #endif #endif diff --git a/include/stubs.h b/include/stubs.h index 0ced258fd..208a87911 100644 --- a/include/stubs.h +++ b/include/stubs.h @@ -14,7 +14,7 @@ void func_80040030(u8* arg0, u8* arg1); void func_80040174(void*, s32, s32); s32 osAiSetFrequency(u32 freq); void mio0decode(u8* arg0, u8* arg1); -s32 mio0encode(s32 input, s32, s32); +s32 mio0encode(uintptr_t input, s32, uintptr_t); void osStartThread(OSThread* thread); void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri); void osInitialize(void); |