[Cmake-commits] CMake branch, next, updated. v3.5.2-1166-g7b3ba67

[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  7b3ba6767bd2b8d91284109abed7a6dc5ffe7dfb (commit)
       via  3ee1e0bcc5827167baeacf4f490108d9f1cd3676 (commit)
      from  3aa6caa1eedb73787bee1aff95c4124c38ae68b1 (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=7b3ba6767bd2b8d91284109abed7a6dc5ffe7dfb
commit 7b3ba6767bd2b8d91284109abed7a6dc5ffe7dfb
Merge: 3aa6caa 3ee1e0b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 13:59:06 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 29 13:59:06 2016 -0400

    Merge topic 'clang-format-include-order' into next
    
    3ee1e0bc fixup! Source: Stabilize include order


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ee1e0bcc5827167baeacf4f490108d9f1cd3676
commit 3ee1e0bcc5827167baeacf4f490108d9f1cd3676
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 13:55:38 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 13:55:38 2016 -0400

    fixup! Source: Stabilize include order

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index f90eaf5..3177a84 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -38,8 +38,9 @@
 #include <cmsys/Terminal.h>
 
 #if defined(_WIN32)
-# include <wincrypt.h>
 # include <windows.h>
+  // include wincrypt.h after windows.h
+# include <wincrypt.h>
 #else
 # include <sys/types.h>
 # include <sys/time.h>

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

Summary of changes:
 Source/cmSystemTools.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake