diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-08-12 10:26:13 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-08-12 10:26:13 +0100 |
| commit | c99a3df254dbfcd945de919054c391c5565460af (patch) | |
| tree | 7e9da29b9b08d00adc0c6d0668d384dd0d45d1dc /test | |
| parent | 0611a71c67b39d90565144de20c946447e2bbea6 (diff) | |
| parent | 486c0373f120881917638072944dbdc6ad08ece8 (diff) | |
| download | dbus-c99a3df254dbfcd945de919054c391c5565460af.tar.gz | |
Merge branch 'dbus-1.4'
Diffstat (limited to 'test')
| -rw-r--r-- | test/dbus-daemon.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c index eaacb877..cc871530 100644 --- a/test/dbus-daemon.c +++ b/test/dbus-daemon.c @@ -34,6 +34,7 @@ #include <string.h> #ifdef DBUS_WIN +# include <io.h> # include <windows.h> #else # include <signal.h> @@ -46,7 +47,7 @@ typedef struct { DBusError e; GError *ge; - gint daemon_pid; + GPid daemon_pid; DBusConnection *left_conn; @@ -68,7 +69,7 @@ _assert_no_error (const DBusError *e, static gchar * spawn_dbus_daemon (gchar *binary, gchar *configuration, - gint *daemon_pid) + GPid *daemon_pid) { GError *error = NULL; GString *address; |