[Cmake-commits] CMake branch, next, updated. v3.6.2-2624-gb643ce7

[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  b643ce7a898addbacc915f16b7e916c51afc43f1 (commit)
       via  bf2e8129d8a1856fe217d3ff2a53db8c6b5e5230 (commit)
      from  9a4a2c1c6252167654e5b142772b21a72dc8294a (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=b643ce7a898addbacc915f16b7e916c51afc43f1
commit b643ce7a898addbacc915f16b7e916c51afc43f1
Merge: 9a4a2c1 bf2e812
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 29 11:17:19 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 29 11:17:19 2016 -0400

    Merge topic 'bindexplib-mingw' into next
    
    bf2e8129 bindexplib: Define CLSID on MinGW


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf2e8129d8a1856fe217d3ff2a53db8c6b5e5230
commit bf2e8129d8a1856fe217d3ff2a53db8c6b5e5230
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 29 11:15:41 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 29 11:15:41 2016 -0400

    bindexplib: Define CLSID on MinGW
    
    Some MinGW header combinations forget to `typedef GUID CLSID`.  Define
    the name on MinGW just in case.  Define it as a preprocessor macro in
    case the typedef does appear.

diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index db97c47..6bb367c 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -69,6 +69,10 @@
 #include <string>
 #include <windows.h>
 
+#if defined(__MINGW32__)
+# define CLSID GUID  /* Some MinGW header combinations miss this typedef. */
+#endif
+
 typedef struct cmANON_OBJECT_HEADER_BIGOBJ {
    /* same as ANON_OBJECT_HEADER_V2 */
     WORD    Sig1;            // Must be IMAGE_FILE_MACHINE_UNKNOWN

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

Summary of changes:
 Source/bindexplib.cxx |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake