Move __cpuid() definition for gcc in types.h

[stockfish] / src / bitcount.h

diff --git a/src/bitcount.h b/src/bitcount.h
index b32314d8201ee88db1a6ee5a050d92d398803b86..43895180c1e9ae7566e16e3f35f29b93e00e18eb 100644 (file)
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -29,8 +29,6 @@
 
 #if defined(__INTEL_COMPILER) && defined(USE_POPCNT) // Intel compiler
 
-#include <nmmintrin.h>
-
 inline bool cpu_has_popcnt() {
 
   int CPUInfo[4] = {-1};
@@ -42,8 +40,6 @@ inline bool cpu_has_popcnt() {
 
 #elif defined(_MSC_VER) && defined(USE_POPCNT) // Microsoft compiler
 
-#include <intrin.h>
-
 inline bool cpu_has_popcnt() {
 
   int CPUInfo[4] = {-1};
@@ -51,20 +47,10 @@ inline bool cpu_has_popcnt() {
   return (CPUInfo[2] >> 23) & 1;
 }
 
-#define POPCNT_INTRINSIC(x) __popcnt64(x)
+#define POPCNT_INTRINSIC(x) (int)__popcnt64(x)
 
 #elif defined(__GNUC__) && defined(USE_POPCNT) // Gcc compiler
 
-inline void __cpuid(unsigned int op,
-                    unsigned int *eax, unsigned int *ebx,
-                    unsigned int *ecx, unsigned int *edx)
-{
-  *eax = op;
-  *ecx = 0;
-  __asm__("cpuid" : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
-                  : "0" (*eax), "2" (*ecx));
-}
-
 inline bool cpu_has_popcnt() {
 
   unsigned int eax, ebx, ecx, edx;