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.
This commit is contained in:
parent
5e871f7089
commit
be14fe4857
|
@ -17,6 +17,7 @@
|
||||||
#include <cmInstalledFile.h>
|
#include <cmInstalledFile.h>
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
// include sys/stat.h after sys/types.h
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger,
|
cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger,
|
||||||
|
|
|
@ -761,6 +761,7 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
// include sys/stat.h after sys/types.h
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -18,8 +18,10 @@
|
||||||
#include "cmSystemTools.h"
|
#include "cmSystemTools.h"
|
||||||
#include "cmake.h"
|
#include "cmake.h"
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <cmsys/FStream.hxx>
|
#include <cmsys/FStream.hxx>
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
// include sys/stat.h after sys/types.h
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
|
|
|
@ -28,8 +28,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef GetCurrentDirectory
|
#undef GetCurrentDirectory
|
||||||
#include <sys/types.h>
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
// include sys/stat.h after sys/types.h
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#include <cmsys/Directory.hxx>
|
#include <cmsys/Directory.hxx>
|
||||||
|
|
|
@ -13,9 +13,10 @@
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <sstream>
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sstream>
|
// include sys/stat.h after sys/types.h
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include <cmsys/FStream.hxx>
|
#include <cmsys/FStream.hxx>
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
// include sys/stat.h after sys/types.h
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
// cmLibraryCommand
|
// cmLibraryCommand
|
||||||
|
|
|
@ -99,11 +99,12 @@
|
||||||
# include "cmGlobalXCodeGenerator.h"
|
# include "cmGlobalXCodeGenerator.h"
|
||||||
# define CMAKE_USE_XCODE 1
|
# define CMAKE_USE_XCODE 1
|
||||||
# endif
|
# endif
|
||||||
# include <sys/types.h>
|
|
||||||
# include <sys/resource.h>
|
# include <sys/resource.h>
|
||||||
# include <sys/time.h>
|
# include <sys/time.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
// include sys/stat.h after sys/types.h
|
||||||
#include <sys/stat.h> // struct stat
|
#include <sys/stat.h> // struct stat
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
Loading…
Reference in New Issue