[Lldb-commits] [lldb] r313707 - Rollback r313704 because of the Windows build break

[Eugene Zemtsov via lldb-commits]

Author: eugene
Date: Tue Sep 19 18:57:59 2017
New Revision: 313707

URL: http://llvm.org/viewvc/llvm-project?rev=313707&view=rev
Log:
Rollback r313704 because of the Windows build break

Modified:
    lldb/trunk/include/lldb/Host/MainLoop.h
    lldb/trunk/source/Host/common/MainLoop.cpp

Modified: lldb/trunk/include/lldb/Host/MainLoop.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/MainLoop.h?rev=313707&r1=313706&r2=313707&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/MainLoop.h (original)
+++ lldb/trunk/include/lldb/Host/MainLoop.h Tue Sep 19 18:57:59 2017
@@ -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
 

Modified: lldb/trunk/source/Host/common/MainLoop.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/MainLoop.cpp?rev=313707&r1=313706&r2=313707&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/MainLoop.cpp (original)
+++ lldb/trunk/source/Host/common/MainLoop.cpp Tue Sep 19 18:57:59 2017
@@ -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;