diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-25 19:24:55 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-25 19:24:55 +0100 |
| commit | e48de6be84f89636f11159b9e7ea56b6dc49d577 (patch) | |
| tree | b3ee3201e6a9200cc4acd843358acbba22dbcb09 /dbus/dbus-sysdeps.h | |
| parent | 8734e4a16ff220a7af0fd718ba50f92d23c496cf (diff) | |
| parent | b19e14330fd87228368acd82dc5160ec85cb8243 (diff) | |
| download | dbus-e48de6be84f89636f11159b9e7ea56b6dc49d577.tar.gz | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
dbus/dbus-internals.c
dbus/dbus-mainloop.c
dbus/dbus-sysdeps-unix.c
dbus/dbus-sysdeps-win.c
dbus/dbus-sysdeps.c
dbus/dbus-sysdeps.h
Diffstat (limited to 'dbus/dbus-sysdeps.h')
| -rw-r--r-- | dbus/dbus-sysdeps.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index c03e2f54..4052cda9 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -308,12 +308,12 @@ int _dbus_poll (DBusPollFD *fds, void _dbus_sleep_milliseconds (int milliseconds); -void _dbus_get_real_time (long *tv_sec, - long *tv_usec); - void _dbus_get_monotonic_time (long *tv_sec, long *tv_usec); +void _dbus_get_real_time (long *tv_sec, + long *tv_usec); + /** * directory interface */ |