diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-03-19 16:17:13 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-03-19 16:17:13 +0100 |
| commit | 9920e41d48f93b794ab1ab59b0a2f9c8edbe5c07 (patch) | |
| tree | d624d230049607b9cf28e92e4a94fd477171fc94 /shared | |
| parent | b5ca5b45b1aa47e373af49b27064e813b4f77194 (diff) | |
| parent | b225b477d3f6e110bf61ccd88e4ad176504e36b0 (diff) | |
Update upstream source from tag 'upstream/1.16.0'
Update to upstream version '1.16.0' with Debian dir 55e2f8b86df2220d682056c78117065bbe3e5a81
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/nm-version-macros.h | 4 | ||||
| -rw-r--r-- | shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 3 |
2 files changed, 4 insertions, 3 deletions
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 <uchar.h> provides char32_t,char16_t. */ #define HAVE_CHAR32_T 1 |