diff options
| author | Random06457 <28494085+Random06457@users.noreply.github.com> | 2023-11-19 20:50:41 +0100 |
|---|---|---|
| committer | Random06457 <28494085+Random06457@users.noreply.github.com> | 2023-11-19 20:50:41 +0100 |
| commit | 46cab74a9ce1daa94efed7c86a51b03a8133877a (patch) | |
| tree | bcdfdf9b2576f077fce9845d816b6411d6a49856 | |
| parent | e70232903aed4a1c8d24d8df91d701decbb8d3c7 (diff) | |
move sched.h to os_sched.h
sched.h is already a POSIX header so having a file with the same name causes conflict issues
| -rw-r--r-- | mm/include/PR/os_sched.h (renamed from mm/include/PR/sched.h) | 0 | ||||
| -rw-r--r-- | mm/include/gfx.h | 2 | ||||
| -rw-r--r-- | mm/include/irqmgr.h | 2 | ||||
| -rw-r--r-- | mm/include/scheduler.h | 2 | ||||
| -rw-r--r-- | mm/include/z64jpeg.h | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/mm/include/PR/sched.h b/mm/include/PR/os_sched.h index 7db228a5d..7db228a5d 100644 --- a/mm/include/PR/sched.h +++ b/mm/include/PR/os_sched.h diff --git a/mm/include/gfx.h b/mm/include/gfx.h index 87f949d8b..3bcfc7701 100644 --- a/mm/include/gfx.h +++ b/mm/include/gfx.h @@ -2,7 +2,7 @@ #define GFX_H #include "ultra64.h" -#include "PR/sched.h" +#include "PR/os_sched.h" #include "thga.h" #include "alignment.h" #include "unk.h" diff --git a/mm/include/irqmgr.h b/mm/include/irqmgr.h index a19169dc7..76dae3004 100644 --- a/mm/include/irqmgr.h +++ b/mm/include/irqmgr.h @@ -2,7 +2,7 @@ #define IRQMGR_H #include "ultra64.h" -#include "PR/sched.h" +#include "PR/os_sched.h" typedef struct IrqMgrClient { /* 0x0 */ struct IrqMgrClient* next; diff --git a/mm/include/scheduler.h b/mm/include/scheduler.h index 1aeae07ec..7a9715a5b 100644 --- a/mm/include/scheduler.h +++ b/mm/include/scheduler.h @@ -2,7 +2,7 @@ #define SCHEDULER_H #include "PR/ultratypes.h" -#include "PR/sched.h" +#include "PR/os_sched.h" #include "PR/os_vi.h" #include "PR/sptask.h" #include "irqmgr.h" diff --git a/mm/include/z64jpeg.h b/mm/include/z64jpeg.h index 181140386..e08d85d49 100644 --- a/mm/include/z64jpeg.h +++ b/mm/include/z64jpeg.h @@ -3,7 +3,7 @@ #include "PR/ultratypes.h" #include "PR/os_message.h" -#include "PR/sched.h" +#include "PR/os_sched.h" typedef struct { /* 0x00 */ u16 table[8*8]; |