diff options
| author | Dan Winship <danw@gnome.org> | 2013-10-19 13:04:00 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-11-20 09:25:39 -0500 |
| commit | 158dde050702f83a058962d14156a02234fc9685 (patch) | |
| tree | 73f8f1cc846447ca50cd92b3d58144fff818febe /gio/glocalfileinfo.c | |
| parent | 3981cddbf8659458be9f863151314cd0fd1682bf (diff) | |
| download | glib-158dde050702f83a058962d14156a02234fc9685.tar.gz | |
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
Diffstat (limited to 'gio/glocalfileinfo.c')
| -rw-r--r-- | gio/glocalfileinfo.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c index 5e60bf8ac..4f6d5a2cc 100644 --- a/gio/glocalfileinfo.c +++ b/gio/glocalfileinfo.c @@ -32,9 +32,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <string.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif #include <fcntl.h> #include <errno.h> #ifdef G_OS_UNIX @@ -62,11 +59,11 @@ #include <gfileinfo-priv.h> #include <gvfs.h> -#ifndef G_OS_WIN32 +#ifdef G_OS_UNIX +#include <unistd.h> #include "glib-unix.h" #include "glib-private.h" #endif -#include "glibintl.h" #include "thumbnail-verify.h" @@ -97,6 +94,7 @@ #include "gioerror.h" #include "gthemedicon.h" #include "gcontenttypeprivate.h" +#include "glibintl.h" struct ThumbMD5Context { |