luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'badcel/gunixfdlist-only-unix' into 'main'

Browse Source 
GUnixFDList: Include only in unix build

See merge request GNOME/glib!2585
This commit is contained in:
Philip Withnall 2022-04-05 12:12:19 +00:00
commit bae0a3c751
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gdbusconnection.h
View File

@ -218,6 +218,9 @@ GVariant *g_dbus_connection_call_sync (GDBusConnection
gint timeout_msec, gint timeout_msec,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
#ifdef G_OS_UNIX
GLIB_AVAILABLE_IN_2_30 GLIB_AVAILABLE_IN_2_30
void g_dbus_connection_call_with_unix_fd_list (GDBusConnection *connection, void g_dbus_connection_call_with_unix_fd_list (GDBusConnection *connection,
const gchar *bus_name, const gchar *bus_name,
@ -252,6 +255,8 @@ GVariant *g_dbus_connection_call_with_unix_fd_list_sync (GDBusConnection
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
#endif /* G_OS_UNIX */
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */

5
gio/gdbusmessage.h
View File

@ -107,12 +107,17 @@ GVariant *g_dbus_message_get_body (GDBusMessage
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_dbus_message_set_body (GDBusMessage *message, void g_dbus_message_set_body (GDBusMessage *message,
GVariant *body); GVariant *body);
#ifdef G_OS_UNIX
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
GUnixFDList *g_dbus_message_get_unix_fd_list (GDBusMessage *message); GUnixFDList *g_dbus_message_get_unix_fd_list (GDBusMessage *message);
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_dbus_message_set_unix_fd_list (GDBusMessage *message, void g_dbus_message_set_unix_fd_list (GDBusMessage *message,
GUnixFDList *fd_list); GUnixFDList *fd_list);
#endif /* G_OS_UNIX */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
guint32 g_dbus_message_get_reply_serial (GDBusMessage *message); guint32 g_dbus_message_get_reply_serial (GDBusMessage *message);
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL

2
gio/gdbusmethodinvocation.h
View File

@ -94,10 +94,12 @@ gpointer g_dbus_method_invocation_get_user_data (GDBusMetho
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_value (GDBusMethodInvocation *invocation, void g_dbus_method_invocation_return_value (GDBusMethodInvocation *invocation,
GVariant *parameters); GVariant *parameters);
#ifdef G_OS_UNIX
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation *invocation, void g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation *invocation,
GVariant *parameters, GVariant *parameters,
GUnixFDList *fd_list); GUnixFDList *fd_list);
#endif /* G_OS_UNIX */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_error (GDBusMethodInvocation *invocation, void g_dbus_method_invocation_return_error (GDBusMethodInvocation *invocation,
GQuark domain, GQuark domain,

4
gio/gdbusproxy.h
View File

@ -183,6 +183,8 @@ GVariant *g_dbus_proxy_call_sync (GDBusProxy *pr
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
#ifdef G_OS_UNIX
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_dbus_proxy_call_with_unix_fd_list (GDBusProxy *proxy, void g_dbus_proxy_call_with_unix_fd_list (GDBusProxy *proxy,
const gchar *method_name, const gchar *method_name,
@ -209,6 +211,8 @@ GVariant *g_dbus_proxy_call_with_unix_fd_list_sync (GDBusProxy
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
#endif /* G_OS_UNIX */
G_END_DECLS G_END_DECLS
#endif /* __G_DBUS_PROXY_H__ */ #endif /* __G_DBUS_PROXY_H__ */