Fixed some compiler errors/warnings for clang.

2015-02-25 11:52:25 -06:00
parent 518e2424a8
commit 84d90d6ed8
4 changed files with 10 additions and 6 deletions
--- a/cpuid_x86.c
+++ b/cpuid_x86.c
@@ -40,7 +40,7 @@
 #include <string.h>
 #include "cpuid.h"

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #define C_INLINE __inline
 #else
 #define C_INLINE inline
@@ -154,7 +154,7 @@ static C_INLINE int have_excpuid(void){
 #ifndef NO_AVX
 static C_INLINE void xgetbv(int op, int * eax, int * edx){
  //Use binary code for xgetbv
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
  *eax = __xgetbv(op);
 #else
  __asm__ __volatile__