diff options
| author | Michael Biebl <biebl@debian.org> | 2018-02-07 02:39:23 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-02-07 02:39:23 +0100 |
| commit | 50f6b47074e01dffb8dc536c0a20961dcf28ae9b (patch) | |
| tree | b4bd771d78ebe38661b8c4ec8b9a8e0eb8261eb5 /shared | |
| parent | afcd268ea7b1149fbfb66bce4eca659b675da0a2 (diff) | |
New upstream version 1.10.4 upstream/1.10.4
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/nm-utils/nm-macros-internal.h | 1 | ||||
| -rw-r--r-- | shared/nm-version-macros.h | 8 | ||||
| -rw-r--r-- | shared/nm-version-macros.h.in | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h index 5bd9eac4..29678bb6 100644 --- a/shared/nm-utils/nm-macros-internal.h +++ b/shared/nm-utils/nm-macros-internal.h @@ -190,6 +190,7 @@ _nm_auto_protect_errno (int *p_saved_errno) #elif defined (__clang__) #define NM_PRAGMA_WARNING_DISABLE(warning) \ _Pragma("clang diagnostic push") \ + _Pragma(_NM_PRAGMA_WARNING_DO("-Wunknown-warning-option")) \ _Pragma(_NM_PRAGMA_WARNING_DO(warning)) #else #define NM_PRAGMA_WARNING_DISABLE(warning) diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index 021b0445..8d6a3c7c 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (2) +#define NM_MICRO_VERSION (4) /** * NM_CHECK_VERSION: @@ -73,9 +73,11 @@ #define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0)) #define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0)) #define NM_VERSION_1_10_2 (NM_ENCODE_VERSION (1, 10, 2)) +#define NM_VERSION_1_10_4 (NM_ENCODE_VERSION (1, 10, 4)) +#define NM_VERSION_1_10_6 (NM_ENCODE_VERSION (1, 10, 6)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_10 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_2 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_4 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_4 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index f745fa68..46a544be 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -73,9 +73,11 @@ #define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0)) #define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0)) #define NM_VERSION_1_10_2 (NM_ENCODE_VERSION (1, 10, 2)) +#define NM_VERSION_1_10_4 (NM_ENCODE_VERSION (1, 10, 4)) +#define NM_VERSION_1_10_6 (NM_ENCODE_VERSION (1, 10, 6)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_10 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_2 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_4 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_4 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) |