diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-02-22 09:47:59 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-02-22 10:12:13 +0100 |
| commit | 1d47643d954d69aa6be86a0f308111da9f926389 (patch) | |
| tree | 946fec85f55ee251d87e711c86b6cc2436728ed5 | |
| parent | 57d0d94ba9e4b5346c5b1678e1b440c979ee2676 (diff) | |
| download | NetworkManager-1d47643d954d69aa6be86a0f308111da9f926389.tar.gz | |
libnm/docs: fix enum definition that confuses gtk-doc
WARNING: Failed to parse "| NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE, /*< skip >*/" in /data/src/NetworkManager/build/../libnm-core/nm-setting-wired.h
Fixes: c3f6356a39caf6bc7b159be81ebaa05b929b62f4
| -rw-r--r-- | libnm-core/nm-setting-wired.c | 5 | ||||
| -rw-r--r-- | libnm-core/nm-setting-wired.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 471c65f653..ef23294fda 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -41,6 +41,11 @@ /*****************************************************************************/ +G_STATIC_ASSERT (NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS == ( NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT + | NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE)); + +/*****************************************************************************/ + NM_GOBJECT_PROPERTIES_DEFINE (NMSettingWired, PROP_PORT, PROP_SPEED, diff --git a/libnm-core/nm-setting-wired.h b/libnm-core/nm-setting-wired.h index f73cf38a70..8e707b1be8 100644 --- a/libnm-core/nm-setting-wired.h +++ b/libnm-core/nm-setting-wired.h @@ -75,8 +75,7 @@ typedef enum { /*< flags >*/ NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT = 0x1, NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE = 0x8000, - NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS = NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT - | NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE, /*< skip >*/ + NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS = 0x8001, /*< skip >*/ } NMSettingWiredWakeOnLan; #define NM_SETTING_WIRED_PORT "port" |