diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dbus-win.patch | 15 | ||||
| -rw-r--r-- | test/test-segfault.c | 5 |
3 files changed, 10 insertions, 15 deletions
@@ -1,5 +1,10 @@ 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. * test/test-segfault.c: win32 compile fix, rlimit isn't available on win32. diff --git a/dbus-win.patch b/dbus-win.patch index e1b3ace6..03c47cd3 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 0b5a8dea..dd1c87fe 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) { |