Index: lldb/cmake/modules/LLDBGenerateConfig.cmake =================================================================== --- lldb/cmake/modules/LLDBGenerateConfig.cmake +++ lldb/cmake/modules/LLDBGenerateConfig.cmake @@ -12,7 +12,6 @@ check_cxx_symbol_exists(accept4 "sys/socket.h" HAVE_ACCEPT4) check_include_file(termios.h HAVE_TERMIOS_H) -check_include_file("sys/types.h" HAVE_SYS_TYPES_H) check_include_files("sys/types.h;sys/event.h" HAVE_SYS_EVENT_H) check_cxx_symbol_exists(process_vm_readv "sys/uio.h" HAVE_PROCESS_VM_READV) Index: lldb/include/lldb/Host/Config.h.cmake =================================================================== --- lldb/include/lldb/Host/Config.h.cmake +++ lldb/include/lldb/Host/Config.h.cmake @@ -13,9 +13,6 @@ #cmakedefine01 LLDB_HAVE_EL_RFUNC_T - -#cmakedefine01 HAVE_SYS_TYPES_H - #cmakedefine01 HAVE_SYS_EVENT_H #cmakedefine01 HAVE_PPOLL Index: lldb/include/lldb/Host/windows/PosixApi.h =================================================================== --- lldb/include/lldb/Host/windows/PosixApi.h +++ lldb/include/lldb/Host/windows/PosixApi.h @@ -56,14 +56,12 @@ #define S_IRWXO 0 #endif -#if HAVE_SYS_TYPES_H // pyconfig.h typedefs this. We require python headers to be included before // any LLDB headers, but there's no way to prevent python's pid_t definition // from leaking, so this is the best option. #ifndef NO_PID_T #include #endif -#endif // HAVE_SYS_TYPES_H #ifdef _MSC_VER Index: lldb/source/Expression/UserExpression.cpp =================================================================== --- lldb/source/Expression/UserExpression.cpp +++ lldb/source/Expression/UserExpression.cpp @@ -6,12 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Host/Config.h" - #include -#if HAVE_SYS_TYPES_H #include -#endif #include #include Index: lldb/source/Expression/UtilityFunction.cpp =================================================================== --- lldb/source/Expression/UtilityFunction.cpp +++ lldb/source/Expression/UtilityFunction.cpp @@ -6,13 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Host/Config.h" - #include -#if HAVE_SYS_TYPES_H #include -#endif - #include "lldb/Core/Module.h" #include "lldb/Core/StreamFile.h" Index: lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp =================================================================== --- lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp +++ lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp @@ -6,12 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Host/Config.h" - #include -#if HAVE_SYS_TYPES_H #include -#endif #include #include Index: lldb/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp =================================================================== --- lldb/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp +++ lldb/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp @@ -6,8 +6,6 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Host/Config.h" - #include "ClangUtilityFunction.h" #include "ClangExpressionDeclMap.h" #include "ClangExpressionParser.h" @@ -15,9 +13,7 @@ #include "ClangPersistentVariables.h" #include -#if HAVE_SYS_TYPES_H #include -#endif #include "lldb/Core/Module.h" Index: lldb/tools/driver/Platform.h =================================================================== --- lldb/tools/driver/Platform.h +++ lldb/tools/driver/Platform.h @@ -9,19 +9,16 @@ #ifndef LLDB_TOOLS_DRIVER_PLATFORM_H #define LLDB_TOOLS_DRIVER_PLATFORM_H -#include "lldb/Host/Config.h" - #if defined(_WIN32) #include #if defined(_MSC_VER) #include #endif -#if HAVE_SYS_TYPES_H -#include -#endif + #include "lldb/Host/windows/windows.h" #include +#include struct winsize { long ws_col;