diff options
| author | iCatButler <i.am.catbutler@gmail.com> | 2018-03-13 17:15:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 17:15:42 +0000 |
| commit | 540dccfdbd162f247d2390ac35df4144b28aab44 (patch) | |
| tree | b7410f4e0e8a1cca04f3ccfd6bee6bc71b672ebd /libpcsxcore | |
| parent | 496df34ee4e3861c6e9b0ee8256d575622447563 (diff) | |
| parent | 32427226c3f49190f796a18de8b3da0f8184acf4 (diff) | |
| download | pcsxr-540dccfdbd162f247d2390ac35df4144b28aab44.tar.gz | |
Merge pull request #4 from chrisballinger/macos-fixes
Fix Xcode build issues
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..845ee06d 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_ */
|