From be14fe4857299ccd5918e6b1f8db0f0587db2850 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 2 May 2016 15:03:45 -0400
Subject: Source: Stabilize include order of sys/types.h before sys/stat.h

Include the two headers in an isolated block with a comment separating
them so that tools that re-order includes do not re-order these.
---
 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx | 1 +
 Source/CPack/cmCPackDebGenerator.cxx        | 1 +
 Source/CPack/cmCPackSTGZGenerator.cxx       | 4 +++-
 Source/cmFileCommand.cxx                    | 4 +++-
 Source/cmTimestamp.cxx                      | 3 ++-
 Source/cmWriteFileCommand.cxx               | 1 +
 Source/cmake.cxx                            | 3 ++-
 7 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
index 446ce96..2833d53 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -17,6 +17,7 @@
 #include <cmInstalledFile.h>
 
 #include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger,
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 9e17bc8..794955f 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -761,6 +761,7 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
  */
 
 #include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 #include <stdio.h>
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 8a83666..4a8754e 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -18,8 +18,10 @@
 #include "cmSystemTools.h"
 #include "cmake.h"
 
-#include <sys/types.h>
 #include <cmsys/FStream.hxx>
+
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 035b97f..575051e 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -28,8 +28,10 @@
 #endif
 
 #undef GetCurrentDirectory
-#include <sys/types.h>
 #include <assert.h>
+
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 #include <cmsys/Directory.hxx>
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 7d1ba32..b5c9d8e 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -13,9 +13,10 @@
 
 #include <cstdlib>
 #include <cstring>
+#include <sstream>
 
 #include <sys/types.h>
-#include <sstream>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx
index d52d6b5..c4468f3 100644
--- a/Source/cmWriteFileCommand.cxx
+++ b/Source/cmWriteFileCommand.cxx
@@ -14,6 +14,7 @@
 #include <cmsys/FStream.hxx>
 
 #include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 // cmLibraryCommand
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index da6e59e..f176cc1 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -99,11 +99,12 @@
 #    include "cmGlobalXCodeGenerator.h"
 #    define CMAKE_USE_XCODE 1
 #  endif
-#  include <sys/types.h>
 #  include <sys/resource.h>
 #  include <sys/time.h>
 #endif
 
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h> // struct stat
 
 #include <list>
-- 
cgit v0.12