[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1508-gd118a42

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d118a423d728e2e0adddb1d0cdad3fccbb9f8c4f (commit)
       via  32fb667a0c9622999d7054e809863a8e70010059 (commit)
       via  9fdfe07411d8846f2adf0e46cf9046238c149d2b (commit)
      from  2d5f84f105819187fde31cc237b1f086d56b24a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d118a423d728e2e0adddb1d0cdad3fccbb9f8c4f
commit d118a423d728e2e0adddb1d0cdad3fccbb9f8c4f
Merge: 2d5f84f 32fb667
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 8 15:32:36 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 8 15:32:36 2013 -0500

    Merge topic 'update-KWIML' into next
    
    32fb667 Merge branch 'upstream-kwiml' into update-KWIML
    9fdfe07 KWIML: Teach ABI about 'long long' on older GNU


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32fb667a0c9622999d7054e809863a8e70010059
commit 32fb667a0c9622999d7054e809863a8e70010059
Merge: a9f1bf4 9fdfe07
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 8 15:31:53 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 8 15:31:53 2013 -0500

    Merge branch 'upstream-kwiml' into update-KWIML


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fdfe07411d8846f2adf0e46cf9046238c149d2b
commit 9fdfe07411d8846f2adf0e46cf9046238c149d2b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 8 14:43:26 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 8 15:31:13 2013 -0500

    KWIML: Teach ABI about 'long long' on older GNU
    
    Old GNU compilers do not define __SIZEOF_LONG_LONG__ or
    __LONG_LONG_MAX__ but do provide a 64-bit 'long long' type.
    
    Suggested-by: Rolf Eike Beer <eike at sf-mail.de>

diff --git a/ABI.h.in b/ABI.h.in
index 7f4772a..b71cdfb 100644
--- a/ABI.h.in
+++ b/ABI.h.in
@@ -253,7 +253,9 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined.
 #  else
 #   define @KWIML at _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 at _ABI_SIZEOF_LONG_LONG 8
+# elif defined(__hpux) /* Old HP: no __HP_cc/__HP_aCC/__GNUC__ above */
 #  define @KWIML at _ABI_SIZEOF_LONG_LONG 8
 # endif
 #endif

-----------------------------------------------------------------------

Summary of changes:
 Utilities/KWIML/ABI.h.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake