mirror of
https://github.com/jkdansereau/goldeneye-pc-port.git
synced 2026-10-23 15:52:42 +02:00
linux-build: PORT-guarded append_text_picked_up signature for GCC 14
The vestigial u8* param2/param3 receive an AMMOTYPE enum and a u32 at both callsites. GCC 14 treats enum->pointer as a hard 'incompatible type for argument' error that -fpermissive does not downgrade (unlike the int<->pointer permerrors). Guard the definition with #ifdef PORT to match the callsites' actual types; params stay unused so codegen is unchanged and the N64 source path is literally untouched.
This commit is contained in:
1 parent
31a0d6c42d
commit
9baf2c67f5
1 file changed
+7
@@ -9921,7 +9921,14 @@ void sub_GAME_7F04F244(PropRecord* prop, rect4f** polygon, s32* edges, f32* top,
|
||||
}
|
||||
|
||||
|
||||
#ifdef PORT
|
||||
/* GCC 14 rejects the vestigial u8* params (enum/int -> pointer is a hard
|
||||
error, not downgraded by -fpermissive). param2/param3 are unused; match
|
||||
the two callsites' actual types. Codegen-neutral. */
|
||||
void append_text_picked_up(u8 *buffer, AMMOTYPE param2, u32 param3)
|
||||
#else
|
||||
void append_text_picked_up(u8 *buffer,u8 * param2,u8 * param3)
|
||||
#endif
|
||||
{
|
||||
u8 *str;
|
||||
|
||||
|
||||
Reference in new issue
Block a user