MoonchildProductions#1251 - Part 27: Fix ifdef style.

This should do it for all the commits to files I changed, but while I'm in here I could probably go ahead and turn ALL the singular if defined statements into ifdef statements by using grep/find on the tree. On the other hand, perhaps we should do that as a separate issue so that this doesn't become a case of scope creep.

5 files changed, 11 insertions, 11 deletions

diff --git a/ipc/chromium/src/base/message_pump_glib.cc b/ipc/chromium/src/base/message_pump_glib.cc
index f92378f3bb..24081bd8b8 100644
--- a/ipc/chromium/src/base/message_pump_glib.cc
+++ b/ipc/chromium/src/base/message_pump_glib.cc
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <math.h>
 
-#if defined(OS_SOLARIS)
+#ifdef OS_SOLARIS
 #include <unistd.h>
 #endif
 #include <gtk/gtk.h>
@@ -134,7 +134,7 @@ MessagePumpForUI::MessagePumpForUI()
   // Create our wakeup pipe, which is used to flag when work was scheduled.
   int fds[2];
   CHECK(pipe(fds) == 0);
-#if defined(OS_SOLARIS)
+#ifdef OS_SOLARIS
   int flags = fcntl(fds[0], F_GETFL,0);
   if (flags == -1)
     flags = 0;
@@ -324,7 +324,7 @@ void MessagePumpForUI::ScheduleWork() {
   // variables as we would then need locks all over.  This ensures that if
   // we are sleeping in a poll that we will wake up.
   char msg = '!';
-#if defined(OS_SOLARIS)
+#ifdef OS_SOLARIS
   char buf[32];
   while (HANDLE_EINTR(read(wakeup_pipe_read_, &buf, 32)));
 #endif  
diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
index 20d529707f..51d3205b85 100644
--- a/ipc/chromium/src/base/message_pump_libevent.cc
+++ b/ipc/chromium/src/base/message_pump_libevent.cc
@@ -8,7 +8,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#if defined(OS_SOLARIS)
+#ifdef OS_SOLARIS
 #include <sys/stat.h>
 #endif
 #if defined(ANDROID) || defined(OS_POSIX)
diff --git a/ipc/chromium/src/base/sys_info_posix.cc b/ipc/chromium/src/base/sys_info_posix.cc
index 6adbb1c064..f29c85092f 100644
--- a/ipc/chromium/src/base/sys_info_posix.cc
+++ b/ipc/chromium/src/base/sys_info_posix.cc
@@ -121,7 +121,7 @@ std::wstring SysInfo::GetEnvVar(const wchar_t* var) {
 
 // static
 std::string SysInfo::OperatingSystemName() {
-#if !defined(XP_SOLARIS)	
+#ifndef XP_SOLARIS)	
   utsname info;
 #else
   struct utsname info;
@@ -139,7 +139,7 @@ std::string SysInfo::OperatingSystemName() {
 
 // static
 std::string SysInfo::CPUArchitecture() {
-#if !defined(XP_SOLARIS)	
+#ifndef XP_SOLARIS	
   utsname info;
 #else
   struct utsname info;
diff --git a/ipc/chromium/src/base/time.h b/ipc/chromium/src/base/time.h
index 6a5c92d14a..cee4635793 100644
--- a/ipc/chromium/src/base/time.h
+++ b/ipc/chromium/src/base/time.h
@@ -28,7 +28,7 @@
 
 #include "base/basictypes.h"
 
-#if defined(OS_WIN)
+#ifdef OS_WIN
 // For FILETIME in FromFileTime, until it moves to a new converter class.
 // See TODO(iyengar) below.
 #include <windows.h>
@@ -64,7 +64,7 @@ class TimeDelta {
     return delta_;
   }
 
-#if defined(OS_SOLARIS)
+#ifdef OS_SOLARIS
   struct timespec ToTimeSpec() const;
 #endif
 
@@ -230,11 +230,11 @@ class Time {
   static Time FromDoubleT(double dt);
   double ToDoubleT() const;
 
-#if defined(OS_SOLARIS)
+#ifdef OS_SOLARIS
   struct timeval ToTimeVal() const;
 #endif  
 
-#if defined(OS_WIN)
+#ifdef OS_WIN
   static Time FromFileTime(FILETIME ft);
   FILETIME ToFileTime() const;
 #endif
diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
index 419cc8afb0..5e0a922d97 100644
--- a/ipc/chromium/src/base/time_posix.cc
+++ b/ipc/chromium/src/base/time_posix.cc
@@ -202,7 +202,7 @@ TimeTicks TimeTicks::HighResNow() {
   return Now();
 }
 
-#if defined(OS_SOLARIS)
+#ifdef OS_SOLARIS
 struct timespec TimeDelta::ToTimeSpec() const {
   int64_t microseconds = InMicroseconds();
   time_t seconds = 0;