summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-03-06 12:14:16 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-03-06 12:14:16 +0000
commit0c93dc9be27677d46d7294b5bc9d3b2e138433af (patch)
tree8c06f093a4d392e1379df4696ba3a4d5e0877080
parentc63b6e07e402badd1c383cba8e20fac39ce97fb2 (diff)
downloadgvfs-0c93dc9be27677d46d7294b5bc9d3b2e138433af.tar.gz
Include sys/uio.h if availible (#520307)
2008-03-06 Alexander Larsson <alexl@redhat.com> * common/gsysutils.c: * configure.ac: Include sys/uio.h if availible (#520307) svn path=/trunk/; revision=1580
-rw-r--r--ChangeLog6
-rw-r--r--common/gsysutils.c3
-rw-r--r--configure.ac2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6742e1d7..948388f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-06 Alexander Larsson <alexl@redhat.com>
+
+ * common/gsysutils.c:
+ * configure.ac:
+ Include sys/uio.h if availible (#520307)
+
2008-03-06 Benjamin Otte <otte@gnome.org>
* daemon/gvfsbackendftp.c: (do_mount):
diff --git a/common/gsysutils.c b/common/gsysutils.c
index 72fc2492..2987c8dd 100644
--- a/common/gsysutils.c
+++ b/common/gsysutils.c
@@ -29,6 +29,9 @@
#include <strings.h>
#include <errno.h>
#include <unistd.h>
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
#include <gio/gio.h>
#include <glib/gi18n-lib.h>
diff --git a/configure.ac b/configure.ac
index f091ce7b..703a7251 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ dnl ****************************
dnl *** Checks for pty stuff ***
dnl ****************************
-AC_CHECK_HEADERS(sys/un.h stropts.h termios.h utmp.h)
+AC_CHECK_HEADERS(sys/un.h stropts.h termios.h utmp.h sys/uio.h)
# Check for PTY handling functions.
AC_CHECK_FUNCS(getpt posix_openpt grantpt unlockpt ptsname ptsname_r)