about summary refs log tree commit diff
path: root/shared/systemd
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2019-03-19 16:17:13 +0100
committerSebastien Bacher <seb128@ubuntu.com>2019-03-19 16:17:13 +0100
commit9920e41d48f93b794ab1ab59b0a2f9c8edbe5c07 (patch)
treed624d230049607b9cf28e92e4a94fd477171fc94 /shared/systemd
parentb5ca5b45b1aa47e373af49b27064e813b4f77194 (diff)
parentb225b477d3f6e110bf61ccd88e4ad176504e36b0 (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/systemd')
-rw-r--r--shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h3
1 files changed, 2 insertions, 1 deletions
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