Commit d262b6fe authored by Chun-wei Fan's avatar Chun-wei Fan

glib/tests: Clean up inclusion of unistd.h

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
parent 1079d30e
#include "config.h"
#include <glib.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
#include <stdlib.h>
......
#include "config.h"
#include <glib.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
#include <stdlib.h>
......
#include <unistd.h>
#include <glib.h>
#include <glib/gwakeup.h>
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
#ifdef _WIN32
static void alarm (int sec) { }
......
#include "config.h"
#include <glib.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
#include <stdlib.h>
......
#define GLIB_DISABLE_DEPRECATION_WARNINGS
#include <config.h>
#include <glib.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
#include <glib/gstdio.h>
......
......@@ -27,20 +27,16 @@
#undef G_DISABLE_ASSERT
#undef G_LOG_DOMAIN
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
#include "glib.h"
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
#include "glib.h"
#define C2P(c) ((gpointer) ((long) (c)))
#define P2C(p) ((gchar) ((long) (p)))
......
......@@ -22,9 +22,10 @@
#include <errno.h> /* errno */
#include <glib.h>
#ifndef _WIN32
#ifdef G_OS_UNIX
#include <unistd.h> /* pipe() */
#else
#endif
#ifdef G_OS_WIN32
#include <io.h>
#include <fcntl.h>
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
......
......@@ -26,17 +26,14 @@
#include <sys/time.h>
#endif
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#endif
#include <glib.h>
#ifndef G_OS_WIN32
#include <unistd.h>
#include <sys/resource.h>
#endif
......
#include <glib.h>
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
static GMainLoop *loop;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment