From fd5eec01f16990a3564e16421c7ce307c674dd45 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 17 Nov 2011 20:49:47 +0000
Subject: Patch 10831 from Durandal_1707: This should bring the number of
 warnings when compiling the Mac version with Clang and the -Wall option down
 to zero.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72386 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 libpcsxcore/cdrom.c | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

(limited to 'libpcsxcore')

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 889beb9a..055a15a0 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -135,6 +135,20 @@ extern long CALLBACK ISOinit(void);
 extern void CALLBACK SPUirq(void);
 extern SPUregisterCallback SPU_registerCallback;
 
+// A bit of a kludge, but it will get rid of the "macro redefined" warnings
+
+#ifdef H_SPUirqAddr
+#undef H_SPUirqAddr
+#endif
+
+#ifdef H_SPUaddr
+#undef H_SPUaddr
+#endif
+
+#ifdef H_SPUctrl
+#undef H_SPUctrl
+#endif
+
 #define H_SPUirqAddr		0x1f801da4
 #define H_SPUaddr				0x1f801da6
 #define H_SPUctrl				0x1f801daa
@@ -2318,13 +2332,12 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 
 /*
 #if 1
-			/*
-			GS CDX: Enhancement CD crash
-			- Setloc 0:0:0
-			- CdlPlay
-			- Spams DMA3 and gets buffer overrun
-			*/
-/*
+ 
+			// GS CDX: Enhancement CD crash
+			// - Setloc 0:0:0
+			// - CdlPlay
+			// - Spams DMA3 and gets buffer overrun
+			
 			if( (cdr.pTransfer-cdr.Transfer) + cdsize > 2352 )
 			{
 				// avoid crash - probably should wrap here
@@ -2355,17 +2368,15 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 			} else {
 				int lcv;
 
-				/*
-				CDROM wrapping
-
-				Ape Escape - used several times
-				Gameshark Lite - opening movie
-
-				Gameshark CDX: enhancement CD patcher
-				- calls CdlPlay @ 0:2:0
-				- spams DMA3 and overruns buffer
-				*/
-/*
+				// CDROM wrapping
+				//
+				// Ape Escape - used several times
+				// Gameshark Lite - opening movie
+				//
+				// Gameshark CDX: enhancement CD patcher
+				// - calls CdlPlay @ 0:2:0
+				// - spams DMA3 and overruns buffer
+				
 				for( lcv = 0; lcv < cdsize; lcv++ )
 				{
 					// wrap cdrom ptr
-- 
cgit v1.2.3