From 5110fa7811cc8d68d2a61601e04e4fb4e9edc31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 18 May 2010 10:14:59 +0200 Subject: [PATCH] libnm-{util|glib}: fix headers to be C++ compatible - C_BEGIN_DECLS/C_END_DECLS (rh #592783) --- libnm-glib/nm-settings-interface.h | 3 +++ libnm-glib/nm-settings-system-interface.h | 4 ++++ libnm-glib/nm-types.h | 4 ++++ libnm-util/nm-utils.h | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/libnm-glib/nm-settings-interface.h b/libnm-glib/nm-settings-interface.h index 70a47abe94..dc7bd0eb82 100644 --- a/libnm-glib/nm-settings-interface.h +++ b/libnm-glib/nm-settings-interface.h @@ -28,6 +28,8 @@ #include "NetworkManager.h" #include "nm-settings-connection-interface.h" +G_BEGIN_DECLS + typedef enum { NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION = 0, NM_SETTINGS_INTERFACE_ERROR_READ_ONLY_CONNECTION, @@ -101,5 +103,6 @@ gboolean nm_settings_interface_add_connection (NMSettingsInterface *settings, NMSettingsAddConnectionFunc callback, gpointer user_data); +G_END_DECLS #endif /* NM_SETTINGS_INTERFACE_H */ diff --git a/libnm-glib/nm-settings-system-interface.h b/libnm-glib/nm-settings-system-interface.h index ebe835762d..d016556123 100644 --- a/libnm-glib/nm-settings-system-interface.h +++ b/libnm-glib/nm-settings-system-interface.h @@ -27,6 +27,8 @@ #include "NetworkManager.h" +G_BEGIN_DECLS + typedef enum { NM_SETTINGS_SYSTEM_PERMISSION_NONE = 0x0, NM_SETTINGS_SYSTEM_PERMISSION_CONNECTION_MODIFY = 0x1, @@ -101,4 +103,6 @@ gboolean nm_settings_system_interface_get_permissions (NMSettingsSystemInterface NMSettingsSystemGetPermissionsFunc callback, gpointer user_data); +G_END_DECLS + #endif /* NM_SETTINGS_SYSTEM_INTERFACE_H */ diff --git a/libnm-glib/nm-types.h b/libnm-glib/nm-types.h index eb3461f7d7..cb1bf872ea 100644 --- a/libnm-glib/nm-types.h +++ b/libnm-glib/nm-types.h @@ -26,6 +26,8 @@ #include #include +G_BEGIN_DECLS + #define NM_TYPE_SSID (nm_ssid_get_type ()) GType nm_ssid_get_type (void) G_GNUC_CONST; @@ -47,4 +49,6 @@ GType nm_ip6_address_array_get_type (void) G_GNUC_CONST; #define NM_TYPE_IP6_ROUTE_OBJECT_ARRAY (nm_ip6_route_object_array_get_type ()) GType nm_ip6_route_object_array_get_type (void) G_GNUC_CONST; +G_END_DECLS + #endif /* NM_TYPES_H */ diff --git a/libnm-util/nm-utils.h b/libnm-util/nm-utils.h index 8308a233ac..68501d53fb 100644 --- a/libnm-util/nm-utils.h +++ b/libnm-util/nm-utils.h @@ -31,6 +31,8 @@ #include "nm-connection.h" +G_BEGIN_DECLS + /*********************************************************/ /* The API defined here is _NOT_ guaranteed in any way!! */ /*********************************************************/ @@ -211,4 +213,6 @@ GByteArray *nm_utils_rsa_key_encrypt (const GByteArray *data, char **out_password, GError **error); +G_END_DECLS + #endif /* NM_UTILS_H */