From 352b61c74156372f78e6f52bf6d10d64aa6565fb Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Wed, 25 May 2016 23:02:16 +0100
Subject: [PATCH] gsdx: Allow normal assert to be used

---
 plugins/GSdx/stdafx.h | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h
index cc26846fb5..a23bfba7a5 100644
--- a/plugins/GSdx/stdafx.h
+++ b/plugins/GSdx/stdafx.h
@@ -79,17 +79,18 @@ typedef int64 sint64;
 
 // stdc
 
-#include <stddef.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <math.h>
-#include <float.h>
-#include <time.h>
-#include <limits.h>
+#include <cstddef>
+#include <cstdio>
+#include <cstdarg>
+#include <cstdlib>
+#include <cmath>
+#include <cfloat>
+#include <ctime>
+#include <climits>
+#include <cstring>
+#include <cassert>
 
 #include <complex>
-#include <cstring>
 #include <string>
 #include <vector>
 #include <list>
@@ -216,8 +217,6 @@ using namespace stdext;
     #define EXPORT_C EXPORT_C_(void)
 
     #ifdef __GNUC__
-
-        #include "assert.h"
         #define __forceinline __inline__ __attribute__((always_inline,unused))
         // #define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__))
         #define __assume(c) do { if (!(c)) __builtin_unreachable(); } while(0)
@@ -260,16 +259,7 @@ using namespace stdext;
 
 #endif
 
-#if defined(_DEBUG) //&& defined(_MSC_VER)
-
-	#include <assert.h>
-	#define ASSERT assert
-
-#else
-
-	#define ASSERT(exp) ((void)0)
-
-#endif
+#define ASSERT assert
 
 #ifdef __x86_64__