From 3ff7f2f191779ca9ebb14c8989d869830317a167 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 23 May 2009 01:11:28 +0000
Subject: [PATCH] Meaningless Commits Inc presents: Made jASSUME to be more
 scope-proof, and fixed a minor signed/unsigned warning in cdvd.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1240 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 common/include/Pcsx2Defs.h | 4 ++--
 pcsx2/CDVD/CDVD.cpp        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/include/Pcsx2Defs.h b/common/include/Pcsx2Defs.h
index cb2aa7937c..646feabe6f 100644
--- a/common/include/Pcsx2Defs.h
+++ b/common/include/Pcsx2Defs.h
@@ -50,12 +50,12 @@
 #			define jASSUME(exp) ((void) sizeof(exp))
 #		endif
 #	else
-#		if defined(_MSC_VER)
+#		ifdef _MSC_VER
 #			define jBREAKPOINT() do { __asm int 3 } while(0)
 #		else
 #			define jBREAKPOINT() ((void) *(volatile char *) 0)
 #		endif
-#		define jASSUME(exp) if(exp) ; else jBREAKPOINT()
+#		define jASSUME(exp) do { if(exp) ; else jBREAKPOINT() } while(0)
 #	endif
 #endif
 
diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp
index e93117da87..675a070ec7 100644
--- a/pcsx2/CDVD/CDVD.cpp
+++ b/pcsx2/CDVD/CDVD.cpp
@@ -812,7 +812,7 @@ static uint cdvdStartSeek( uint newsector, CDVD_MODE_TYPE mode )
 {
 	cdvd.SeekToSector = newsector;
 
-	uint delta = abs(cdvd.SeekToSector - cdvd.Sector);
+	uint delta = abs( (s32)(cdvd.SeekToSector - cdvd.Sector) );
 	uint seektime;
 
 	cdvd.Ready = CDVD_NOTREADY;