Skip to content

Commit

Permalink
[headers 13] osMalloc.h -> include/libc64/os_malloc.h (#2175)
Browse files Browse the repository at this point in the history
* [headers 13] osMalloc.h -> include/libc64/os_malloc.h

* also update the #includes :)
  • Loading branch information
Dragorn421 authored Sep 8, 2024
1 parent 900c2f0 commit fb37d7c
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions osMalloc.h → include/libc64/os_malloc.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef OSMALLOC_H
#define OSMALLOC_H
#ifndef LIBC64_OS_MALLOC_H
#define LIBC64_OS_MALLOC_H

#include "ultra64.h"

Expand Down
2 changes: 1 addition & 1 deletion include/variables.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define VARIABLES_H

#include "z64.h"
#include "osMalloc.h"
#include "libc64/os_malloc.h"
#include "segment_symbols.h"

extern Mtx D_01000000;
Expand Down
2 changes: 1 addition & 1 deletion src/code/code_800FC620.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "global.h"
#include "osMalloc.h"
#include "libc64/os_malloc.h"

typedef void (*arg3_800FC868)(void*);
typedef void (*arg3_800FC8D8)(void*, u32);
Expand Down
2 changes: 1 addition & 1 deletion src/code/debug_malloc.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "global.h"
#include "osMalloc.h"
#include "libc64/os_malloc.h"

#define LOG_SEVERITY_NOLOG 0
#define LOG_SEVERITY_ERROR 2
Expand Down
2 changes: 1 addition & 1 deletion src/code/fault_n64.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "global.h"
#include "fault.h"
#include "osMalloc.h"
#include "libc64/os_malloc.h"
#include "stack.h"
#include "terminal.h"

Expand Down
2 changes: 1 addition & 1 deletion src/code/game.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "global.h"
#include "fault.h"
#include "osMalloc.h"
#include "libc64/os_malloc.h"
#include "terminal.h"
#if PLATFORM_N64
#include "n64dd.h"
Expand Down
2 changes: 1 addition & 1 deletion src/code/z_malloc.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "global.h"
#include "osMalloc.h"
#include "libc64/os_malloc.h"

#define LOG_SEVERITY_NOLOG 0
#define LOG_SEVERITY_ERROR 2
Expand Down
2 changes: 1 addition & 1 deletion src/libc64/__osMalloc_gc.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "global.h"
#include "fault.h"
#include "osMalloc.h"
#include "libc64/os_malloc.h"
#include "terminal.h"

#if PLATFORM_GC
Expand Down
2 changes: 1 addition & 1 deletion src/libc64/__osMalloc_n64.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "global.h"
#include "fault.h"
#include "osMalloc.h"
#include "libc64/os_malloc.h"

#if PLATFORM_N64

Expand Down
2 changes: 1 addition & 1 deletion src/libc64/malloc.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "global.h"
#include "osMalloc.h"
#include "libc64/os_malloc.h"

#define LOG_SEVERITY_NOLOG 0
#define LOG_SEVERITY_ERROR 2
Expand Down

0 comments on commit fb37d7c

Please sign in to comment.