summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-01-08 20:31:53 (GMT)
committerBrad King <brad.king@kitware.com>2013-01-08 20:31:53 (GMT)
commit32fb667a0c9622999d7054e809863a8e70010059 (patch)
tree9ee68aa53932886ee1167c5c932456f83e7ae2f8
parenta9f1bf438054227e989ad1706b785b978e18455c (diff)
parent9fdfe07411d8846f2adf0e46cf9046238c149d2b (diff)
downloadCMake-32fb667a0c9622999d7054e809863a8e70010059.zip
CMake-32fb667a0c9622999d7054e809863a8e70010059.tar.gz
CMake-32fb667a0c9622999d7054e809863a8e70010059.tar.bz2
Merge branch 'upstream-kwiml' into update-KWIML
-rw-r--r--Utilities/KWIML/ABI.h.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/Utilities/KWIML/ABI.h.in b/Utilities/KWIML/ABI.h.in
index 7f4772a..b71cdfb 100644
--- a/Utilities/KWIML/ABI.h.in
+++ b/Utilities/KWIML/ABI.h.in
@@ -253,7 +253,9 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined.
# else
# define @KWIML@_ABI_SIZEOF_LONG_LONG 0
# endif
-# elif defined(__hpux) && !defined(__GNUC__) /* Old HP: no __HP_cc/__HP_aCC above */
+# elif defined(__GNUC__) /* GNU */
+# define @KWIML@_ABI_SIZEOF_LONG_LONG 8
+# elif defined(__hpux) /* Old HP: no __HP_cc/__HP_aCC/__GNUC__ above */
# define @KWIML@_ABI_SIZEOF_LONG_LONG 8
# endif
#endif