[Cmake-commits] CMake branch, next, updated. v2.8.6-1858-ga12a18f

[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  a12a18fb045e7ba5265fdc696d56562b29be27b0 (commit)
       via  e2a0455d4044c3f21915dd0966b39ab4bf93d55a (commit)
       via  33fff24aca46c4eca17997c42c5f62d71666b836 (commit)
      from  bcd214aeb79fa84c173dfa491c5d659287d00f78 (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=a12a18fb045e7ba5265fdc696d56562b29be27b0
commit a12a18fb045e7ba5265fdc696d56562b29be27b0
Merge: bcd214a e2a0455
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Nov 13 15:07:34 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 13 15:07:34 2011 -0500

    Merge topic 'import-KWIML' into next
    
    e2a0455 Merge branch 'upstream-kwiml' into import-KWIML
    33fff24 KWIML: No INT_SCN*8 on Intel for Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2a0455d4044c3f21915dd0966b39ab4bf93d55a
commit e2a0455d4044c3f21915dd0966b39ab4bf93d55a
Merge: c364b59 33fff24
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Nov 13 15:07:02 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Nov 13 15:07:02 2011 -0500

    Merge branch 'upstream-kwiml' into import-KWIML


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33fff24aca46c4eca17997c42c5f62d71666b836
commit 33fff24aca46c4eca17997c42c5f62d71666b836
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Nov 13 15:03:15 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Nov 13 15:06:12 2011 -0500

    KWIML: No INT_SCN*8 on Intel for Windows
    
    Intel C/C++ for Windows does not support the SCN*8 format (%hh*).
    The MS runtime does not support it.

diff --git a/INT.h.in b/INT.h.in
index 5fca08f..3c1f05d 100644
--- a/INT.h.in
+++ b/INT.h.in
@@ -191,6 +191,9 @@ An includer may test the following macros after inclusion:
 #endif
 
 #if defined(__INTEL_COMPILER)
+# if defined(_WIN32)
+#  define @KWIML at _INT__NO_SCN8
+# endif
 #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 # define @KWIML at _INT__NO_SCN8
 #elif defined(__HP_cc) || defined(__HP_aCC)

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

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


hooks/post-receive
-- 
CMake