From 32427226c3f49190f796a18de8b3da0f8184acf4 Mon Sep 17 00:00:00 2001
From: Chris Ballinger <chrisballinger@gmail.com>
Date: Tue, 25 Oct 2016 01:04:27 -0700
Subject: Fix Xcode build issues

---
 libpcsxcore/gte.c      | 2 +-
 libpcsxcore/pgxp_gte.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'libpcsxcore')

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_ */
-- 
cgit v1.2.3