diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-03-11 18:11:13 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-03-06 12:09:11 +0100 |
| commit | 24b8a4bc7519bf25235865e8c209a7c55bfa00bb (patch) | |
| tree | 82fba69c3ff689c689c8800972e5dddac12f8e76 | |
| parent | bbc13c5bb6f0f41207fa5bc4d7ad44c2b4f58336 (diff) | |
| download | NetworkManager-nm-1-2.tar.gz | |
shared/systemd: fix gettid() compat implementation shadowing function from glibcnm-1-2
On Fedora rawhide we get the following build failure:
In file included from shared/systemd/src/basic/alloc-util.c:3:
./shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h:114:21: error: static declaration of 'gettid' follows non-static declaration
114 | static inline pid_t gettid(void) {
| ^~~~~~
In file included from /usr/include/unistd.h:1170,
from /usr/include/glib-2.0/gio/gcredentials.h:32,
from /usr/include/glib-2.0/gio/gio.h:46,
from ./shared/nm-utils/nm-macros-internal.h:31,
from ./shared/nm-default.h:293,
from ./shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h:22,
from shared/systemd/src/basic/alloc-util.c:3:
/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of 'gettid' was here
34 | extern __pid_t gettid (void) __THROW;
| ^~~~~~
glibc supports now gettid() call ([1]) which conflicts with our compat
implementation. Rename it.
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92
(cherry picked from commit 10276322bde8f015e48ac06f6a7509f514eb46f0)
(cherry picked from commit cfb970b2778d7bde97fea4f5718d4a2a9a9d68f5)
(cherry picked from commit d160b7b990cef4470af1e957bb9cd436ebfe1dff)
(cherry picked from commit b10a7e5786e9c6bb95bd014ee165b452c247da6d)
(cherry picked from commit 4ae20ea80a88c8290809fa39aaaf3457cf1c0af7)
(cherry picked from commit d943b538cf3e4a309f72d774ada44e8039688ba2)
(cherry picked from commit b3332f6df63f1391f391a5288fdd3ad0a3c3cb9c)
(cherry picked from commit a03d7846103f1f1ae1fa1c5d5a59b8ab0b0188ae)
| -rw-r--r-- | src/systemd/nm-sd-adapt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h index 010c8a80f6..2c5c04b3f4 100644 --- a/src/systemd/nm-sd-adapt.h +++ b/src/systemd/nm-sd-adapt.h @@ -163,9 +163,10 @@ sd_notify (int unset_environment, const char *state) #include "async.h" #include "util.h" -static inline pid_t gettid(void) { +static inline pid_t _nm_gettid(void) { return (pid_t) syscall(SYS_gettid); } +#define gettid() _nm_gettid () static inline bool is_main_thread(void) { return TRUE; |