diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-11 03:05:58 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-11 03:05:58 +0000 |
| commit | eb63ba5039c8afe61210cf2b217ec75b4a86356e (patch) | |
| tree | c8e10a3d1c552f9fb46fea088a5b5f5b930db941 /dbus/dbus-internals.h | |
| parent | 6be547d32f018c23ba56426a0bccd08baa2cf440 (diff) | |
2003-04-10 Havoc Pennington <hp@pobox.com>
* dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): move all
the possible parent failures before we fork, so that we don't
fail to create a babysitter after creating the child.
* bus/activation.c (bus_activation_activate_service): kill child
if we don't successfully complete the activation.
Diffstat (limited to 'dbus/dbus-internals.h')
| -rw-r--r-- | dbus/dbus-internals.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index b6222fae..b0f41278 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -53,14 +53,15 @@ DBUS_BEGIN_DECLS; #define _DBUS_GNUC_NORETURN #endif /* !__GNUC__ */ -void _dbus_warn (const char *format, - ...) _DBUS_GNUC_PRINTF (1, 2); -void _dbus_verbose_real (const char *format, - ...) _DBUS_GNUC_PRINTF (1, 2); - +void _dbus_warn (const char *format, + ...) _DBUS_GNUC_PRINTF (1, 2); +void _dbus_verbose_real (const char *format, + ...) _DBUS_GNUC_PRINTF (1, 2); +void _dbus_verbose_reset_real (void); #ifdef DBUS_ENABLE_VERBOSE_MODE # define _dbus_verbose _dbus_verbose_real +# define _dbus_verbose_reset _dbus_verbose_reset_real #else # ifdef HAVE_ISO_VARARGS # define _dbus_verbose(...) @@ -69,6 +70,7 @@ void _dbus_verbose_real (const char *format, # else # error "This compiler does not support varargs macros and thus verbose mode can't be disabled meaningfully" # endif +# define _dbus_verbose_reset() #endif /* !DBUS_ENABLE_VERBOSE_MODE */ const char* _dbus_strerror (int error_number); |