diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-04-26 10:31:23 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-04-26 10:31:23 -0400 |
| commit | 16deb341b52421695b81ebe8c91c81f47eb173f3 (patch) | |
| tree | 8fb9a3bbf7fabdb82109e7ea93fe3e50bc069efa | |
| parent | 354ed0897ae0e815e95a7eb931de6ba35325121c (diff) | |
Don't use the identifier "interface" in public headers
This causes problems on Windows.
| -rw-r--r-- | dbus/dbus-gidl.h | 2 | ||||
| -rw-r--r-- | dbus/dbus-glib.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dbus/dbus-gidl.h b/dbus/dbus-gidl.h index dd82176..b766bcb 100644 --- a/dbus/dbus-gidl.h +++ b/dbus/dbus-gidl.h @@ -80,7 +80,7 @@ const char* node_info_get_name (NodeInfo *info); GSList* node_info_get_interfaces (NodeInfo *info); GSList* node_info_get_nodes (NodeInfo *info); void node_info_add_interface (NodeInfo *info, - InterfaceInfo *interface); + InterfaceInfo *iface); void node_info_add_node (NodeInfo *info, NodeInfo *child); void node_info_replace_node (NodeInfo *info, diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h index 256f817..1b236d8 100644 --- a/dbus/dbus-glib.h +++ b/dbus/dbus-glib.h @@ -233,14 +233,14 @@ GType dbus_g_proxy_get_type (void) G_GNUC_CONST; DBusGProxy* dbus_g_proxy_new_for_name (DBusGConnection *connection, const char *name, const char *path, - const char *interface); + const char *iface); DBusGProxy* dbus_g_proxy_new_for_name_owner (DBusGConnection *connection, const char *name, const char *path, - const char *interface, + const char *iface, GError **error); DBusGProxy* dbus_g_proxy_new_from_proxy (DBusGProxy *proxy, - const char *interface, + const char *iface, const char *path_name); DBusGProxy* dbus_g_proxy_new_for_peer (DBusGConnection *connection, const char *path_name, |