diff options
| author | midipix <writeonce@midipix.org> | 2024-01-29 03:38:39 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-01-29 03:38:39 +0000 |
| commit | c2de4656bd80c415a0359470f88271993024db38 (patch) | |
| tree | 40caa3dbd73d3a0bd1c0cf049a9ca0677793d965 | |
| parent | dc2340a06c6b1feb2188da0c76b1a1dc98203a82 (diff) | |
| download | mmglue-c2de4656bd80c415a0359470f88271993024db38.tar.bz2 mmglue-c2de4656bd80c415a0359470f88271993024db38.tar.xz | |
nt32|nt64: handle the case where struct winsize is defined in alltypes.h.
[while maintaining compatibility with older musl versions]
[cf. musl commit 1ccc804e1345c6e59294f561ac43c3e55ccea1e4]
| -rw-r--r-- | project/headers.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/project/headers.mk b/project/headers.mk index db8aab0..114b546 100644 --- a/project/headers.mk +++ b/project/headers.mk @@ -110,9 +110,10 @@ headers.tag: build/headers.tag $(ARCH_GEN_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 \ - || sed 's/^@@@//g' build/include/bits/ioctl.h \ - > build/include/bits/ioctl.h.tmp + grep 'struct winsize' $(SOURCE_DIR)/include/sys/ioctl.h \ + || grep '^STRUCT winsize' $(SOURCE_DIR)/include/alltypes.h.in \ + || sed 's/^@@@//g' build/include/bits/ioctl.h \ + > build/include/bits/ioctl.h.tmp mv build/include/bits/ioctl.h.tmp build/include/bits/ioctl.h touch $@ |