summaryrefslogtreecommitdiffstats
path: root/nbd
diff options
context:
space:
mode:
authorDaniel P. Berrangé2019-03-20 17:18:42 +0100
committerLaurent Vivier2019-04-08 17:27:13 +0200
commit71ba74f67eaca21b0cc9d96f534ad3b9a7161400 (patch)
tree087559dc4db44d46bd4dc111bfd97f945385682b /nbd
parentlinux-user: assume __NR_gettid always exists (diff)
downloadqemu-71ba74f67eaca21b0cc9d96f534ad3b9a7161400.tar.gz
qemu-71ba74f67eaca21b0cc9d96f534ad3b9a7161400.tar.xz
qemu-71ba74f67eaca21b0cc9d96f534ad3b9a7161400.zip
linux-user: rename gettid() to sys_gettid() to avoid clash with glibc
The glibc-2.29.9000-6.fc31.x86_64 package finally includes the gettid() function as part of unistd.h when __USE_GNU is defined. This clashes with linux-user code which unconditionally defines this function name itself. /home/berrange/src/virt/qemu/linux-user/syscall.c:253:16: error: static declaration of ‘gettid’ follows non-static declaration 253 | _syscall0(int, gettid) | ^~~~~~ /home/berrange/src/virt/qemu/linux-user/syscall.c:184:13: note: in definition of macro ‘_syscall0’ 184 | static type name (void) \ | ^~~~ In file included from /usr/include/unistd.h:1170, from /home/berrange/src/virt/qemu/include/qemu/osdep.h:107, from /home/berrange/src/virt/qemu/linux-user/syscall.c:20: /usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here 34 | extern __pid_t gettid (void) __THROW; | ^~~~~~ CC aarch64-linux-user/linux-user/signal.o make[1]: *** [/home/berrange/src/virt/qemu/rules.mak:69: linux-user/syscall.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:449: subdir-aarch64-linux-user] Error 2 While we could make our definition conditional and rely on glibc's impl, this patch simply renames our definition to sys_gettid() which is a common pattern in this file. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20190320161842.13908-3-berrange@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'nbd')
0 files changed, 0 insertions, 0 deletions