gvfs r1645 - in trunk: . common

[alexl svn gnome org]

Author: alexl
Date: Tue Mar 11 17:35:47 2008
New Revision: 1645
URL: http://svn.gnome.org/viewvc/gvfs?rev=1645&view=rev

Log:
2008-03-11  Alexander Larsson  <alexl redhat com>

        * common/gsysutils.c:
        * configure.ac:
	OpenBSB portability fixes.
	Patch from Jasper Lievisse Adriaanse <jasper humppa nl>




Modified:
   trunk/ChangeLog
   trunk/common/gsysutils.c
   trunk/configure.ac

Modified: trunk/common/gsysutils.c
==============================================================================
--- trunk/common/gsysutils.c	(original)
+++ trunk/common/gsysutils.c	Tue Mar 11 17:35:47 2008
@@ -22,6 +22,9 @@
 
 #include <config.h>
 
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -46,7 +49,7 @@
 		   int fd)
 {
   struct msghdr msg;
-  struct iovec vec;
+  struct iovec vec[1];
   char buf[1] = {'x'};
   char ccmsg[CMSG_SPACE (sizeof (fd))];
   struct cmsghdr *cmsg;
@@ -55,9 +58,9 @@
   msg.msg_name = NULL;
   msg.msg_namelen = 0;
 
-  vec.iov_base = buf;
-  vec.iov_len = 1;
-  msg.msg_iov = &vec;
+  vec[0].iov_base = buf;
+  vec[0].iov_len = 1;
+  msg.msg_iov = vec;
   msg.msg_iovlen = 1;
   msg.msg_control = ccmsg;
   msg.msg_controllen = sizeof (ccmsg);
@@ -78,17 +81,17 @@
 _g_socket_receive_fd (int socket_fd)
 {
   struct msghdr msg;
-  struct iovec iov;
+  struct iovec iov[1];
   char buf[1];
   int rv;
   char ccmsg[CMSG_SPACE (sizeof(int))];
   struct cmsghdr *cmsg;
 
-  iov.iov_base = buf;
-  iov.iov_len = 1;
+  iov[0].iov_base = buf;
+  iov[0].iov_len = 1;
   msg.msg_name = 0;
   msg.msg_namelen = 0;
-  msg.msg_iov = &iov;
+  msg.msg_iov = iov;
   msg.msg_iovlen = 1;
   msg.msg_control = ccmsg;
   msg.msg_controllen = sizeof (ccmsg);

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 11 17:35:47 2008
@@ -94,7 +94,7 @@
 dnl *** Checks for pty stuff ***
 dnl ****************************
 
-AC_CHECK_HEADERS(sys/un.h stropts.h termios.h utmp.h sys/uio.h)
+AC_CHECK_HEADERS(sys/un.h stropts.h termios.h utmp.h sys/uio.h sys/param.h)
 
 # Check for PTY handling functions.
 AC_CHECK_FUNCS(getpt posix_openpt grantpt unlockpt ptsname ptsname_r)