mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 04:31:03 +00:00
2288c2674d
sysdeps/unix/sysv/linux/bits/socket.h includes asm/socket.h. That includes asm/sockios.h, which on MIPS includes asm/ioctl.h, resulting in namespace violations from IOC* macros. bits/socket.h already has code to handle asm/socket.h unconditionally defining macros that are only wanted for __USE_MISC. This patch extends it to handle the IOC* macros as well (always undefining them if not defined when bits/socket.h was included, as I don't think they are part of the intended API even for __USE_MISC). It's possible there should also be a kernel fix - it's not clear to me that IOC* belong in the uapi headers, and even if they do they might best be split out into another header to avoid getting defined by this particular path. But since glibc needs to deal with existing kernel headers, it also seems appropriate to extend the existing workaround to these macros. Tested (compilation only) with build-many-glibcs.py. [BZ #21267] * sysdeps/unix/sysv/linux/bits/socket.h (IOCSIZE_MASK): Undefine if defined by <asm/socket.h> and not previously defined. (IOCSIZE_SHIFT): Likewise. (IOC_IN): Likewise. (IOC_INOUT): Likewise. (IOC_OUT): Likewise. |
||
|---|---|---|
| .. | ||
| alpha | ||
| arm | ||
| bsd | ||
| i386 | ||
| inet | ||
| mips | ||
| powerpc | ||
| sh | ||
| sysv/linux | ||
| x86_64 | ||
| clock_gettime.c | ||
| clock_nanosleep.c | ||
| clock_settime.c | ||
| confstr.h | ||
| get_child_max.c | ||
| getlogin_r.c | ||
| getlogin.c | ||
| getpagesize.c | ||
| grantpt.c | ||
| ifreq.c | ||
| Implies | ||
| make-syscalls.sh | ||
| Makefile | ||
| s-proto-cancel.S | ||
| s-proto.S | ||
| setxid.h | ||
| sockatmark.c | ||
| stime.c | ||
| syscall-template.S | ||
| syscall.S | ||
| syscalls.list | ||
| sysdep.h | ||