diff options
| author | Jose <jose@zeroc.com> | 2016-09-26 21:26:42 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-26 21:26:42 +0200 |
| commit | db405c57c04e7dff8333abc1f6282578fc41b1ec (patch) | |
| tree | 15e7665295623b9b959a04488ec0dc8d6f5f88f0 | |
| parent | Fix ICE-7384 - Java Freeze test failures on macOS (diff) | |
| download | ice-db405c57c04e7dff8333abc1f6282578fc41b1ec.tar.bz2 ice-db405c57c04e7dff8333abc1f6282578fc41b1ec.tar.xz ice-db405c57c04e7dff8333abc1f6282578fc41b1ec.zip | |
Don't include stdint with VS builds
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 5ca6a10227b..aaae9abaaa3 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -64,31 +64,36 @@ #endif - -// -// Use system headers as preferred way to detect 32 or 64 bit mode and -// fallback to architecture based checks -// -#include <stdint.h> - -#if defined(__WORDSIZE) && (__WORDSIZE == 64) -# define ICE_64 -#elif defined(__WORDSIZE) && (__WORDSIZE == 32) -# define ICE_32 -#elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64)) || \ - defined(__linux) && defined(__x86_64) || \ - defined(__APPLE__) && defined(__x86_64) || \ - defined(__hppa) && defined(__LP64__) || \ - defined(_ARCH_COM) && defined(__64BIT__) || \ - defined(__alpha__) || \ - defined(_WIN64) - -# define ICE_64 +#ifdef _MSC_VER -#else +# ifdef _WIN64 +# define ICE_64 +# else +# define ICE_32 +# endif -# define ICE_32 +#else + // + // Use system headers as preferred way to detect 32 or 64 bit mode and + // fallback to architecture based checks + // +# include <stdint.h> + +# if defined(__WORDSIZE) && (__WORDSIZE == 64) +# define ICE_64 +# elif defined(__WORDSIZE) && (__WORDSIZE == 32) +# define ICE_32 +# elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64)) || \ + defined(__linux) && defined(__x86_64) || \ + defined(__APPLE__) && defined(__x86_64) || \ + defined(__hppa) && defined(__LP64__) || \ + defined(_ARCH_COM) && defined(__64BIT__) || \ + defined(__alpha__) +# define ICE_64 +# else +# define ICE_32 +# endif #endif // @@ -219,7 +224,7 @@ #endif #if defined(_AIX) && defined(_LARGE_FILES) - // defines macros such as open that we want to use consistently everywhere + // defines macros such as open that we want to use consistently everywhere # include <fcntl.h> #endif |