From 1cfd88096fbd2a4593dfe3fa7e26e973a833a82d Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 3 May 2020 04:22:29 +0000 Subject: nt32|nt64: move msghdr and cmsghdr out of bits/socket.h as needed. [while maintaining compatibility with older musl versions] [cf. musl commit a0252bc75b8546008c6b87e58344c4340683d5eb] --- project/headers.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'project') 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 \ -- cgit v1.2.3