[Cmake-commits] CMake branch, next, updated. v3.6.2-2626-g0554194

[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  05541949dce624d7e67d44f03606a1afa16f0ee6 (commit)
       via  517c8e0444b05c717520642ac2f4dd25cd5562f3 (commit)
      from  b643ce7a898addbacc915f16b7e916c51afc43f1 (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=05541949dce624d7e67d44f03606a1afa16f0ee6
commit 05541949dce624d7e67d44f03606a1afa16f0ee6
Merge: b643ce7 517c8e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 29 11:45:29 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 29 11:45:29 2016 -0400

    Merge topic 'bindexplib-mingw' into next
    
    517c8e04 Revert "bindexplib: Define CLSID on MinGW"


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

    Revert "bindexplib: Define CLSID on MinGW"
    
    This reverts commit bf2e8129d8a1856fe217d3ff2a53db8c6b5e5230.

diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 6bb367c..db97c47 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -69,10 +69,6 @@
 #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 deletions(-)


hooks/post-receive
-- 
CMake