mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-21 10:20:06 +00:00
67f0aff0c6
XPG4.2 defines the siginfo_t type, but not union sigval or its contents (which were added in the 1993 edition of POSIX.1), resulting in namespace violations for sigval, sival_int and sival_ptr for signal.h and sys/wait.h for that standard because those headers incorrectly expose those names in that case. This patch fixes this problem. The public type in this case is union sigval, but various places in the headers use the sigval_t name for it; direct uses of union sigval are already properly guarded or in headers not in XPG4.2. Now, sigval_t, although not a standard name, does seem to be widely used outside glibc. The approach taken by this patch is to make installed headers use the name __sigval_t instead. __sigval_t is then defined to either union sigval or union __sigval (where union __sigval has __-prefixed member names as well), depending on whether there are any namespace issues with the union sigval name and its members. In the case where union __sigval is used, sigval_t is not defined at all, to avoid the problem of sigval_t having a C++ mangled name that depends on feature test macros. sigval_t is still defined by signal.h if __USE_MISC (reflecting the nonstandard nature of that name). Tested for x86_64. [BZ #21944] * signal/bits/types/__sigval_t.h: New file. * signal/Makefile (headers): Add bits/types/__sigval_t.h. * signal/bits/types/sigval_t.h: Include <bits/types/__sigval_t.h> and define sigval_t using __sigval_t. * include/bits/types/__sigval_t.h: New file. * bits/types/sigevent_t.h: Include <bits/types/__sigval_t.h> instead of <bits/types/__sigval_t.h>. (struct sigevent): Use __sigval_t instead of sigval_t. * bits/types/siginfo_t.h: Include <bits/types/__sigval_t.h> instead of <bits/types/__sigval_t.h>. (siginfo_t): Use __sigval_t instead of sigval_t. * sysdeps/unix/sysv/linux/bits/types/sigevent_t.h: Include <bits/types/__sigval_t.h> instead of <bits/types/__sigval_t.h>. (struct sigevent): Use __sigval_t instead of sigval_t. * sysdeps/unix/sysv/linux/bits/types/siginfo_t.h: Include <bits/types/__sigval_t.h> instead of <bits/types/__sigval_t.h>. (siginfo_t): Use __sigval_t instead of sigval_t. * signal/signal.h [__USE_MISC]: Include <bits/types/sigval_t.h>. |
||
|---|---|---|
| .. | ||
| types | ||
| a.out.h | ||
| dirent.h | ||
| epoll.h | ||
| errno.h | ||
| eventfd.h | ||
| fcntl-linux.h | ||
| fcntl.h | ||
| in.h | ||
| initspin.h | ||
| inotify.h | ||
| ioctl-types.h | ||
| ioctls.h | ||
| ipc.h | ||
| local_lim.h | ||
| mqueue.h | ||
| msq.h | ||
| param.h | ||
| poll.h | ||
| posix_opt.h | ||
| resource.h | ||
| sched.h | ||
| sem.h | ||
| shm.h | ||
| sigaction.h | ||
| sigcontext.h | ||
| sigevent-consts.h | ||
| siginfo-arch.h | ||
| siginfo-consts-arch.h | ||
| siginfo-consts.h | ||
| signalfd.h | ||
| signum.h | ||
| sigstack.h | ||
| socket_type.h | ||
| socket.h | ||
| ss_flags.h | ||
| stat.h | ||
| statfs.h | ||
| statvfs.h | ||
| sys_errlist.h | ||
| sysctl.h | ||
| termios.h | ||
| time.h | ||
| timerfd.h | ||
| timex.h | ||
| uio_lim.h | ||
| uio-ext.h | ||
| utsname.h | ||
| waitflags.h | ||