Don't define __rdtsc if x86intrin.h already does.

dolphin-emu · Oct 19, 2013 · 33ee046 · 33ee046
1 parent 8196451
commit 33ee046
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
@@ -149,6 +149,10 @@ ps_adds1
 #else
 #include <memory>
 #include <stdint.h>
+#include <x86intrin.h>
+
+#if defined(__clang__)
+#if !__has_builtin(__builtin_ia32_rdtsc)
 static inline uint64_t __rdtsc()
 {
 	uint32_t lo, hi;
@@ -169,6 +173,8 @@ static inline uint64_t __rdtsc()
 	return (uint64_t)hi << 32 | lo;
 }
 #endif
+#endif
+#endif
 
 namespace JitILProfiler
 {