ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx: Allow normal assert to be used

This commit is contained in:
Jonathan Li 2016-05-25 23:02:16 +01:00
parent db81925c4b
commit 352b61c741
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/GSdx/stdafx.h
View File

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