typedef unsigned __int8 uint8_t;
typedef __int16 int16;
typedef unsigned __int16 uint16_t;
-typedef __int32 int32;
+typedef __int32 int32_t;
typedef unsigned __int32 uint32_t;
-typedef __int64 int64;
+typedef __int64 int64_t;
typedef unsigned __int64 uint64_t;
typedef __int16 int16_t;
#define IS_64BIT
#endif
-#if defined(IS_64BIT) && !defined(_WIN64) && (defined(__GNUC__) || defined(__INTEL_COMPILER))
+#if defined(IS_64BIT) && (defined(__GNUC__) || defined(__INTEL_COMPILER))
#define USE_BSFQ
#endif
+// Cache line alignment specification
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
+#define CACHE_LINE_ALIGNMENT __declspec(align(64))
+#else
+#define CACHE_LINE_ALIGNMENT __attribute__ ((aligned(64)))
+#endif
+
+// Define a __cpuid() function for gcc compilers, for Intel and MSVC
+// is already available as an intrinsic.
+#if defined(__INTEL_COMPILER)
+#include <nmmintrin.h>
+#elif defined(_MSC_VER)
+#include <intrin.h>
+#elif defined(__GNUC__)
+inline void __cpuid(int CPUInfo[4], int InfoType)
+{
+ int* eax = CPUInfo + 0;
+ int* ebx = CPUInfo + 1;
+ int* ecx = CPUInfo + 2;
+ int* edx = CPUInfo + 3;
+
+ *eax = InfoType;
+ *ecx = 0;
+ __asm__("cpuid" : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
+ : "0" (*eax), "2" (*ecx));
+}
+#endif
+
#endif // !defined(TYPES_H_INCLUDED)