thakis created this revision.
thakis added a reviewer: JDevlieghere.
thakis added a project: LLDB.
Herald added a subscriber: mgorny.
thakis requested review of this revision.
LLVM includes this header unconditionally on all platforms
(including Windows), so this define should no longer be necessary.
No behavior change.
https://reviews.llvm.org/D107338
Files:
lldb/cmake/modules/LLDBGenerateConfig.cmake
lldb/include/lldb/Host/Config.h.cmake
lldb/include/lldb/Host/windows/PosixApi.h
lldb/source/Expression/UserExpression.cpp
lldb/source/Expression/UtilityFunction.cpp
lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
lldb/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp
lldb/tools/driver/Platform.h
Index: lldb/tools/driver/Platform.h
===================================================================
--- lldb/tools/driver/Platform.h
+++ lldb/tools/driver/Platform.h
@@ -9,6 +9,8 @@
#ifndef LLDB_TOOLS_DRIVER_PLATFORM_H
#define LLDB_TOOLS_DRIVER_PLATFORM_H
+// FIXME: This include is now unused. Make sure all files that got it
+// via Platform.h that need it include it directly, then remove this.
#include "lldb/Host/Config.h"
#if defined(_WIN32)
@@ -17,11 +19,10 @@
#if defined(_MSC_VER)
#include <csignal>
#endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
+
#include "lldb/Host/windows/windows.h"
#include <cinttypes>
+#include <sys/types.h>
struct winsize {
long ws_col;
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 <cstdio>
-#if HAVE_SYS_TYPES_H
#include <sys/types.h>
-#endif
#include "lldb/Core/Module.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 <cstdio>
-#if HAVE_SYS_TYPES_H
#include <sys/types.h>
-#endif
#include <cstdlib>
#include <map>
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 <cstdio>
-#if HAVE_SYS_TYPES_H
#include <sys/types.h>
-#endif
-
#include "lldb/Core/Module.h"
#include "lldb/Core/StreamFile.h"
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 <cstdio>
-#if HAVE_SYS_TYPES_H
#include <sys/types.h>
-#endif
#include <cstdlib>
#include <map>
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 <sys/types.h>
#endif
-#endif // HAVE_SYS_TYPES_H
#ifdef _MSC_VER
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/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)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
