aboutsummaryrefslogtreecommitdiff
path: root/devel/ice/files/patch-cpp-include-IceUtil-Config.h
diff options
context:
space:
mode:
Diffstat (limited to 'devel/ice/files/patch-cpp-include-IceUtil-Config.h')
-rw-r--r--devel/ice/files/patch-cpp-include-IceUtil-Config.h24
1 files changed, 21 insertions, 3 deletions
diff --git a/devel/ice/files/patch-cpp-include-IceUtil-Config.h b/devel/ice/files/patch-cpp-include-IceUtil-Config.h
index 79047cf87788..677e339779ae 100644
--- a/devel/ice/files/patch-cpp-include-IceUtil-Config.h
+++ b/devel/ice/files/patch-cpp-include-IceUtil-Config.h
@@ -1,6 +1,24 @@
---- cpp/include/IceUtil/Config.h.orig 2015-06-27 15:37:32.688102665 +0000
-+++ cpp/include/IceUtil/Config.h 2015-06-27 15:37:34.926179135 +0000
-@@ -49,6 +49,16 @@
+--- cpp/include/IceUtil/Config.h.orig 2016-10-05 16:59:08.000000000 +0200
++++ cpp/include/IceUtil/Config.h 2017-01-30 22:11:08.235308977 +0100
+@@ -80,13 +80,15 @@
+ //
+ # include <stdint.h>
+
+-# if defined(__WORDSIZE) && (__WORDSIZE == 64)
++# if (__cplusplus >= 201103L) && defined(__WORDSIZE) && (__WORDSIZE == 64)
+ # define ICE_64
+-# elif defined(__WORDSIZE) && (__WORDSIZE == 32)
++# elif (__cplusplus >= 201103L) && 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(__FreeBSD__) && defined(__x86_64) || \
++ defined(__FreeBSD__) && defined(__LP64__) || \
+ defined(__hppa) && defined(__LP64__) || \
+ defined(_ARCH_COM) && defined(__64BIT__) || \
+ defined(__alpha__) || \
+@@ -98,6 +100,16 @@
#endif
//