summaryrefslogtreecommitdiffstats
path: root/ipc/chromium
diff options
context:
space:
mode:
Diffstat (limited to 'ipc/chromium')
-rw-r--r--ipc/chromium/src/base/message_pump_glib.cc2
-rw-r--r--ipc/chromium/src/chrome/common/transport_dib.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ipc/chromium/src/base/message_pump_glib.cc b/ipc/chromium/src/base/message_pump_glib.cc
index a5e719c72..f92378f3b 100644
--- a/ipc/chromium/src/base/message_pump_glib.cc
+++ b/ipc/chromium/src/base/message_pump_glib.cc
@@ -138,7 +138,7 @@ MessagePumpForUI::MessagePumpForUI()
int flags = fcntl(fds[0], F_GETFL,0);
if (flags == -1)
flags = 0;
- fntl(fds[0], F_SETFL, flags | O_NDELAY);
+ fcntl(fds[0], F_SETFL, flags | O_NDELAY);
#endif
wakeup_pipe_read_ = fds[0];
wakeup_pipe_write_ = fds[1];
diff --git a/ipc/chromium/src/chrome/common/transport_dib.h b/ipc/chromium/src/chrome/common/transport_dib.h
index e3c40768c..f40a97d17 100644
--- a/ipc/chromium/src/chrome/common/transport_dib.h
+++ b/ipc/chromium/src/chrome/common/transport_dib.h
@@ -15,7 +15,7 @@
#if defined(OS_WIN)
#include <windows.h>
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_SOLARIS)
#include "chrome/common/x11_util.h"
#endif