Partially fix warnings from compiler option '-Wredundant-decls'

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
[smcv: omit the part involving environ, which was more involved]
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97357

diff --git a/dbus/dbus-marshal-basic.h b/dbus/dbus-marshal-basic.h
index 68ff348..0c4e411 100644 (file)
--- a/dbus/dbus-marshal-basic.h
+++ b/dbus/dbus-marshal-basic.h
@@ -214,7 +214,6 @@ dbus_uint32_t _dbus_marshal_read_uint32       (const DBusString *str,
                                                int               byte_order,
                                                int              *new_pos);
 int           _dbus_type_get_alignment        (int               typecode);
-int           _dbus_type_get_alignment        (int               typecode);
 DBUS_PRIVATE_EXPORT
 const char*   _dbus_type_to_string            (int               typecode);
 

diff --git a/dbus/dbus-pending-call-internal.h b/dbus/dbus-pending-call-internal.h
index 393e660..a6d7fba 100644 (file)
--- a/dbus/dbus-pending-call-internal.h
+++ b/dbus/dbus-pending-call-internal.h
@@ -46,8 +46,6 @@ void             _dbus_pending_call_set_reply_unlocked           (DBusPendingCal
                                                                   DBusMessage        *message);
 void             _dbus_pending_call_queue_timeout_error_unlocked (DBusPendingCall    *pending,
                                                                   DBusConnection     *connection);
-void             _dbus_pending_call_set_reply_serial_unlocked    (DBusPendingCall    *pending,
-                                                                  dbus_uint32_t       serial);
 dbus_bool_t      _dbus_pending_call_set_timeout_error_unlocked   (DBusPendingCall    *pending,
                                                                   DBusMessage        *message,
                                                                   dbus_uint32_t       serial);

diff --git a/dbus/dbus-sysdeps-win.h b/dbus/dbus-sysdeps-win.h
index 0b5d8f0..b8861a1 100644 (file)
--- a/dbus/dbus-sysdeps-win.h
+++ b/dbus/dbus-sysdeps-win.h
@@ -82,8 +82,6 @@ _dbus_win_sid_to_name_and_domain (dbus_uid_t uid,
                                   wchar_t  **wdomain,
                                   DBusError *error);
 
-dbus_bool_t _dbus_file_exists (const char *filename);
-
 DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_get_install_root (DBusString *str);
 

diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index a2dac6c..3603093 100644 (file)
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -666,9 +666,6 @@ dbus_pid_t    _dbus_getpid (void);
 DBUS_PRIVATE_EXPORT
 dbus_uid_t    _dbus_getuid (void);
 
-dbus_bool_t _dbus_change_to_daemon_user (const char *user,
-                                         DBusError  *error);
-
 DBUS_PRIVATE_EXPORT
 void _dbus_flush_caches (void);