mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-09 05:58:01 +02:00
libnm-{util|glib}: fix headers to be C++ compatible - C_BEGIN_DECLS/C_END_DECLS (rh #592783)
This commit is contained in:
parent
0b8ee13ee0
commit
5110fa7811
4 changed files with 15 additions and 0 deletions
|
|
@ -28,6 +28,8 @@
|
||||||
#include "NetworkManager.h"
|
#include "NetworkManager.h"
|
||||||
#include "nm-settings-connection-interface.h"
|
#include "nm-settings-connection-interface.h"
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION = 0,
|
NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION = 0,
|
||||||
NM_SETTINGS_INTERFACE_ERROR_READ_ONLY_CONNECTION,
|
NM_SETTINGS_INTERFACE_ERROR_READ_ONLY_CONNECTION,
|
||||||
|
|
@ -101,5 +103,6 @@ gboolean nm_settings_interface_add_connection (NMSettingsInterface *settings,
|
||||||
NMSettingsAddConnectionFunc callback,
|
NMSettingsAddConnectionFunc callback,
|
||||||
gpointer user_data);
|
gpointer user_data);
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* NM_SETTINGS_INTERFACE_H */
|
#endif /* NM_SETTINGS_INTERFACE_H */
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,8 @@
|
||||||
|
|
||||||
#include "NetworkManager.h"
|
#include "NetworkManager.h"
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
NM_SETTINGS_SYSTEM_PERMISSION_NONE = 0x0,
|
NM_SETTINGS_SYSTEM_PERMISSION_NONE = 0x0,
|
||||||
NM_SETTINGS_SYSTEM_PERMISSION_CONNECTION_MODIFY = 0x1,
|
NM_SETTINGS_SYSTEM_PERMISSION_CONNECTION_MODIFY = 0x1,
|
||||||
|
|
@ -101,4 +103,6 @@ gboolean nm_settings_system_interface_get_permissions (NMSettingsSystemInterface
|
||||||
NMSettingsSystemGetPermissionsFunc callback,
|
NMSettingsSystemGetPermissionsFunc callback,
|
||||||
gpointer user_data);
|
gpointer user_data);
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* NM_SETTINGS_SYSTEM_INTERFACE_H */
|
#endif /* NM_SETTINGS_SYSTEM_INTERFACE_H */
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
#define NM_TYPE_SSID (nm_ssid_get_type ())
|
#define NM_TYPE_SSID (nm_ssid_get_type ())
|
||||||
GType nm_ssid_get_type (void) G_GNUC_CONST;
|
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 ())
|
#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;
|
GType nm_ip6_route_object_array_get_type (void) G_GNUC_CONST;
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* NM_TYPES_H */
|
#endif /* NM_TYPES_H */
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,8 @@
|
||||||
|
|
||||||
#include "nm-connection.h"
|
#include "nm-connection.h"
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
/*********************************************************/
|
/*********************************************************/
|
||||||
/* The API defined here is _NOT_ guaranteed in any way!! */
|
/* 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,
|
char **out_password,
|
||||||
GError **error);
|
GError **error);
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* NM_UTILS_H */
|
#endif /* NM_UTILS_H */
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue