mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-09-01 16:29:55 -04:00
updating variable argument headers & minor fixes for register statement and header file placement
This commit is contained in:
@@ -59,7 +59,11 @@ void GDSetChanCtrl(GXChannelID chan, u8 enable, GXColorSrc amb_src,
|
||||
inline static u16 __GDLightID2Index(GXLightID id) {
|
||||
u16 idx;
|
||||
|
||||
#ifdef __MWERKS__
|
||||
idx = 0x1F - __cntlzw(id);
|
||||
#else
|
||||
idx = 0x1F - __builtin_clz(id);
|
||||
#endif
|
||||
if (idx > 7) {
|
||||
idx = 0;
|
||||
}
|
||||
|
||||
@@ -288,10 +288,10 @@ extern int __OSInIPL;
|
||||
|
||||
#define ASSERT(cond) ASSERTLINE(__LINE__, cond)
|
||||
|
||||
inline s16 __OSf32tos16(register f32 inF) {
|
||||
register s16 out;
|
||||
inline s16 __OSf32tos16(__REGISTER f32 inF) {
|
||||
__REGISTER s16 out;
|
||||
u32 tmp;
|
||||
register u32* tmpPtr = &tmp;
|
||||
__REGISTER u32* tmpPtr = &tmp;
|
||||
// clang-format off
|
||||
#ifdef __MWERKS__
|
||||
asm {
|
||||
@@ -308,10 +308,10 @@ inline void OSf32tos16(f32* f, s16* out) {
|
||||
*out = __OSf32tos16(*f);
|
||||
}
|
||||
|
||||
inline u8 __OSf32tou8(register f32 inF) {
|
||||
register u8 out;
|
||||
inline u8 __OSf32tou8(__REGISTER f32 inF) {
|
||||
__REGISTER u8 out;
|
||||
u32 tmp;
|
||||
register u32* tmpPtr = &tmp;
|
||||
__REGISTER u32* tmpPtr = &tmp;
|
||||
// clang-format off
|
||||
#ifdef __MWERKS__
|
||||
asm {
|
||||
|
||||
@@ -56,6 +56,12 @@ typedef unsigned int uint;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(__MWERKS__)
|
||||
#define __REGISTER register
|
||||
#else
|
||||
#define __REGISTER
|
||||
#endif
|
||||
|
||||
#ifndef DECL_WEAK
|
||||
#if defined(__MWERKS__)
|
||||
#define DECL_WEAK __declspec(weak)
|
||||
|
||||
Reference in New Issue
Block a user