diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:03 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:03 +0200 |
| commit | 8c98b34228abb4dfde822ad89106b4d8b2287639 (patch) | |
| tree | 9305205f351759c51888cd9f7d75a2eb5b0e1431 /include | |
| parent | 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (diff) | |
Imported Upstream version 0.9.6.0upstream/0.9.6.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/NetworkManager.h | 6 | ||||
| -rw-r--r-- | include/nm-version.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 644575105..bb67b8f7a 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -139,7 +139,6 @@ typedef enum { * General device capability flags. **/ typedef enum { - /*< flags >*/ NM_DEVICE_CAP_NONE = 0x00000000, NM_DEVICE_CAP_NM_SUPPORTED = 0x00000001, NM_DEVICE_CAP_CARRIER_DETECT = 0x00000002 @@ -160,7 +159,6 @@ typedef enum { * 802.11 specific device encryption and authentication capabilities. **/ typedef enum { - /*< flags >*/ NM_WIFI_DEVICE_CAP_NONE = 0x00000000, NM_WIFI_DEVICE_CAP_CIPHER_WEP40 = 0x00000001, NM_WIFI_DEVICE_CAP_CIPHER_WEP104 = 0x00000002, @@ -181,7 +179,6 @@ typedef enum { * 802.11 access point flags. **/ typedef enum { - /*< flags >*/ NM_802_11_AP_FLAGS_NONE = 0x00000000, NM_802_11_AP_FLAGS_PRIVACY = 0x00000001 } NM80211ApFlags; @@ -212,7 +209,6 @@ typedef enum { * access point's beacon. **/ typedef enum { - /*< flags >*/ NM_802_11_AP_SEC_NONE = 0x00000000, NM_802_11_AP_SEC_PAIR_WEP40 = 0x00000001, NM_802_11_AP_SEC_PAIR_WEP104 = 0x00000002, @@ -250,7 +246,6 @@ typedef enum { * Bluetooth device. **/ typedef enum { - /*< flags >*/ NM_BT_CAPABILITY_NONE = 0x00000000, NM_BT_CAPABILITY_DUN = 0x00000001, NM_BT_CAPABILITY_NAP = 0x00000002, @@ -273,7 +268,6 @@ typedef enum { * API. **/ typedef enum { - /*< flags >*/ NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000, NM_DEVICE_MODEM_CAPABILITY_POTS = 0x00000001, NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x00000002, diff --git a/include/nm-version.h b/include/nm-version.h index 4bf3ebe5b..13256abd5 100644 --- a/include/nm-version.h +++ b/include/nm-version.h @@ -43,7 +43,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (5) +#define NM_MICRO_VERSION (6) /** * NM_CHECK_VERSION: |