kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename jmp_buf due to a name collision in STD

Browse source
This commit is contained in:
dbalatoni13 2025-04-02 04:52:55 +02:00
parent 84801ecdc7
commit 5eb32764a5
4 changed files with 79 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/game/jmp.h
View file

@ -3,7 +3,7 @@
#include "dolphin.h"
typedef struct jump_buf {
typedef struct JMPBUF {
u32 lr;
u32 cr;
u32 sp;
@ -11,9 +11,9 @@ typedef struct jump_buf {
u32 pad;
u32 regs[19];
double flt_regs[19];
} jmp_buf;
} JMPBUF;
s32 gcsetjmp(jmp_buf *jump);
s32 gclongjmp(jmp_buf *jump, s32 status);
s32 gcsetjmp(JMPBUF *jump);
s32 gclongjmp(JMPBUF *jump, s32 status);
#endif

7
include/game/process.h
View file

@ -1,8 +1,9 @@
#ifndef _GAME_PROCESS_H
#define _GAME_PROCESS_H
#include "game/jmp.h"
#include "dolphin/types.h"
#include "game/jmp.h"
#define PROCESS_STAT_PAUSE 0x1
#define PROCESS_STAT_UPAUSE 0x2
@ -22,7 +23,7 @@ typedef struct process {
u16 prio;
s32 sleep_time;
u32 base_sp;
jmp_buf jump;
JMPBUF jump;
void (*dtor)(void);
void *user_data;
} Process;
@ -50,4 +51,4 @@ void HuPrcResetStat(Process *process, u16 value);
void HuPrcAllPause(s32 flag);
void HuPrcAllUPause(s32 flag);
#endif
#endif