From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 7 Mar 2007 19:09:57 +0000 (+0000)
Subject: * test/test-segfault.c: unix compile fix.
X-Git-Tag: dbus-1.1.0~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42fe5c9341e9493ed94b319bb00063f432dd0673;p=thirdparty%2Fdbus.git

* test/test-segfault.c: unix compile fix.
* dbus-win.patch: removed obsolate patch.
---

diff --git a/ChangeLog b/ChangeLog
index 5b77d7f7f..553cd1b53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-07  Ralf Habacker  <ralf.habacker@freenet.de>
+
+	* test/test-segfault.c: unix compile fix.
+	* dbus-win.patch: removed obsolate patches.
+
 2007-03-07  Ralf Habacker  <ralf.habacker@freenet.de>
 
 	* bus/activation.c: removed obsolate include header.
diff --git a/dbus-win.patch b/dbus-win.patch
index e1b3ace60..03c47cd33 100644
--- a/dbus-win.patch
+++ b/dbus-win.patch
@@ -1,18 +1,3 @@
-Index: bus/activation.c
-===================================================================
-RCS file: /cvs/dbus/dbus/bus/activation.c,v
-retrieving revision 1.49
-diff -u -3 -p -B -r1.49 activation.c
---- bus/activation.c	4 Mar 2007 22:09:50 -0000	1.49
-+++ bus/activation.c	6 Mar 2007 20:54:30 -0000
-@@ -34,7 +34,6 @@
- #include <dbus/dbus-spawn.h>
- #include <dbus/dbus-timeout.h>
- #include <dbus/dbus-sysdeps.h>
--#include <dirent.h>
- #include <errno.h>
- 
- #define DBUS_SERVICE_SECTION "D-BUS Service"
 Index: bus/bus.c
 ===================================================================
 RCS file: /cvs/dbus/dbus/bus/bus.c,v
diff --git a/test/test-segfault.c b/test/test-segfault.c
index 0b5a8dea1..dd1c87fe6 100644
--- a/test/test-segfault.c
+++ b/test/test-segfault.c
@@ -3,6 +3,11 @@
 #include <stdlib.h>
 #include <signal.h>
 
+#if !defined(DBUS_WIN) && !defined(DBUS_WINCE)
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
 int
 main (int argc, char **argv)
 {