Skip to content

Commit fbac899

Browse files
committed
Clean Up Build Warnings
Make the `FntPrint` function signature consistent between header and impl and and put guard around duplicate `CLAMP` macro in `libgpu/sys.c`.
1 parent 5ea23c7 commit fbac899

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

include/psxsdk/libgpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ extern int SetGraphReverse(int mode);
600600
extern int SetGraphQueue(int mode);
601601
extern u_long DrawSyncCallback(void (*func)());
602602
extern void FntLoad(int tx, int ty);
603-
int FntPrint(const char* fmt, ...);
603+
long FntPrint(long id, ...);
604604
extern void SetDispMask(int mask);
605605
extern void SetDrawMode(DR_MODE* p, int dfe, int dtd, int tpage, RECT* tw);
606606
extern void SetDumpFnt(int id);

src/main/psxsdk/libgpu/sys.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ static volatile s32* DPCR = (s32*)0x1F8010F0;
6565
static volatile s32 _qin = 0;
6666
static volatile s32 _qout = 0;
6767

68+
#ifndef CLAMP
6869
#define CLAMP(value, low, high) \
6970
value < low ? low : (value > high ? high : value)
71+
#endif
7072

7173
// gpu commands
7274
#define CMD_CLEAR_CACHE 0x01000000

0 commit comments

Comments
 (0)