summaryrefslogtreecommitdiff
path: root/include/functions.h
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-11-01 20:07:38 -0300
committerGitHub <noreply@github.com>2023-11-02 10:07:38 +1100
commitf276d2b0e618f7fc95a35b629161561489203f39 (patch)
treebde1366107e427c1b6b5cf32db2eb7912a0d7bb0 /include/functions.h
parent42e1c438e1e78e3a298c71734cb7e699a990c94c (diff)
Enable `-Wint-conversion` warning (#1266)
* fixing some warnings * more pointer fixing * Use `-Wno-int-conversion` on audio files * more progress * fix * more pointer fixes * kinda progress * Fix remaining casts * Format * fix merge * fix warnings * fix parameter * use SEGMENT_ROM_START_OFFSET a bit more * format * fix audio warnings * some more fixes * fix en_go * review * review * whoops, missing cast * review * review * ->data * format * review * fix * asPtr * fix * Update src/code/sched.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * fix in EnDnh * improve format * engo * format * fix * format * Update include/z64.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * TexturePtr * fix warnings * fix warnings * format * fix * review --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'include/functions.h')
-rw-r--r--include/functions.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/functions.h b/include/functions.h
index 5519036a3..c6c3667d6 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -541,8 +541,8 @@ void Color_RGB8_Lerp(Color_RGB8* from, Color_RGB8* to, f32 lerp, Color_RGB8* dst
void Lib_Nop801004FC(void);
void* Lib_SegmentedToVirtual(void* ptr);
void* Lib_SegmentedToVirtualNull(void* ptr);
-void* Lib_VirtualToPhysical(void* ptr);
-void* Lib_PhysicalToVirtual(void* ptr);
+uintptr_t Lib_VirtualToPhysical(void* ptr);
+void* Lib_PhysicalToVirtual(uintptr_t ptr);
void LifeMeter_Init(PlayState* play);
void LifeMeter_UpdateColors(PlayState* play);
s32 LifeMeter_SaveInterfaceHealth(PlayState* play);