[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-397-g3817aa9

[Daniel Pfeifer]

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  3817aa9ae5796ac3cf971b843b85b5b2ee12d9d1 (commit)
       via  64157fa555be822bf8c7654a0a91b132a888657b (commit)
      from  94a1d960cc2815334c8131ad468ed937cdd4502e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3817aa9ae5796ac3cf971b843b85b5b2ee12d9d1
commit 3817aa9ae5796ac3cf971b843b85b5b2ee12d9d1
Merge: 94a1d96 64157fa
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Jun 17 15:53:23 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 17 15:53:23 2016 -0400

    Merge topic 'cmStandardLexer-include-kwiml' into next
    
    64157fa5 cmStandardLexer: #include <cm_kwiml.h>


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64157fa555be822bf8c7654a0a91b132a888657b
commit 64157fa555be822bf8c7654a0a91b132a888657b
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Jun 17 21:42:02 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Fri Jun 17 21:42:02 2016 +0200

    cmStandardLexer: #include <cm_kwiml.h>
    
    The generated parser headers define C99 *_MAX macros if they are not
    already defined.  This causes warnings on some platforms if stdint.h is
    included after a generated parser header.  Including cm_kwml.h in
    cmStandardLexer.h ensures that the macros come from stdint.h where
    available.

diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h
index 94ed276..eb2f8e3 100644
--- a/Source/cmStandardLexer.h
+++ b/Source/cmStandardLexer.h
@@ -34,6 +34,9 @@
 #define YY_NO_UNISTD_H 1
 #endif
 
+/* Prefer C99 *_MAX macros from stdint.h where available. */
+#include <cm_kwiml.h>
+
 /* Make sure malloc and free are available on QNX.  */
 #ifdef __QNX__
 #include <malloc.h>

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

Summary of changes:
 Source/cmStandardLexer.h |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake