diff options
| author | Eugene Zemtsov <ezemtsov@google.com> | 2017-09-20 01:57:59 +0000 |
|---|---|---|
| committer | Eugene Zemtsov <ezemtsov@google.com> | 2017-09-20 01:57:59 +0000 |
| commit | b207d12456782bd04eb06ba8f3d89eb4008d81f6 (patch) | |
| tree | 5656753293c05752f035b5a124730dda442f135d | |
| parent | b487bf45f0d457e9811b4345ab8304b76213b302 (diff) | |
| download | bcm5719-llvm-b207d12456782bd04eb06ba8f3d89eb4008d81f6.tar.gz bcm5719-llvm-b207d12456782bd04eb06ba8f3d89eb4008d81f6.zip | |
Rollback r313704 because of the Windows build break
llvm-svn: 313707
| -rw-r--r-- | lldb/include/lldb/Host/MainLoop.h | 7 | ||||
| -rw-r--r-- | lldb/source/Host/common/MainLoop.cpp | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lldb/include/lldb/Host/MainLoop.h b/lldb/include/lldb/Host/MainLoop.h index 47247da1475..5ac145ff865 100644 --- a/lldb/include/lldb/Host/MainLoop.h +++ b/lldb/include/lldb/Host/MainLoop.h @@ -15,12 +15,7 @@ #include "llvm/ADT/DenseMap.h" #include <csignal> -#ifdef __ANDROID__ -#define FORCE_PSELECT -#endif - -#if !defined(HAVE_PPOLL) && !defined(HAVE_SYS_EVENT_H) && \ - !defined(FORCE_PSELECT) +#if !HAVE_PPOLL && !HAVE_SYS_EVENT_H #define SIGNAL_POLLING_UNSUPPORTED 1 #endif diff --git a/lldb/source/Host/common/MainLoop.cpp b/lldb/source/Host/common/MainLoop.cpp index e48882b274e..d0e0d00a315 100644 --- a/lldb/source/Host/common/MainLoop.cpp +++ b/lldb/source/Host/common/MainLoop.cpp @@ -38,6 +38,10 @@ #define POLL poll #endif +#ifdef __ANDROID__ +#define FORCE_PSELECT +#endif + #if SIGNAL_POLLING_UNSUPPORTED #ifdef LLVM_ON_WIN32 typedef int sigset_t; |
