[glib] More fixes for non-Unix builds
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] More fixes for non-Unix builds
- Date: Mon, 25 Jul 2011 14:31:43 +0000 (UTC)
commit 32b1349a23ff050b8026ede150a25cae56799901
Author: David Zeuthen <davidz redhat com>
Date: Mon Jul 25 10:31:17 2011 -0400
More fixes for non-Unix builds
Signed-off-by: David Zeuthen <davidz redhat com>
gio/gdbusconnection.c | 8 ++++++++
gio/gdbusproxy.c | 8 ++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 77a5df8..091dc80 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -5067,7 +5067,11 @@ g_dbus_connection_call_internal (GDBusConnection *connection,
g_return_if_fail (method_name != NULL && g_dbus_is_member_name (method_name));
g_return_if_fail (timeout_msec >= 0 || timeout_msec == -1);
g_return_if_fail ((parameters == NULL) || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE));
+#ifdef G_OS_UNIX
g_return_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list));
+#else
+ g_return_if_fail (fd_list == NULL);
+#endif
state = g_slice_new0 (CallState);
state->simple = g_simple_async_result_new (G_OBJECT (connection),
@@ -5178,7 +5182,11 @@ g_dbus_connection_call_sync_internal (GDBusConnection *connection,
g_return_val_if_fail (method_name != NULL && g_dbus_is_member_name (method_name), NULL);
g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail ((parameters == NULL) || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE), NULL);
+#ifdef G_OS_UNIX
g_return_val_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list), NULL);
+#else
+ g_return_val_if_fail (fd_list == NULL, NULL);
+#endif
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (reply_type == NULL)
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index cc77bb9..c332059 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -2461,7 +2461,11 @@ g_dbus_proxy_call_internal (GDBusProxy *proxy,
g_return_if_fail (g_dbus_is_member_name (method_name) || g_dbus_is_interface_name (method_name));
g_return_if_fail (parameters == NULL || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE));
g_return_if_fail (timeout_msec == -1 || timeout_msec >= 0);
+#ifdef G_OS_UNIX
g_return_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list));
+#else
+ g_return_if_fail (fd_list == NULL);
+#endif
reply_type = NULL;
split_interface_name = NULL;
@@ -2590,7 +2594,11 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
g_return_val_if_fail (g_dbus_is_member_name (method_name) || g_dbus_is_interface_name (method_name), NULL);
g_return_val_if_fail (parameters == NULL || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE), NULL);
g_return_val_if_fail (timeout_msec == -1 || timeout_msec >= 0, NULL);
+#ifdef G_OS_UNIX
g_return_val_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list), NULL);
+#else
+ g_return_val_if_fail (fd_list == NULL, NULL);
+#endif
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
reply_type = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]