Rename jmp_buf due to a name collision in STD

include/game/jmp.h

@@ -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 gcsetjmp(JMPBUF *jump);
-s32 gclongjmp(jmp_buf *jump, s32 status);
+s32 gclongjmp(JMPBUF *jump, s32 status);
 
 #endif

include/game/process.h

@@ -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;

src/game/jmp.c

@@ -1,6 +1,7 @@
 #include "game/jmp.h"
 
-s32 gcsetjmp(register jmp_buf *jump) {
+s32 gcsetjmp(register JMPBUF *jump)
+{
     // clang-format off
     asm {
         mflr r5
@@ -36,7 +37,7 @@ s32 gcsetjmp(register jmp_buf *jump) {
 }
 
 // clang-format off
-asm s32 gclongjmp(register jmp_buf *jump, register s32 status) {
+asm s32 gclongjmp(register JMPBUF *jump, register s32 status) {
     nofralloc
     lwz r5, jump->lr
     lwz r6, jump->cr

src/game/process.c

@@ -1,6 +1,7 @@
 #include "game/process.h"
-#include "game/memory.h"
 #include "dolphin/os.h"
+#include "game/memory.h"
+
 
 #define FAKE_RETADDR 0xA5A5A5A5
 
@@ -9,7 +10,7 @@
 #define EXEC_CHILDWATCH 2
 #define EXEC_KILLED 3
 
-static jmp_buf processjmpbuf;
+static JMPBUF processjmpbuf;
 static Process *processtop;
 static Process *processcur;
 static u16 processcnt;
@@ -21,7 +22,8 @@ void HuPrcInit(void)
     processtop = NULL;
 }
 
-static void LinkProcess(Process** root, Process* process) {
+static void LinkProcess(Process **root, Process *process)
+{
     Process *src_process = *root;
 
     if (src_process && (src_process->prio >= process->prio)) {
@@ -35,7 +37,8 @@ static void LinkProcess(Process** root, Process* process) {
         if (process->next) {
             process->next->prev = process;
         }
-    } else {
+    }
+    else {
         process->next = (*root);
         process->prev = NULL;
         *root = process;
@@ -44,13 +47,15 @@ static void LinkProcess(Process** root, Process* process) {
         }
     }
 }
-static void UnlinkProcess(Process **root, Process *process) {
+static void UnlinkProcess(Process **root, Process *process)
+{
     if (process->next) {
         process->next->prev = process->prev;
     }
     if (process->prev) {
         process->prev->next = process->next;
-    } else {
+    }
+    else {
         *root = process->next;
     }
 }
@@ -63,9 +68,7 @@ Process *HuPrcCreate(void (*func)(void), u16 prio, u32 stack_size, s32 extra_siz
     if (stack_size == 0) {
         stack_size = 2048;
     }
-    alloc_size = HuMemMemoryAllocSizeGet(sizeof(Process))
+    alloc_size = HuMemMemoryAllocSizeGet(sizeof(Process)) + HuMemMemoryAllocSizeGet(stack_size) + HuMemMemoryAllocSizeGet(extra_size);
-                    +HuMemMemoryAllocSizeGet(stack_size)
-                    +HuMemMemoryAllocSizeGet(extra_size);
     if (!(heap = HuMemDirectMalloc(HEAP_SYSTEM, alloc_size))) {
         OSReport("process> malloc error size %d\n", alloc_size);
         return NULL;
@@ -110,7 +113,8 @@ void HuPrcChildUnlink(Process *process)
         }
         if (process->first_child) {
             process->first_child->next_child = process->next_child;
-        } else {
+        }
+        else {
             process->parent->child = process->next_child;
         }
         process->parent = NULL;
@@ -146,7 +150,8 @@ static s32 SetKillStatusProcess(Process *process)
         HuPrcWakeup(process);
         process->exec = EXEC_KILLED;
         return 0;
-    } else {
+    }
+    else {
         return -1;
     }
 }
@@ -238,8 +243,10 @@ void HuPrcCall(s32 tick)
             case 1:
                 if (((u8 *)(processcur->heap))[4] != 165) {
                     printf("stack overlap error.(process pointer %x)\n", processcur);
-                    while(1);
+                    while (1)
-                } else {
+                        ;
+                }
+                else {
                     processcur = processcur->next;
                 }
                 break;
@@ -268,7 +275,8 @@ void HuPrcCall(s32 tick)
             case EXEC_CHILDWATCH:
                 if (process->child) {
                     ret = 1;
-                } else {
+                }
+                else {
                     process->exec = EXEC_NORMAL;
                     ret = 0;
                 }
@@ -315,7 +323,8 @@ void HuPrcAllPause(s32 flag)
 
             process = process->next;
         }
-    } else {
+    }
+    else {
         while (process != NULL) {
             if (process->stat & PROCESS_STAT_PAUSE) {
                 HuPrcResetStat(process, PROCESS_STAT_PAUSE);
@@ -337,7 +346,8 @@ void HuPrcAllUPause(s32 flag)
 
             process = process->next;
         }
-    } else {
+    }
+    else {
         while (process != NULL) {
             if (process->stat & PROCESS_STAT_UPAUSE) {
                 HuPrcResetStat(process, PROCESS_STAT_UPAUSE);