diff options
| author | MrLavender <mrlavender@f2s.com> | 2017-06-27 01:57:29 +0100 |
|---|---|---|
| committer | MrLavender <mrlavender@f2s.com> | 2017-06-27 01:57:29 +0100 |
| commit | 72b90e1c61be53d99c61e15f9d2b60c807920a89 (patch) | |
| tree | 9e0834c7de85e28f1d94e8075efe794da52c7303 /libpcsxcore | |
| parent | 36c126b66581a154143eb789ae9bdf665bc50560 (diff) | |
| download | pcsxr-72b90e1c61be53d99c61e15f9d2b60c807920a89.tar.gz | |
Fix OSX debug build
Diffstat (limited to 'libpcsxcore')
| -rwxr-xr-x | libpcsxcore/gte.c | 2 | ||||
| -rw-r--r-- | libpcsxcore/pgxp_gte.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libpcsxcore/gte.c b/libpcsxcore/gte.c index 05cb74a6..7965a0e9 100755 --- a/libpcsxcore/gte.c +++ b/libpcsxcore/gte.c @@ -286,7 +286,7 @@ void gteSWC2() { psxMemWrite32(_oB_, val); } -inline s64 gte_shift(s64 a, int sf) { +static inline s64 gte_shift(s64 a, int sf) { if(sf > 0) return a >> 12; else if(sf < 0) diff --git a/libpcsxcore/pgxp_gte.h b/libpcsxcore/pgxp_gte.h index cc38ade1..de607c99 100644 --- a/libpcsxcore/pgxp_gte.h +++ b/libpcsxcore/pgxp_gte.h @@ -60,5 +60,8 @@ void PGXP_GTE_SWC2(u32 instr, u32 rtVal, u32 addr); // copy GTE reg to memory #ifndef max
# define max(a, b) ((a) > (b) ? (a) : (b))
#endif
+#ifndef min
+# define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
#endif /* _PGXP_GTE_H_ */
|