2003-06-15 Joe Shaw <joe@assbarn.com>

* configure.in: Check for socklen_t.

	* dbus/dbus-sysdeps.c: Define socklen_t if it's not defined.

	* test/test-segfault.c: Add #include <sys/time.h>

	* tools/Makefile.am: Add DBUS_X_CFLAGS to the INCLUDES since
	dbus-launch needs it.
This commit is contained in:
Joe Shaw 2003-06-15 10:45:07 +00:00
parent 6a109938f7
commit 496f1e18a9
5 changed files with 33 additions and 1 deletions

View file

@ -1,3 +1,14 @@
2003-06-15 Joe Shaw <joe@assbarn.com>
* configure.in: Check for socklen_t.
* dbus/dbus-sysdeps.c: Define socklen_t if it's not defined.
* test/test-segfault.c: Add #include <sys/time.h>
* tools/Makefile.am: Add DBUS_X_CFLAGS to the INCLUDES since
dbus-launch needs it.
2003-06-09 Havoc Pennington <hp@redhat.com>
* dbus/dbus-sysdeps.c (_dbus_listen_unix_socket): don't use

View file

@ -273,6 +273,22 @@ else
fi
fi
dnl check for socklen_t
AC_MSG_CHECKING(whether socklen_t is defined)
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
],[
socklen_t foo;
foo = 1;
],dbus_have_socklen_t=yes,dbus_have_socklen_t=no)
AC_MSG_RESULT($dbus_have_socklen_t)
if test "x$dbus_have_socklen_t" = "xyes"; then
AC_DEFINE(HAVE_SOCKLEN_T,1,[Have socklen_t type])
fi
dnl check for writev header and writev function so we're
dnl good to go if HAVE_WRITEV gets defined.
AC_CHECK_HEADERS(sys/uio.h, [AC_CHECK_FUNCS(writev)])

View file

@ -62,6 +62,10 @@
#define O_BINARY 0
#endif
#ifndef HAVE_SOCKLEN_T
#define socklen_t int
#endif
/**
* @addtogroup DBusInternalsUtils
* @{

View file

@ -1,6 +1,7 @@
/* This is simply a process that segfaults */
#include <signal.h>
#include <sys/time.h>
#include <sys/resource.h>
int

View file

@ -1,4 +1,4 @@
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS)
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS)
if HAVE_GLIB
GLIB_TOOLS=dbus-monitor