* test/test-segfault.c: unix compile fix.

* dbus-win.patch: removed obsolate patch.

diff --git a/ChangeLog b/ChangeLog
index 5b77d7f7fef5bf26d89a38f624e676be1e7a1d1d..553cd1b53a4d02239909111da11692c19d3af5bc 100644 (file)
--- 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 e1b3ace603b327166232fdce2b7312a06421a93e..03c47cd3328a67c7ffeae79d83ce011750870378 100644 (file)
--- 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 0b5a8dea1eb84f4b2e0f303474e1fddb85058bfa..dd1c87fe697a61aa268769234922acaf44c59de8 100644 (file)
--- 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)
 {