From 725cbb2a0f5a957403a8da998594aa8a3a5b3f0c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 22 Jun 2011 11:06:30 +0100 Subject: Move _dbus_check_fdleaks_enter to dbus-message-internal.h This means the bus test can use them without needing dbus-message-private.h, reducing its view of message internals. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46095 Signed-off-by: Simon McVittie Reviewed-by: Guillaume Desmottes --- bus/test-main.c | 2 +- dbus/dbus-message-internal.h | 4 ++++ dbus/dbus-message-private.h | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bus/test-main.c b/bus/test-main.c index 1b7c5bea..0f736c7c 100644 --- a/bus/test-main.c +++ b/bus/test-main.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "selinux.h" #ifdef DBUS_BUILD_TESTS diff --git a/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h index 091d315a..c1948732 100644 --- a/dbus/dbus-message-internal.h +++ b/dbus/dbus-message-internal.h @@ -98,6 +98,10 @@ void _dbus_message_loader_set_max_message_unix_fds(DBusMessageLoad long n); long _dbus_message_loader_get_max_message_unix_fds(DBusMessageLoader *loader); +typedef struct DBusInitialFDs DBusInitialFDs; +DBusInitialFDs *_dbus_check_fdleaks_enter (void); +void _dbus_check_fdleaks_leave (DBusInitialFDs *fds); + DBUS_END_DECLS #endif /* DBUS_MESSAGE_INTERNAL_H */ diff --git a/dbus/dbus-message-private.h b/dbus/dbus-message-private.h index e64258ca..e1578abd 100644 --- a/dbus/dbus-message-private.h +++ b/dbus/dbus-message-private.h @@ -136,10 +136,6 @@ dbus_bool_t _dbus_message_iter_get_args_valist (DBusMessageIter *iter, int first_arg_type, va_list var_args); -typedef struct DBusInitialFDs DBusInitialFDs; -DBusInitialFDs *_dbus_check_fdleaks_enter (void); -void _dbus_check_fdleaks_leave (DBusInitialFDs *fds); - /** @} */ DBUS_END_DECLS -- cgit v1.2.3