summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-01-10 10:22:09 -0500
committerCMake Topic Stage <kwrobot@kitware.com>2013-01-10 10:22:09 -0500
commit8a7a4c043c2fede043ce8bf8676a95e1b779fe5e (patch)
tree469754ee810ce80b8a47def8475f3daed6c781a2
parent96c1a1b787155f98265bcac2338b25ad579faca0 (diff)
parent32fb667a0c9622999d7054e809863a8e70010059 (diff)
downloadcmake-8a7a4c043c2fede043ce8bf8676a95e1b779fe5e.tar.gz
Merge topic 'update-KWIML'
32fb667 Merge branch 'upstream-kwiml' into update-KWIML 9fdfe07 KWIML: Teach ABI about 'long long' on older GNU
-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 7f4772ae51..b71cdfb9f1 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