diff options
| author | Bernard Normier <bernard@zeroc.com> | 2019-02-07 16:52:18 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2019-02-07 16:52:18 -0500 |
| commit | ab36e0a0d11d51c258fd82a2934d1ef58b688832 (patch) | |
| tree | 133fce63493df71d733fb6685f9a4ca759218636 /cpp/include | |
| parent | Fix macros for Linux OS detection (diff) | |
| download | ice-ab36e0a0d11d51c258fd82a2934d1ef58b688832.tar.bz2 ice-ab36e0a0d11d51c258fd82a2934d1ef58b688832.tar.xz ice-ab36e0a0d11d51c258fd82a2934d1ef58b688832.zip | |
Replace __linux by __linux__ in remaining files
g++ 8.2 on Power does not define __linux with -std=c++11
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/IceUtil/Atomic.h | 2 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/IceUtil/Atomic.h b/cpp/include/IceUtil/Atomic.h index 1530162517e..244b67cf684 100644 --- a/cpp/include/IceUtil/Atomic.h +++ b/cpp/include/IceUtil/Atomic.h @@ -23,7 +23,7 @@ #elif ((defined(__GNUC__) && (((__GNUC__* 100) + __GNUC_MINOR__) >= 401)) || __clang__) && \ ((defined(__sun) && (defined(__sparc) || defined(__sparcv9))) || \ defined(__APPLE__) || \ - (defined(__linux) && \ + (defined(__linux__) && \ (defined(__i486) || defined(__i586) || \ defined(__i686) || defined(__x86_64)))) diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 03558aad620..a9969c45e57 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -80,7 +80,7 @@ # elif defined(__WORDSIZE) && (__WORDSIZE == 32) # define ICE_32 # elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64)) || \ - defined(__linux) && defined(__x86_64) || \ + defined(__linux__) && defined(__x86_64) || \ defined(__APPLE__) && defined(__x86_64) || \ defined(__hppa) && defined(__LP64__) || \ defined(_ARCH_COM) && defined(__64BIT__) || \ |