GitHub/GameNetworkingSockets
1
0
Fork 0
mirror of https://github.com/ValveSoftware/GameNetworkingSockets.git synced 2026-05-29 16:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing compilation under Mingw32

Browse Source 
Reorder preprocessor directives fixing compilation under mingw-32.
This commit is contained in:
Damiano
2020-02-03 10:07:27 -08:00
committed by Fletcher Dunn
parent 54139bb01a
commit dcf33ffa7f
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/public/minbase/minbase_macros.h
+10 -9
View File
@@ -96,8 +96,6 @@
// Used to step into the debugger
#ifdef _WIN64
#define DebuggerBreak() do { __debugbreak(); } while(0)
#elif defined(_WIN32)
#define DebuggerBreak() do { __asm { int 3 }; } while(0)
#elif defined( COMPILER_GCC )
#if defined( _PS3 )
#if defined( _CERT )
@@ -110,6 +108,8 @@
#else
#define DebuggerBreak() do { } while(0)
#endif
#elif defined(_WIN32)
#define DebuggerBreak() do { __asm { int 3 }; } while(0)
#elif defined( COMPILER_SNC ) && defined( COMPILER_PS3 )
static volatile bool sPS3_SuppressAssertsInThisFile = false; // you can throw this in the debugger to temporarily disable asserts inside any particular .cpp module.
#define DebuggerBreak() if (!sPS3_SuppressAssertsInThisFile) __builtin_snpause(); // <sergiy> from SNC Migration Guide, tw 31,1,1
@@ -126,13 +126,6 @@ extern "C"
#pragma intrinsic(__rdtsc)
#define PLAT_CPU_TIME() __rdtsc()
#elif defined(_WIN32)
FORCEINLINE unsigned __int64 PLAT_CPU_TIME()
{
__asm rdtsc
}
#elif defined(COMPILER_GCC) && ( defined(__i386__) || defined(__x86_64__) )
inline __attribute__ ((always_inline)) unsigned long long PLAT_CPU_TIME()
@@ -148,6 +141,14 @@ inline __attribute__ ((always_inline)) unsigned long long PLAT_CPU_TIME()
#endif
}
#elif defined(_WIN32)
FORCEINLINE unsigned __int64 PLAT_CPU_TIME()
{
__asm rdtsc
}
#elif defined(POSIX)
#include <sys/time.h>