diff options
Diffstat (limited to 'gcc/config/i386/cygwin-stdint.h')
| -rw-r--r-- | gcc/config/i386/cygwin-stdint.h | 59 |
1 files changed, 13 insertions, 46 deletions
diff --git a/gcc/config/i386/cygwin-stdint.h b/gcc/config/i386/cygwin-stdint.h index 3c82cc6c35a..13b2bfe584a 100644 --- a/gcc/config/i386/cygwin-stdint.h +++ b/gcc/config/i386/cygwin-stdint.h @@ -1,5 +1,5 @@ /* Definitions for <stdint.h> types on systems using Cygwin. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This file is part of GCC. @@ -24,71 +24,38 @@ along with GCC; see the file COPYING3. If not see #define INT8_TYPE "signed char" #define INT16_TYPE "short int" #define INT32_TYPE "int" -#ifdef __x86_64__ -#define INT64_TYPE "long int" -#else -#define INT64_TYPE "long long int" -#endif +#define INT64_TYPE (TARGET_64BIT ? "long int" : "long long int") #define UINT8_TYPE "unsigned char" #define UINT16_TYPE "short unsigned int" #define UINT32_TYPE "unsigned int" -#ifdef __x86_64__ -#define UINT64_TYPE "long unsigned int" -#else -#define UINT64_TYPE "long long unsigned int" -#endif +#define UINT64_TYPE (TARGET_64BIT ? "long unsigned int" : "long long unsigned int") /* Minimum-width integer types */ #define INT_LEAST8_TYPE "signed char" #define INT_LEAST16_TYPE "short int" #define INT_LEAST32_TYPE "int" -#ifdef __x86_64__ -#define INT_LEAST64_TYPE "long int" -#else -#define INT_LEAST64_TYPE "long long int" -#endif +#define INT_LEAST64_TYPE (TARGET_64BIT ? "long int" : "long long int") #define UINT_LEAST8_TYPE "unsigned char" #define UINT_LEAST16_TYPE "short unsigned int" #define UINT_LEAST32_TYPE "unsigned int" -#ifdef __x86_64__ -#define UINT_LEAST64_TYPE "long unsigned int" -#else -#define UINT_LEAST64_TYPE "long long unsigned int" -#endif +#define UINT_LEAST64_TYPE (TARGET_64BIT ? "long unsigned int" : "long long unsigned int") /* Fastest minimum-width integer types */ #define INT_FAST8_TYPE "signed char" -#ifdef __x86_64__ -#define INT_FAST16_TYPE "long int" -#define INT_FAST32_TYPE "long int" -#define INT_FAST64_TYPE "long int" -#else -#define INT_FAST16_TYPE "int" -#define INT_FAST32_TYPE "int" -#define INT_FAST64_TYPE "long long int" -#endif +#define INT_FAST16_TYPE (TARGET_64BIT ? "long int" : "int") +#define INT_FAST32_TYPE (TARGET_64BIT ? "long int" : "int") +#define INT_FAST64_TYPE (TARGET_64BIT ? "long int" : "long long int") #define UINT_FAST8_TYPE "unsigned char" -#ifdef __x86_64__ -#define UINT_FAST16_TYPE "long unsigned int" -#define UINT_FAST32_TYPE "long unsigned int" -#define UINT_FAST64_TYPE "long unsigned int" -#else -#define UINT_FAST16_TYPE "unsigned int" -#define UINT_FAST32_TYPE "unsigned int" -#define UINT_FAST64_TYPE "long long unsigned int" -#endif +#define UINT_FAST16_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") +#define UINT_FAST32_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") +#define UINT_FAST64_TYPE (TARGET_64BIT ? "long unsigned int" : "long long unsigned int") /* Integer types capable of holding object pointers */ -#ifdef __x86_64__ -#define INTPTR_TYPE "long int" -#define UINTPTR_TYPE "long unsigned int" -#else -#define INTPTR_TYPE "int" -#define UINTPTR_TYPE "unsigned int" -#endif +#define INTPTR_TYPE (TARGET_64BIT ? "long int" : "int") +#define UINTPTR_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") |