diff options
| author | Jose <jose@zeroc.com> | 2016-05-27 12:07:51 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-27 12:07:51 +0200 |
| commit | 562fcec919e74de4a488fefcf16e55d259d426b9 (patch) | |
| tree | fc52b9ce2802674eb77565333c15bfbc308c6a07 /cpp/include | |
| parent | Fixes proguar dependencies (diff) | |
| download | ice-562fcec919e74de4a488fefcf16e55d259d426b9.tar.bz2 ice-562fcec919e74de4a488fefcf16e55d259d426b9.tar.xz ice-562fcec919e74de4a488fefcf16e55d259d426b9.zip | |
Minor fixes for endianness/wordsize detection
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index b159a2f5715..5783d4fd133 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -12,6 +12,7 @@ // // Use the system headers as preferred way to detect endianness +// and fallback to architecture based checks. // // #if defined(__GLIBC__) @@ -36,14 +37,6 @@ # define ICE_BIG_ENDIAN # endif #else - -// -// Fallback to architecture based checks -// -// Most CPUs support only one endianness, with the notable exceptions -// of Itanium (IA64) and MIPS. -// - # if defined(__i386) || \ defined(_M_IX86) || \ defined(__x86_64) || \ @@ -76,10 +69,10 @@ // -// Use system headers as preferred way to detect 32 or 64 bit mode +// Use system headers as preferred way to detect 32 or 64 bit mode and +// fallback to architecture based checks // -#include <stdint.h> -#include <limits.h> +#include <stdint.h> #ifdef __WORDSIZE # if (__WORDSIZE == 64) @@ -88,9 +81,6 @@ # define ICE_32 # endif #else -// -// Fallback to architecture based checks -// # if defined(__sun) && (defined(__sparcv9) || defined(__x86_64)) || \ defined(__linux) && defined(__x86_64) || \ defined(__APPLE__) && defined(__x86_64) || \ |