From d715a331e3e87f48ed4cc32b309ec28232e7dc75 Mon Sep 17 00:00:00 2001 From: David Rose Date: Sun, 3 Apr 2011 21:07:32 +0000 Subject: [PATCH] "long int" isn't necessarily 64 bits on a 64-bit architecture, but "long long int" usually is. --- dtool/src/dtoolbase/numeric_types.h | 8 -------- dtool/src/parser-inc/stdint.h | 8 -------- 2 files changed, 16 deletions(-) diff --git a/dtool/src/dtoolbase/numeric_types.h b/dtool/src/dtoolbase/numeric_types.h index 9bc21030a1..c3b429c684 100644 --- a/dtool/src/dtoolbase/numeric_types.h +++ b/dtool/src/dtoolbase/numeric_types.h @@ -52,20 +52,12 @@ typedef uint64_t PN_uint64; typedef signed char PN_int8; typedef short int PN_int16; typedef int PN_int32; -#if NATIVE_WORDSIZE == 64 -typedef long int PN_int64; -#else typedef long long int PN_int64; -#endif typedef unsigned char PN_uint8; typedef unsigned short int PN_uint16; typedef unsigned int PN_uint32; -#if NATIVE_WORDSIZE == 64 -typedef unsigned long int PN_uint64; -#else typedef unsigned long long int PN_uint64; -#endif #endif diff --git a/dtool/src/parser-inc/stdint.h b/dtool/src/parser-inc/stdint.h index 80bba0f9aa..06de8c95cb 100644 --- a/dtool/src/parser-inc/stdint.h +++ b/dtool/src/parser-inc/stdint.h @@ -24,20 +24,12 @@ typedef signed char int8_t; typedef short int int16_t; typedef int int32_t; -#if __WORDSIZE == 64 -typedef long int int64_t; -#else typedef long long int int64_t; -#endif typedef unsigned char uint8_t; typedef unsigned short int uint16_t; typedef unsigned int uint32_t; -#if __WORDSIZE == 64 -typedef unsigned long int uint64_t; -#else typedef unsigned long long int uint64_t; -#endif #endif