[Cmake-commits] CMake branch, next, updated. v2.8.6-1851-g54cac81
Brad King
brad.king at kitware.com
Sat Nov 12 10:12:47 EST 2011
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 54cac81fa74661000fb82012f1fe4cc672e0cb50 (commit)
via c364b59dabed7fa7274a5cc6d3b3a2233a34d622 (commit)
via bcc06d498ccdc6af80544b415678f4385f99279b (commit)
from 98bd57808c687ab14f5e1761c112e40c381a4483 (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=54cac81fa74661000fb82012f1fe4cc672e0cb50
commit 54cac81fa74661000fb82012f1fe4cc672e0cb50
Merge: 98bd578 c364b59
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 12 10:12:44 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 12 10:12:44 2011 -0500
Merge topic 'import-KWIML' into next
c364b59 Merge branch 'upstream-kwiml' into import-KWIML
bcc06d4 KWIML: No INT_SCN*8 on SunPro compiler
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c364b59dabed7fa7274a5cc6d3b3a2233a34d622
commit c364b59dabed7fa7274a5cc6d3b3a2233a34d622
Merge: 22c26a4 bcc06d4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 12 10:12:07 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 12 10:12:07 2011 -0500
Merge branch 'upstream-kwiml' into import-KWIML
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcc06d498ccdc6af80544b415678f4385f99279b
commit bcc06d498ccdc6af80544b415678f4385f99279b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 12 10:03:33 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 12 10:10:07 2011 -0500
KWIML: No INT_SCN*8 on SunPro compiler
The Sun compiler does not document support for SCN*8 format (%hh*).
It works only on platforms that happen to provide a runtime library
that supports the format.
diff --git a/INT.h.in b/INT.h.in
index 4a6298a..5fca08f 100644
--- a/INT.h.in
+++ b/INT.h.in
@@ -191,9 +191,7 @@ An includer may test the following macros after inclusion:
#endif
#if defined(__INTEL_COMPILER)
-#elif defined(__SUNPRO_C) && __SUNPRO_C < 0x570
-# define @KWIML at _INT__NO_SCN8
-#elif defined(__SUNPRO_CC) && __SUNPRO_CC < 0x570
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define @KWIML at _INT__NO_SCN8
#elif defined(__HP_cc) || defined(__HP_aCC)
# define @KWIML at _INT__NO_SCN8
-----------------------------------------------------------------------
Summary of changes:
Utilities/KWIML/INT.h.in | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list