d27506716a
Bionic currently renames the kernel's __kernel_sockaddr_storage to sockaddr_storage. We would like to reuse the bionic kernel headers for musl, but musl defines its own sockaddr_storage, causing redefinition errors when the musl and kernel headers are both included. Give bionic its own definition of sockaddr_storage so the kernel one can be left as __kernel_sockaddr_storage, avoiding the conflict in musl. Some of the structs in netinet/in.h contain sockaddr_storage members. There are definitions in linux/in.h, but they now use the __kernel_sockaddr_storage naming. To avoid having to copy the structs from linux/in.h into netinet/in.h, add some #define hackery to rename __kernel_sockaddr_storage to sockaddr_storage when including linux/in.h from netinet/in.h. Bug: 190084016 Test: m checkbuild Test: bionic-unit-tests Change-Id: I8f654511722b3a4a8e0bb146e4418ebcd370305c |
||
---|---|---|
.. | ||
arch-arm | ||
arch-arm64 | ||
arch-common/bionic | ||
arch-x86 | ||
arch-x86_64 | ||
async_safe | ||
bionic | ||
dns | ||
include | ||
kernel | ||
malloc_debug | ||
malloc_hooks | ||
platform | ||
private | ||
seccomp | ||
stdio | ||
system_properties | ||
tools | ||
tzcode | ||
upstream-freebsd | ||
upstream-netbsd | ||
upstream-openbsd | ||
versioner-dependencies | ||
Android.bp | ||
fs_config_generator.py | ||
libc.map.txt | ||
libstdc++.map.txt | ||
MODULE_LICENSE_BSD | ||
NOTICE | ||
SECCOMP_ALLOWLIST_APP.TXT | ||
SECCOMP_ALLOWLIST_COMMON.TXT | ||
SECCOMP_ALLOWLIST_SYSTEM.TXT | ||
SECCOMP_BLOCKLIST_APP.TXT | ||
SECCOMP_BLOCKLIST_COMMON.TXT | ||
SECCOMP_PRIORITY.TXT | ||
SYSCALLS.TXT | ||
version_script.txt |