luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-31 08:22:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib/tests: Clean up inclusion of unistd.h

Browse Source 
Include unistd.h only when G_OS_UNIX is defined (or when G_OS_WIN32 is not
defined).  This will avoid including unistd.h unconditionally and/or
unecessarily, which may cause problems in certain scenarios, such as when
building the tests on Visual C++, which does not come with a unistd.h and
MinGW, where unistd.h is essentially a wrapper for io.h and process.h.

https://bugzilla.gnome.org/show_bug.cgi?id=711047
This commit is contained in:
Chun-wei Fan
2013-11-04 13:07:52 +08:00
parent 1079d30e1b
commit d262b6fe0c
9 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glib/tests/base64.c
View File

@@ -1,8 +1,6 @@
#include "config.h"
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UNISTD_H #ifdef G_OS_UNIX
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>

4
glib/tests/checksum.c
View File

@@ -1,8 +1,6 @@
#include "config.h"
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UNISTD_H #ifdef G_OS_UNIX
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>

4
glib/tests/gwakeuptest.c
View File

@@ -1,6 +1,8 @@
#include <unistd.h>
#include <glib.h> #include <glib.h>
#include <glib/gwakeup.h> #include <glib/gwakeup.h>
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
#ifdef _WIN32 #ifdef _WIN32
static void alarm (int sec) { } static void alarm (int sec) { }

4
glib/tests/hmac.c
View File

@@ -1,8 +1,6 @@
#include "config.h"
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UNISTD_H #ifdef G_OS_UNIX
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>

3
glib/tests/mappedfile.c
View File

@@ -1,9 +1,8 @@
#define GLIB_DISABLE_DEPRECATION_WARNINGS #define GLIB_DISABLE_DEPRECATION_WARNINGS
#include <config.h>
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UNISTD_H #ifdef G_OS_UNIX
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <glib/gstdio.h> #include <glib/gstdio.h>

10
glib/tests/node.c
View File

@@ -27,20 +27,16 @@
#undef G_DISABLE_ASSERT #undef G_DISABLE_ASSERT
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_UNISTD_H #include "glib.h"
#ifdef G_OS_UNIX
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "glib.h"
#define C2P(c) ((gpointer) ((long) (c))) #define C2P(c) ((gpointer) ((long) (c)))
#define P2C(p) ((gchar) ((long) (p))) #define P2C(p) ((gchar) ((long) (p)))

5
glib/tests/protocol.c
View File

@@ -22,9 +22,10 @@
#include <errno.h> /* errno */ #include <errno.h> /* errno */
#include <glib.h> #include <glib.h>
#ifndef _WIN32 #ifdef G_OS_UNIX
#include <unistd.h> /* pipe() */ #include <unistd.h> /* pipe() */
#else #endif
#ifdef G_OS_WIN32
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>
#define pipe(fds) _pipe(fds, 4096, _O_BINARY) #define pipe(fds) _pipe(fds, 4096, _O_BINARY)

5
glib/tests/thread.c
View File

@@ -26,17 +26,14 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_PRCTL_H #ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h> #include <sys/prctl.h>
#endif #endif
#include <glib.h> #include <glib.h>
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
#include <unistd.h>
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif

2
glib/tests/timeout.c
View File

@@ -1,5 +1,7 @@
#include <glib.h> #include <glib.h>
#ifdef G_OS_UNIX
#include <unistd.h> #include <unistd.h>
#endif
static GMainLoop *loop; static GMainLoop *loop;