Przeglądaj źródła

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.
Brad King 9 lat temu
rodzic
commit
be14fe4857

+ 1 - 0
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,

+ 1 - 0
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>

+ 3 - 1
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>
 
 //----------------------------------------------------------------------

+ 3 - 1
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>

+ 2 - 1
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>
 
 //----------------------------------------------------------------------------

+ 1 - 0
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

+ 2 - 1
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>