diff options
| author | midipix <writeonce@midipix.org> | 2020-05-03 04:22:29 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2020-05-03 04:22:29 +0000 |
| commit | 1cfd88096fbd2a4593dfe3fa7e26e973a833a82d (patch) | |
| tree | 801c7b5883dd181eba2f16b8a5e16e59780a1a7c | |
| parent | a9c0442c3abec547553e9c0c0d885c7e81392c15 (diff) | |
| download | mmglue-1cfd88096fbd2a4593dfe3fa7e26e973a833a82d.tar.bz2 mmglue-1cfd88096fbd2a4593dfe3fa7e26e973a833a82d.tar.xz | |
nt32|nt64: move msghdr and cmsghdr out of bits/socket.h as needed.
[while maintaining compatibility with older musl versions]
[cf. musl commit a0252bc75b8546008c6b87e58344c4340683d5eb]
| -rw-r--r-- | arch/nt32/bits/socket.h.in (renamed from arch/nt32/bits/socket.h) | 0 | ||||
| -rw-r--r-- | arch/nt64/bits/socket.h.in (renamed from arch/nt64/bits/socket.h) | 0 | ||||
| -rw-r--r-- | project/headers.mk | 5 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/nt32/bits/socket.h b/arch/nt32/bits/socket.h.in index 36febbc..36febbc 100644 --- a/arch/nt32/bits/socket.h +++ b/arch/nt32/bits/socket.h.in diff --git a/arch/nt64/bits/socket.h b/arch/nt64/bits/socket.h.in index eb81356..eb81356 100644 --- a/arch/nt64/bits/socket.h +++ b/arch/nt64/bits/socket.h.in diff --git a/project/headers.mk b/project/headers.mk index 77f7cf1..db8aab0 100644 --- a/project/headers.mk +++ b/project/headers.mk @@ -103,6 +103,11 @@ build/headers.tag: $(ARCH_HEADERS) touch $@ headers.tag: build/headers.tag $(ARCH_GEN_H) + grep 'struct msghdr {' $(SOURCE_DIR)/include/sys/socket.h \ + || cat $(PORT_DIR)/arch/$(ARCH)/bits/socket.h.in \ + > build/include/bits/socket.h \ + || cat $(PORT_DIR)/arch/$(ARCH)/bits/socket.h \ + > build/include/bits/socket.h grep -v '^@@@' build/include/bits/ioctl.h \ > build/include/bits/ioctl.h.tmp grep 'struct winsize' $(SOURCE_DIR)/include/sys/ioctl.h \ |