fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-21 19:10:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
NetworkManager/shared/systemd
History
Thomas Haller cfb970b277 shared/systemd: fix gettid() compat implementation shadowing function from glibc 
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 10276322bd)
2019-03-11 19:09:59 +01:00
..
sd-adapt-shared shared/systemd: fix gettid() compat implementation shadowing function from glibc 2019-03-11 19:09:59 +01:00
src/basic systemd: merge branch systemd into master 2019-02-20 19:18:52 +01:00
nm-logging-stub.c logging: make nm-logging thread-safe 2019-02-05 08:18:08 +01:00
nm-sd-utils-shared.c systemd: expose unbase64mem() as nm_sd_utils_unbase64mem() 2019-01-02 17:08:41 +01:00
nm-sd-utils-shared.h systemd: expose unbase64mem() as nm_sd_utils_unbase64mem() 2019-01-02 17:08:41 +01:00