Changes to base/ from a combination of FreeBSD and OpenBSD patches.
Review URL: http://codereview.chromium.org/495002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35321 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: e43eddf1a5887c4b249af3daa024c1107ce254a1
diff --git a/base/message_loop.cc b/base/message_loop.cc
index 9799100..314a7a0 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -20,7 +20,7 @@
#include "base/message_pump_libevent.h"
#include "base/third_party/valgrind/valgrind.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
#include "base/message_pump_glib.h"
#endif
@@ -99,9 +99,9 @@
if (type_ == TYPE_UI) {
#if defined(OS_MACOSX)
pump_ = base::MessagePumpMac::Create();
-#elif defined(OS_LINUX)
+#else
pump_ = new base::MessagePumpForUI();
-#endif // OS_LINUX
+#endif
} else if (type_ == TYPE_IO) {
pump_ = new base::MessagePumpLibevent();
} else {
@@ -194,7 +194,7 @@
StartHistogrammer();
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if !defined(OS_MACOSX)
if (state_->dispatcher && type() == TYPE_UI) {
static_cast<base::MessagePumpForUI*>(pump_.get())->
RunWithDispatcher(this, state_->dispatcher);
@@ -487,7 +487,7 @@
// Initialize the other fields:
quit_received = false;
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if !defined(OS_MACOSX)
dispatcher = NULL;
#endif
}
@@ -588,7 +588,7 @@
#endif // defined(OS_WIN)
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if !defined(OS_MACOSX)
void MessageLoopForUI::AddObserver(Observer* observer) {
pump_ui()->AddObserver(observer);
}
@@ -602,7 +602,7 @@
state_->dispatcher = dispatcher;
RunHandler();
}
-#endif // defined(OS_LINUX) || defined(OS_WIN)
+#endif // !defined(OS_MACOSX)
//------------------------------------------------------------------------------
// MessageLoopForIO