From b225b477d3f6e110bf61ccd88e4ad176504e36b0 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 19 Mar 2019 16:15:36 +0100 Subject: New upstream version 1.16.0 --- shared/nm-version-macros.h | 4 ++-- shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'shared') diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index ffe13c4e..3906e7c8 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -37,7 +37,7 @@ * Evaluates to the minor version number of NetworkManager which this source * is compiled against. */ -#define NM_MINOR_VERSION (15) +#define NM_MINOR_VERSION (16) /** * NM_MICRO_VERSION: @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (91) +#define NM_MICRO_VERSION (0) /** * NM_CHECK_VERSION: diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index 06008ce8..b10722d7 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -111,9 +111,10 @@ raw_getpid (void) { #endif } -static inline pid_t gettid(void) { +static inline pid_t _nm_gettid(void) { return (pid_t) syscall(SYS_gettid); } +#define gettid() _nm_gettid () /* we build with C11 and thus provides char32_t,char16_t. */ #define HAVE_CHAR32_T 1 -- cgit 1.3.0-6-gf8a5