added standard style conditional compilation guards for unistd.h (ifn…

…def OS_WIN) (issue #7)
wisec · Feb 15, 2013 · 3abacc5 · 3abacc5
1 parent 8e2cf41
commit 3abacc5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/ipc/chromium/src/base/file_util.cc b/ipc/chromium/src/base/file_util.cc
@@ -6,12 +6,11 @@
 
 #if defined(OS_WIN)
 #include <io.h>
-// commented out #if defined(ANDROID) to prevent the compile error 
-// due to undefine ftrunctate on Linux
-#else
-#include <unistd.h>
 #endif
 #include <stdio.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
 
 #include <fstream>
 

diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
@@ -5,8 +5,7 @@
 #include "base/file_util.h"
 
 #include <fcntl.h>
-#ifndef OS_WIN
-// https://bugzilla.mozilla.org/show_bug.cgi?id=736765 - added unistd.h to avoid compile error (DS)
+#if defined(ANDROID) || defined(OS_POSIX)
 #include <unistd.h>
 #endif
 

diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
@@ -6,9 +6,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#ifndef OS_WIN
-// https://bugzilla.mozilla.org/show_bug.cgi?id=746526 - added unistd.h 
-// to avoid compile error on Linux 
+#if defined(ANDROID) || defined(OS_POSIX)
 #include <unistd.h>
 #endif
 

diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
@@ -3,9 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/time.h"
-#ifndef OS_WIN
-#include <unistd.h>
-#endif
 
 #ifdef OS_MACOSX
 #include <mach/mach_time.h>
@@ -17,6 +14,10 @@
 #include <time.h>
 #endif
 
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
+
 #include <limits>
 
 #include "base/basictypes.h"