diff options
| author | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
| commit | 951b18c97a09426e2f14801263c2fd07efbd46bb (patch) | |
| tree | 94303465410557176454305aeeab76a13ca8514d /src/common | |
| parent | 8083daec0d94f78510411c9b225abcfa7e829e95 (diff) | |
| parent | 9f32aa958f86a228290c43544c8b9bbf3f1c2cc0 (diff) | |
| download | hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.gz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.bz2 hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.xz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/atomic.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/atomic.h b/src/common/atomic.h index b1a4bda92..5a2ddb4f0 100644 --- a/src/common/atomic.h +++ b/src/common/atomic.h @@ -19,6 +19,9 @@ #if defined(_MSC_VER) #include "../common/winapi.h" +// This checks if C/C++ Compiler Version is 18.00 +#if _MSC_VER < 1800 + #if !defined(_M_X64) // When compiling for windows 32bit, the 8byte interlocked operations are not provided by microsoft // (because they need at least i586 so its not generic enough.. ... ) @@ -80,6 +83,8 @@ forceinline volatile int64 InterlockedExchange64(volatile int64 *target, int64 v #endif //endif 32bit windows +#endif //endif _msc_ver check + #elif defined(__GNUC__) #if !defined(__x86_64__) && !defined(__i386__) |