! #ifdef _WIN32
! typedef __int64 int64_t;
! # elif __WORDSIZE == 64 || defined __arch64__ || defined __cplusplus
typedef long int int64_t;
# else
typedef long long int int64_t;
***************
*** 26,32 ****
typedef unsigned short int uint16_t;
typedef unsigned int uint32_t;
! #if __WORDSIZE == 64 || defined __arch64__ || defined __cplusplus
typedef unsigned long int uint64_t;
#else
typedef unsigned long long int uint64_t;
--- 33,41 ----
typedef unsigned short int uint16_t;
typedef unsigned int uint32_t;
! #ifdef _WIN32
! typedef unsigned __int64 uint64_t;
! #elif __WORDSIZE == 64 || defined __arch64__ || defined __cplusplus
typedef unsigned long int uint64_t;
#else
typedef unsigned long long int uint64_t;