[PATCH] fix enum declaration syntax
- From: Will Stephenson <wstephenson kde org>
- To: Tambet Ingo <tambet novell com>
- Cc: networkmanager-list gnome org
- Subject: [PATCH] fix enum declaration syntax
- Date: Tue, 13 May 2008 13:52:45 +0200
The attach patch fixes some syntax sins in the installed headers, which the
compiler barfs on when using -pedantic - this is what the KDE build dashboard
uses.
Will
--- include/NetworkManager.h
+++ include/NetworkManager.h
@@ -129,7 +129,7 @@
typedef enum {
NM_802_11_MODE_UNKNOWN = 0,
NM_802_11_MODE_ADHOC,
- NM_802_11_MODE_INFRA,
+ NM_802_11_MODE_INFRA
} NM80211Mode;
@@ -200,7 +200,7 @@
* 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
*/
- NM_DEVICE_STATE_FAILED,
+ NM_DEVICE_STATE_FAILED
} NMDeviceState;
@@ -211,7 +211,7 @@
NM_ACTIVE_CONNECTION_STATE_ACTIVATING,
/* Indicates the connection is currently active */
- NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
+ NM_ACTIVE_CONNECTION_STATE_ACTIVATED
} NMActiveConnectionState;
--- include/NetworkManagerVPN.h
+++ include/NetworkManagerVPN.h
@@ -88,7 +88,7 @@
NM_VPN_CONNECTION_STATE_IP_CONFIG_GET,
NM_VPN_CONNECTION_STATE_ACTIVATED,
NM_VPN_CONNECTION_STATE_FAILED,
- NM_VPN_CONNECTION_STATE_DISCONNECTED,
+ NM_VPN_CONNECTION_STATE_DISCONNECTED
} NMVPNConnectionState;
typedef enum NMVPNConnectionStateReason
@@ -102,7 +102,7 @@
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED,
- NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS,
+ NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS
} NMVPNConnectionStateReason;
#define NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY "gateway"
--- libnm-util/nm-connection.h
+++ libnm-util/nm-connection.h
@@ -19,7 +19,7 @@
typedef enum {
NM_CONNECTION_SCOPE_UNKNOWN = 0,
NM_CONNECTION_SCOPE_SYSTEM,
- NM_CONNECTION_SCOPE_USER,
+ NM_CONNECTION_SCOPE_USER
} NMConnectionScope;
#define NM_CONNECTION_SCOPE "scope"
--- libnm-util/nm-setting-gsm.h
+++ libnm-util/nm-setting-gsm.h
@@ -31,7 +31,7 @@
NM_GSM_NETWORK_GPRS = 0,
NM_GSM_NETWORK_GSM = 1,
NM_GSM_NETWORK_PREFER_GPRS = 2,
- NM_GSM_NETWORK_PREFER_GSM = 3,
+ NM_GSM_NETWORK_PREFER_GSM = 3
};
typedef struct {
--- libnm-util/nm-setting.h
+++ libnm-util/nm-setting.h
@@ -71,7 +71,7 @@
COMPARE_FLAGS_FUZZY = 0x00000001,
/* Ignore the connection ID */
- COMPARE_FLAGS_IGNORE_ID = 0x00000002,
+ COMPARE_FLAGS_IGNORE_ID = 0x00000002
} NMSettingCompareFlags;
/* Returns TRUE if the connections are the same */
--- libnm-util/nm-utils.h
+++ libnm-util/nm-utils.h
@@ -166,7 +166,7 @@
NMU_SEC_WPA_PSK,
NMU_SEC_WPA_ENTERPRISE,
NMU_SEC_WPA2_PSK,
- NMU_SEC_WPA2_ENTERPRISE,
+ NMU_SEC_WPA2_ENTERPRISE
} NMUtilsSecurityType;
gboolean nm_utils_security_valid (NMUtilsSecurityType type,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]