mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
Fix syntax errors with enums in pedantic mode (Will Stephenson)
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3664 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
4ce69835f5
commit
4f421ef874
|
@ -129,7 +129,7 @@ typedef enum NMDeviceType
|
||||||
typedef enum {
|
typedef enum {
|
||||||
NM_802_11_MODE_UNKNOWN = 0,
|
NM_802_11_MODE_UNKNOWN = 0,
|
||||||
NM_802_11_MODE_ADHOC,
|
NM_802_11_MODE_ADHOC,
|
||||||
NM_802_11_MODE_INFRA,
|
NM_802_11_MODE_INFRA
|
||||||
} NM80211Mode;
|
} NM80211Mode;
|
||||||
|
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@ typedef enum
|
||||||
* UNAVAILABLE: the device is no longer ready for use (rfkill, no carrier, etc)
|
* UNAVAILABLE: the device is no longer ready for use (rfkill, no carrier, etc)
|
||||||
* DISCONNECTED: the device's connection is ready for activation, or NetworkManager went to sleep
|
* DISCONNECTED: the device's connection is ready for activation, or NetworkManager went to sleep
|
||||||
*/
|
*/
|
||||||
NM_DEVICE_STATE_FAILED,
|
NM_DEVICE_STATE_FAILED
|
||||||
} NMDeviceState;
|
} NMDeviceState;
|
||||||
|
|
||||||
|
|
||||||
|
@ -211,7 +211,7 @@ typedef enum {
|
||||||
NM_ACTIVE_CONNECTION_STATE_ACTIVATING,
|
NM_ACTIVE_CONNECTION_STATE_ACTIVATING,
|
||||||
|
|
||||||
/* Indicates the connection is currently active */
|
/* Indicates the connection is currently active */
|
||||||
NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
|
NM_ACTIVE_CONNECTION_STATE_ACTIVATED
|
||||||
} NMActiveConnectionState;
|
} NMActiveConnectionState;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ typedef enum NMVPNConnectionState
|
||||||
NM_VPN_CONNECTION_STATE_IP_CONFIG_GET,
|
NM_VPN_CONNECTION_STATE_IP_CONFIG_GET,
|
||||||
NM_VPN_CONNECTION_STATE_ACTIVATED,
|
NM_VPN_CONNECTION_STATE_ACTIVATED,
|
||||||
NM_VPN_CONNECTION_STATE_FAILED,
|
NM_VPN_CONNECTION_STATE_FAILED,
|
||||||
NM_VPN_CONNECTION_STATE_DISCONNECTED,
|
NM_VPN_CONNECTION_STATE_DISCONNECTED
|
||||||
} NMVPNConnectionState;
|
} NMVPNConnectionState;
|
||||||
|
|
||||||
typedef enum NMVPNConnectionStateReason
|
typedef enum NMVPNConnectionStateReason
|
||||||
|
@ -102,7 +102,7 @@ typedef enum NMVPNConnectionStateReason
|
||||||
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT,
|
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT,
|
||||||
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT,
|
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT,
|
||||||
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED,
|
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED,
|
||||||
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS,
|
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS
|
||||||
} NMVPNConnectionStateReason;
|
} NMVPNConnectionStateReason;
|
||||||
|
|
||||||
#define NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY "gateway"
|
#define NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY "gateway"
|
||||||
|
|
|
@ -19,7 +19,7 @@ G_BEGIN_DECLS
|
||||||
typedef enum {
|
typedef enum {
|
||||||
NM_CONNECTION_SCOPE_UNKNOWN = 0,
|
NM_CONNECTION_SCOPE_UNKNOWN = 0,
|
||||||
NM_CONNECTION_SCOPE_SYSTEM,
|
NM_CONNECTION_SCOPE_SYSTEM,
|
||||||
NM_CONNECTION_SCOPE_USER,
|
NM_CONNECTION_SCOPE_USER
|
||||||
} NMConnectionScope;
|
} NMConnectionScope;
|
||||||
|
|
||||||
#define NM_CONNECTION_SCOPE "scope"
|
#define NM_CONNECTION_SCOPE "scope"
|
||||||
|
|
|
@ -31,7 +31,7 @@ enum {
|
||||||
NM_GSM_NETWORK_GPRS = 0,
|
NM_GSM_NETWORK_GPRS = 0,
|
||||||
NM_GSM_NETWORK_GSM = 1,
|
NM_GSM_NETWORK_GSM = 1,
|
||||||
NM_GSM_NETWORK_PREFER_GPRS = 2,
|
NM_GSM_NETWORK_PREFER_GPRS = 2,
|
||||||
NM_GSM_NETWORK_PREFER_GSM = 3,
|
NM_GSM_NETWORK_PREFER_GSM = 3
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
|
@ -71,7 +71,7 @@ typedef enum {
|
||||||
COMPARE_FLAGS_FUZZY = 0x00000001,
|
COMPARE_FLAGS_FUZZY = 0x00000001,
|
||||||
|
|
||||||
/* Ignore the connection ID */
|
/* Ignore the connection ID */
|
||||||
COMPARE_FLAGS_IGNORE_ID = 0x00000002,
|
COMPARE_FLAGS_IGNORE_ID = 0x00000002
|
||||||
} NMSettingCompareFlags;
|
} NMSettingCompareFlags;
|
||||||
|
|
||||||
/* Returns TRUE if the connections are the same */
|
/* Returns TRUE if the connections are the same */
|
||||||
|
|
|
@ -166,7 +166,7 @@ typedef enum {
|
||||||
NMU_SEC_WPA_PSK,
|
NMU_SEC_WPA_PSK,
|
||||||
NMU_SEC_WPA_ENTERPRISE,
|
NMU_SEC_WPA_ENTERPRISE,
|
||||||
NMU_SEC_WPA2_PSK,
|
NMU_SEC_WPA2_PSK,
|
||||||
NMU_SEC_WPA2_ENTERPRISE,
|
NMU_SEC_WPA2_ENTERPRISE
|
||||||
} NMUtilsSecurityType;
|
} NMUtilsSecurityType;
|
||||||
|
|
||||||
gboolean nm_utils_security_valid (NMUtilsSecurityType type,
|
gboolean nm_utils_security_valid (NMUtilsSecurityType type,
|
||||||
|
|
Loading…
Reference in a new issue