Replace #ifdef HAVE_UNISTD_H checks with #ifdef G_OS_UNIX

In Windows development environments that have it, <unistd.h> is mostly
just a wrapper around several other native headers (in particular,
<io.h>, which contains read(), close(), etc, and <process.h>, which
contains getpid()). But given that some Windows dev environments don't
have <unistd.h>, everything that uses those functions on Windows
already needed to include the correct Windows header as well, and so
there is never any point to including <unistd.h> on Windows.

Also, remove some <unistd.h> includes (and a few others) that were
unnecessary even on unix.

https://bugzilla.gnome.org/show_bug.cgi?id=710519

25 files changed, 40 insertions, 70 deletions

diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 569d438b7..a2eaab331 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -29,11 +29,6 @@
 #include <locale.h>
 #include <time.h>
 #include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
 #include "gconvert.h"
 #include "gdataset.h"
diff --git a/glib/gdatetime.c b/glib/gdatetime.c
index f7f4ba2a9..6069e9033 100644
--- a/glib/gdatetime.c
+++ b/glib/gdatetime.c
@@ -50,10 +50,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef HAVE_LANGINFO_TIME
 #include <langinfo.h>
 #endif
diff --git a/glib/genviron.c b/glib/genviron.c
index 9f0ae24ca..01e8b82ea 100644
--- a/glib/genviron.c
+++ b/glib/genviron.c
@@ -30,9 +30,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_CRT_EXTERNS_H
 #include <crt_externs.h> /* for _NSGetEnviron */
 #endif
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 233d299f7..fb47fc8a4 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -22,9 +22,6 @@
 #include "glibconfig.h"
 
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -35,6 +32,9 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#endif
 #ifdef G_OS_WIN32
 #include <windows.h>
 #include <io.h>
diff --git a/glib/giochannel.c b/glib/giochannel.c
index 84e9d7691..b9c45dfdd 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -36,10 +36,6 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "giochannel.h"
 
 #include "gstrfuncs.h"
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index b3fcb679e..ff5c5eb64 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
+#ifdef G_OS_UNIX
 #include <unistd.h>
 #endif
 #ifdef G_OS_WIN32
diff --git a/glib/gmain.c b/glib/gmain.c
index ad2570705..c3b1f16ed 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -62,9 +62,9 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif /* HAVE_SYS_TIME_H */
-#ifdef HAVE_UNISTD_H
+#ifdef G_OS_UNIX
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#endif /* G_OS_UNIX */
 #include <errno.h>
 #include <string.h>
 
diff --git a/glib/gmappedfile.c b/glib/gmappedfile.c
index 7d241e730..1c019e10a 100644
--- a/glib/gmappedfile.c
+++ b/glib/gmappedfile.c
@@ -25,15 +25,16 @@
 #include <sys/types.h> 
 #include <sys/stat.h> 
 #include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
 #endif
 
 #include "glibconfig.h"
 
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#endif
+
 #ifdef G_OS_WIN32
 #include <windows.h>
 #include <io.h>
diff --git a/glib/gmessages.c b/glib/gmessages.c
index 2965d28a2..f21fc7ef5 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -52,9 +52,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <signal.h>
 #include <locale.h>
 #include <errno.h>
@@ -74,6 +71,10 @@
 #include "gstring.h"
 #include "gpattern.h"
 
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#endif
+
 #ifdef G_OS_WIN32
 #include <process.h>		/* For getpid() */
 #include <io.h>
diff --git a/glib/gpoll.c b/glib/gpoll.c
index 354c08fdf..66c5f0ee7 100644
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -66,9 +66,9 @@
 #endif
 
 #endif /* GLIB_HAVE_SYS_POLL_H */
-#ifdef HAVE_UNISTD_H
+#ifdef G_OS_UNIX
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#endif /* G_OS_UNIX */
 #include <errno.h>
 
 #ifdef G_OS_WIN32
diff --git a/glib/grand.c b/glib/grand.c
index 3f043ad5e..fb2a8ec5b 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -44,10 +44,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "grand.h"
 
 #include "genviron.h"
@@ -56,6 +52,10 @@
 #include "gtestutils.h"
 #include "gthread.h"
 
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#endif
+
 #ifdef G_OS_WIN32
 #include <stdlib.h>
 #endif
diff --git a/glib/gscanner.c b/glib/gscanner.c
index 9fc5e7c46..9d737495b 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -38,9 +38,6 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
 #include "gscanner.h"
 
@@ -49,8 +46,11 @@
 #include "gstring.h"
 #include "gtestutils.h"
 
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#endif
 #ifdef G_OS_WIN32
-#include <io.h> /* For _read() */
+#include <io.h>
 #endif
 
 
diff --git a/glib/gslice.c b/glib/gslice.c
index 24ce62f69..5f545fc36 100644
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef HAVE_UNISTD_H
+#ifdef G_OS_UNIX
 #include <unistd.h>             /* sysconf() */
 #endif
 #ifdef G_OS_WIN32
diff --git a/glib/gstdio.c b/glib/gstdio.c
index a78558fcc..dfb3feb1c 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifdef HAVE_UNISTD_H
+#ifdef G_OS_UNIX
 #include <unistd.h>
 #endif
 
diff --git a/glib/gstring.c b/glib/gstring.c
index ef77133c6..782fd4a00 100644
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -30,9 +30,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 353a2db2e..fa820db21 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -29,14 +29,12 @@
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <glib/gstdio.h>
 #endif
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
diff --git a/glib/gthread.c b/glib/gthread.c
index c4114aa92..2df13c4c6 100644
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -45,7 +45,7 @@
 
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
+#ifdef G_OS_UNIX
 #include <unistd.h>
 #endif
 
@@ -1039,7 +1039,7 @@ g_get_num_processors (void)
       if (count > 0)
         return count;
     }
-#elif defined(HAVE_UNISTD_H) && defined(_SC_NPROCESSORS_ONLN)
+#elif defined(_SC_NPROCESSORS_ONLN)
   {
     int count;
 
diff --git a/glib/gtimer.c b/glib/gtimer.c
index a45c3cff0..f1bef0723 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -33,9 +33,9 @@
 
 #include <stdlib.h>
 
-#ifdef HAVE_UNISTD_H
+#ifdef G_OS_UNIX
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#endif /* G_OS_UNIX */
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
diff --git a/glib/gutils.c b/glib/gutils.c
index 1395757d1..6ed1a65fa 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -31,9 +31,6 @@
 #include "config.h"
 #include "glibconfig.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -45,6 +42,7 @@
 #include <sys/stat.h>
 #ifdef G_OS_UNIX
 #include <pwd.h>
+#include <unistd.h>
 #endif
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
diff --git a/glib/tests/base64.c b/glib/tests/base64.c
index e5ac5b960..e1420e101 100644
--- a/glib/tests/base64.c
+++ b/glib/tests/base64.c
@@ -1,8 +1,5 @@
 #include <glib.h>
 #include <string.h>
-#ifdef G_OS_UNIX
-#include <unistd.h>
-#endif
 #include <stdlib.h>
 
 #define DATA_SIZE 1024
diff --git a/glib/tests/checksum.c b/glib/tests/checksum.c
index a5d2ea0a3..b6ae3ef5b 100644
--- a/glib/tests/checksum.c
+++ b/glib/tests/checksum.c
@@ -1,8 +1,5 @@
 #include <glib.h>
 #include <string.h>
-#ifdef G_OS_UNIX
-#include <unistd.h>
-#endif
 #include <stdlib.h>
 
 /* Test GChecksum by computing the checksums of every initial
diff --git a/glib/tests/hmac.c b/glib/tests/hmac.c
index c8215dbe5..f6ee643b1 100644
--- a/glib/tests/hmac.c
+++ b/glib/tests/hmac.c
@@ -1,8 +1,5 @@
 #include <glib.h>
 #include <string.h>
-#ifdef G_OS_UNIX
-#include <unistd.h>
-#endif
 #include <stdlib.h>
 
 /* HMAC-MD5 test vectors as per RFC 2202 */
diff --git a/glib/tests/mappedfile.c b/glib/tests/mappedfile.c
index 6b2210512..99c26c9e7 100644
--- a/glib/tests/mappedfile.c
+++ b/glib/tests/mappedfile.c
@@ -2,14 +2,18 @@
 
 #include <glib.h>
 #include <string.h>
-#ifdef G_OS_UNIX
-#include <unistd.h>
-#endif
 #include <glib/gstdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#endif
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
+
 static void
 test_basic (void)
 {
diff --git a/glib/tests/node.c b/glib/tests/node.c
index b1994eb3c..1f5e5ebab 100644
--- a/glib/tests/node.c
+++ b/glib/tests/node.c
@@ -33,10 +33,6 @@
 
 #include "glib.h"
 
-#ifdef G_OS_UNIX
-#include <unistd.h>
-#endif
-
 #define C2P(c)          ((gpointer) ((long) (c)))
 #define P2C(p)          ((gchar) ((long) (p)))
 
diff --git a/glib/tests/thread.c b/glib/tests/thread.c
index a4f3976d4..11d847b78 100644
--- a/glib/tests/thread.c
+++ b/glib/tests/thread.c
@@ -32,7 +32,7 @@
 
 #include <glib.h>
 
-#ifndef G_OS_WIN32
+#ifdef G_OS_UNIX
 #include <unistd.h>
 #include <sys/resource.h>
 #endif