X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=67e40fffd2c53ba54164c8910f99fd407cdd0a98;hp=161117f8536e433511824544c0ff8fbe8f653d7a;hb=842efefcad9c6100d0376e20c59264852d225920;hpb=83d8d542166d77f5417d334d2e6138ace0820ae4

diff --git a/src/types.h b/src/types.h
index 161117f8..67e40fff 100644
--- a/src/types.h
+++ b/src/types.h
@@ -20,37 +20,36 @@
 #if !defined(TYPES_H_INCLUDED)
 #define TYPES_H_INCLUDED
 
-#if !defined(_MSC_VER)
-
-#include <inttypes.h>
+#include <cstdlib>
 
-#else
+#if defined(_MSC_VER)
 
 // Disable some silly and noisy warning from MSVC compiler
 #pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
 #pragma warning(disable: 4127) // Conditional expression is constant
 
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16;
+// MSVC does not support <inttypes.h>
+typedef   signed __int8    int8_t;
+typedef unsigned __int8   uint8_t;
+typedef   signed __int16  int16_t;
 typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
+typedef   signed __int32  int32_t;
 typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
+typedef   signed __int64  int64_t;
 typedef unsigned __int64 uint64_t;
 
-typedef __int16 int16_t;
-typedef __int64 int64_t;
+#else
 
-#endif // !defined(_MSC_VER)
+#include <inttypes.h>
 
-// Hash keys
-typedef uint64_t Key;
+#endif
 
-// Bitboard type
+// Our hash key and bitboard types
+typedef uint64_t Key;
 typedef uint64_t Bitboard;
 
-#include <cstdlib>
+#define Min(x, y) (((x) < (y)) ? (x) : (y))
+#define Max(x, y) (((x) < (y)) ? (y) : (x))
 
 ////
 //// Configuration
@@ -86,6 +85,11 @@ typedef uint64_t Bitboard;
 #define USE_BSFQ
 #endif
 
+// Intel header for _mm_popcnt_u64() intrinsic
+#if defined(USE_POPCNT) && defined(_MSC_VER) && defined(__INTEL_COMPILER)
+#include <nmmintrin.h>
+#endif
+
 // Cache line alignment specification
 #if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 #define CACHE_LINE_ALIGNMENT __declspec(align(64))
@@ -117,6 +121,15 @@ inline void __cpuid(int CPUInfo[4], int)
 }
 #endif
 
+// Define FORCE_INLINE macro to force inlining overriding compiler choice
+#if defined(_MSC_VER)
+#define FORCE_INLINE  __forceinline
+#elif defined(__GNUC__)
+#define FORCE_INLINE  inline __attribute__((always_inline))
+#else
+#define FORCE_INLINE  inline
+#endif
+
 // Operators used by enum types like Depth, Piece, Square and so on.
 
 #define ENABLE_OPERATORS_ON(T) \