From ff9333d473adb4ae1de2d9323394073793627823 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 19 Feb 2019 16:23:24 +0000 Subject: Add skalibs/posixishard.h This will break things. It's a known issue. Patches to other packages will come later, to adapt them to the new API. To work around brokenness, there needs to be *two* different headers: 1. one to be used before including system headers, that maximizes visibility by enabling system-dependent feature test macros (that will be tested by system headers) 2. one to be used after including system headers, that performs preprocessor tests and defines. skalibs/nonposix.h is the first one. Previously, there was no second one, and the tests were scattered all over. There was a strnlen declaration in skalibs/posixplz.h (which serves a totally different function: declaring things that should be in POSIX, but *are not*, i.e. working around problems in the standard, instead of problems in systems failing to respect the standard), a build-time sysdep for error.h, #defines for MSG_NOSIGNAL, etc. etc. skalibs/posixishard.h now is the second one, and centralizes all the tests. As a result, the eproto sysdep is unnecessary and has been removed. skalibs/error.h is now a static header, it is not built anymore. --- Makefile | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f40335b..8770d7a 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,6 @@ src/include/$(package)/uint16.h \ src/include/$(package)/uint32.h \ src/include/$(package)/uint64.h \ src/include/$(package)/types.h \ -src/include/$(package)/error.h \ src/include/$(package)/ip46.h ALL_INCLUDES := $(sort $(BUILT_INCLUDES) $(wildcard src/include/$(package)/*.h)) ALL_SYSDEPS := $(wildcard $(sysdeps)/*) @@ -151,18 +150,6 @@ src/include/$(package)/uint64.h: $(sysdeps)/sysdeps src/headers/bits-header src/ src/include/$(package)/types.h: src/include/$(package)/uint16.h src/include/$(package)/uint32.h src/include/$(package)/uint64.h $(sysdeps)/sysdeps src/headers/types-header src/headers/types-footer src/headers/unsigned-template src/headers/signed-template exec tools/gen-types.sh $(sysdeps)/sysdeps $(TYPES) > $@ -src/include/$(package)/error.h: src/include/$(package)/gccattributes.h $(sysdeps)/sysdeps src/headers/error-addrinuse src/headers/error-already src/headers/error-proto src/headers/error-header src/headers/error-footer - @{ \ - cat src/headers/error-header ; \ - if grep -F target: $(sysdeps)/sysdeps | grep -qiF bsd ; then cat src/headers/error-addrinuse ; \ - else cat src/headers/error-already ; \ - fi ; \ - if grep -qF 'eproto: yes' $(sysdeps)/sysdeps ; then : ; \ - else cat src/headers/error-proto ; \ - fi ; \ - exec cat src/headers/error-footer ; \ - } > $@ - src/include/$(package)/ip46.h: src/include/$(package)/fmtscan.h src/include/$(package)/socket.h $(sysdeps)/sysdeps src/headers/ip46-header src/headers/ip46-footer src/headers/ip46-with src/headers/ip46-without @{ \ cat src/headers/ip46-header ; \ -- cgit v1.2.3