From 519dd8726e7ff0b30ee9bffb87cd9fb04792ff16 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 8 Feb 2022 16:23:27 +0400 Subject: [PATCH] dbus: move unix socket declarations to common sysdeps.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The function declaration can be moved to system-agnostic header and be implemented on Windows in following commits. Signed-off-by: Marc-André Lureau --- dbus/dbus-sysdeps-unix.h | 11 ----------- dbus/dbus-sysdeps.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h index f7d6966f9..06614ecc6 100644 --- a/dbus/dbus-sysdeps-unix.h +++ b/dbus/dbus-sysdeps-unix.h @@ -66,17 +66,6 @@ _dbus_write_two (int fd, int start2, int len2); -DBusSocket _dbus_connect_unix_socket (const char *path, - dbus_bool_t abstract, - DBusError *error); -DBusSocket _dbus_listen_unix_socket (const char *path, - dbus_bool_t abstract, - DBusError *error); - -DBusSocket _dbus_connect_exec (const char *path, - char *const argv[], - DBusError *error); - int _dbus_listen_systemd_sockets (DBusSocket **fd, DBusError *error); diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 887a0ce6d..1c6b76153 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -561,6 +561,18 @@ typedef struct dbus_bool_t _dbus_stat (const DBusString *filename, DBusStat *statbuf, DBusError *error); + +DBusSocket _dbus_connect_unix_socket (const char *path, + dbus_bool_t abstract, + DBusError *error); +DBusSocket _dbus_listen_unix_socket (const char *path, + dbus_bool_t abstract, + DBusError *error); + +DBusSocket _dbus_connect_exec (const char *path, + char *const argv[], + DBusError *error); + DBUS_PRIVATE_EXPORT dbus_bool_t _dbus_socketpair (DBusSocket *fd1, DBusSocket *fd2, -- 2.47.3