diff options
| -rw-r--r-- | cmake/modules/LLDBGenerateConfig.cmake | 1 | ||||
| -rw-r--r-- | include/lldb/Host/Config.h.cmake | 2 | ||||
| -rw-r--r-- | include/lldb/Host/windows/PosixApi.h | 5 | ||||
| -rw-r--r-- | source/Expression/UserExpression.cpp | 2 | ||||
| -rw-r--r-- | source/Expression/UtilityFunction.cpp | 2 | ||||
| -rw-r--r-- | source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp | 2 | ||||
| -rw-r--r-- | source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp | 2 | ||||
| -rw-r--r-- | tools/driver/Platform.h | 2 |
8 files changed, 16 insertions, 2 deletions
diff --git a/cmake/modules/LLDBGenerateConfig.cmake b/cmake/modules/LLDBGenerateConfig.cmake index 33b7e9831..119021c58 100644 --- a/cmake/modules/LLDBGenerateConfig.cmake +++ b/cmake/modules/LLDBGenerateConfig.cmake @@ -12,6 +12,7 @@ check_symbol_exists(sigaction signal.h HAVE_SIGACTION) 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) diff --git a/include/lldb/Host/Config.h.cmake b/include/lldb/Host/Config.h.cmake index b8fb9e9de..7f152437f 100644 --- a/include/lldb/Host/Config.h.cmake +++ b/include/lldb/Host/Config.h.cmake @@ -19,6 +19,8 @@ #define LLDB_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" +#cmakedefine01 HAVE_SYS_TYPES_H + #cmakedefine01 HAVE_SYS_EVENT_H #cmakedefine01 HAVE_PPOLL diff --git a/include/lldb/Host/windows/PosixApi.h b/include/lldb/Host/windows/PosixApi.h index aab09e122..6a6ed3ebd 100644 --- a/include/lldb/Host/windows/PosixApi.h +++ b/include/lldb/Host/windows/PosixApi.h @@ -9,6 +9,7 @@ #ifndef liblldb_Host_windows_PosixApi_h #define liblldb_Host_windows_PosixApi_h +#include "lldb/Host/Config.h" #include "llvm/Support/Compiler.h" #if !defined(_WIN32) #error "windows/PosixApi.h being #included on non Windows system!" @@ -45,14 +46,14 @@ #define S_IRWXG 0 #define S_IRWXO 0 -#ifdef __MINGW32__ +#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 <sys/types.h> #endif -#endif // __MINGW32__ +#endif // HAVE_SYS_TYPES_H #ifdef _MSC_VER diff --git a/source/Expression/UserExpression.cpp b/source/Expression/UserExpression.cpp index ea54cec7b..e2d1d2f2b 100644 --- a/source/Expression/UserExpression.cpp +++ b/source/Expression/UserExpression.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +#include "lldb/Host/Config.h" + #include <stdio.h> #if HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/source/Expression/UtilityFunction.cpp b/source/Expression/UtilityFunction.cpp index eeaeca18d..aac8b33a6 100644 --- a/source/Expression/UtilityFunction.cpp +++ b/source/Expression/UtilityFunction.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +#include "lldb/Host/Config.h" + #include <stdio.h> #if HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp b/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp index 91f333fc0..54d852b2d 100644 --- a/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp +++ b/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +#include "lldb/Host/Config.h" + #include <stdio.h> #if HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp b/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp index 5eec22447..564c62c6a 100644 --- a/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp +++ b/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +#include "lldb/Host/Config.h" + #include "ClangUtilityFunction.h" #include "ClangExpressionDeclMap.h" #include "ClangExpressionParser.h" diff --git a/tools/driver/Platform.h b/tools/driver/Platform.h index aeb8cc97f..cf6c4ec8e 100644 --- a/tools/driver/Platform.h +++ b/tools/driver/Platform.h @@ -9,6 +9,8 @@ #ifndef lldb_Platform_h_ #define lldb_Platform_h_ +#include "lldb/Host/Config.h" + #if defined(_WIN32) #include <io.h> |