From c2e7e4a2fb51f449055c3cb0b0e67d096b048e39 Mon Sep 17 00:00:00 2001
From: gabest11 <gabest11@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 23 Feb 2011 23:40:37 +0000
Subject: [PATCH] GSdx: SDL_assert.h fixed for vs2008.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4349 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 .../VisualC/SDL/SDL_VS2008.vcproj             | 10 ++---
 3rdparty/SDL-1.3.0-5387/include/SDL_assert.h  | 38 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/3rdparty/SDL-1.3.0-5387/VisualC/SDL/SDL_VS2008.vcproj b/3rdparty/SDL-1.3.0-5387/VisualC/SDL/SDL_VS2008.vcproj
index 9c863f9100..72a651b7c5 100644
--- a/3rdparty/SDL-1.3.0-5387/VisualC/SDL/SDL_VS2008.vcproj
+++ b/3rdparty/SDL-1.3.0-5387/VisualC/SDL/SDL_VS2008.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="SDL"
 	ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
 	RootNamespace="SDL"
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\bin\"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\"
+			OutputDirectory="$(SolutionDir)\bin"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
@@ -189,8 +189,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\bin\"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\"
+			OutputDirectory="$(SolutionDir)\bin"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
diff --git a/3rdparty/SDL-1.3.0-5387/include/SDL_assert.h b/3rdparty/SDL-1.3.0-5387/include/SDL_assert.h
index 6f0b3c19a4..173a18a24f 100644
--- a/3rdparty/SDL-1.3.0-5387/include/SDL_assert.h
+++ b/3rdparty/SDL-1.3.0-5387/include/SDL_assert.h
@@ -25,25 +25,6 @@
 
 #include "SDL_config.h"
 
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-#ifndef SDL_ASSERT_LEVEL
-#ifdef SDL_DEFAULT_ASSERT_LEVEL
-#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL
-#elif defined(_DEBUG) || defined(DEBUG) || \
-      (defined(__GNUC__) && !defined(__OPTIMIZE__))
-#define SDL_ASSERT_LEVEL 2
-#else
-#define SDL_ASSERT_LEVEL 1
-#endif
-#endif /* SDL_ASSERT_LEVEL */
-
 /*
 These are macros and not first class functions so that the debugger breaks
 on the assertion line and not in some random guts of SDL, and so each
@@ -63,6 +44,25 @@ assert can have unique static variables associated with it.
     #define SDL_TriggerBreakpoint()
 #endif
 
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+extern "C" {
+/* *INDENT-ON* */
+#endif
+
+#ifndef SDL_ASSERT_LEVEL
+#ifdef SDL_DEFAULT_ASSERT_LEVEL
+#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL
+#elif defined(_DEBUG) || defined(DEBUG) || \
+      (defined(__GNUC__) && !defined(__OPTIMIZE__))
+#define SDL_ASSERT_LEVEL 2
+#else
+#define SDL_ASSERT_LEVEL 1
+#endif
+#endif /* SDL_ASSERT_LEVEL */
+
 #if (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */
 #   define SDL_FUNCTION __func__
 #elif ((__GNUC__ >= 2) || defined(_MSC_VER))