[glib] Solaris build fix for GIO
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Solaris build fix for GIO
- Date: Mon, 6 Aug 2012 15:57:11 +0000 (UTC)
commit cc80ae321fdfdcc90596940c8161861d25b20eed
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Aug 6 11:55:59 2012 -0400
Solaris build fix for GIO
Solaris/OpenSolaris/OpenIndiana define FIONREAD in sys/filio.h.
This commit adds a configure check for this header, and includes
it conditionally in gio/gsocket.c.
Patch by Fabian Groffen, bug 675524.
configure.ac | 2 +-
gio/gsocket.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index efe3e75..867fba3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -883,7 +883,7 @@ fi
AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h grp.h sys/param.h sys/poll.h sys/resource.h])
AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h])
AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h])
-AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h])
+AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
AC_CHECK_HEADERS([linux/magic.h])
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 9062cc9..5243b9a 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -44,6 +44,10 @@
# include <sys/ioctl.h>
#endif
+#ifdef HAVE_SYS_FILIO_H
+# include <sys/filio.h>
+#endif
+
#ifdef HAVE_SYS_UIO_H
#include <sys/uio.h>
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]