Reduce header complexity

- Remove most __ASSEMBLER__ __LINKER__ ifdefs
- Rename libc/intrin/bits.h to libc/serialize.h
- Block pthread cancelation in fchmodat() polyfill
- Remove `clang-format off` statements in third_party

libc/dns/consts.h

@@ -12,10 +12,8 @@
 
 #define DNS_CLASS_IN 1
 
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 #define kMinSockaddr4Size \
   (offsetof(struct sockaddr_in, sin_addr) + sizeof(struct in_addr))
 
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_DNS_CONSTS_H_ */

libc/dns/dns.h

@@ -45,7 +45,6 @@
 #define NI_MAXSERV      32
 #define NI_MAXHOST      1025
 
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 struct addrinfo {
@@ -77,5 +76,4 @@ int ResolveDnsReverse(const struct ResolvConf *, int, const char *, char *,
 struct addrinfo *newaddrinfo(uint16_t);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_DNS_DNS_H_ */

libc/dns/dnsheader.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dns/dnsheader.h"
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/sysv/errfuns.h"
 
 /**

libc/dns/dnsheader.h

@@ -1,6 +1,5 @@
 #ifndef COSMOPOLITAN_LIBC_DNS_DNSHEADER_H_
 #define COSMOPOLITAN_LIBC_DNS_DNSHEADER_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 struct DnsHeader {
@@ -17,5 +16,4 @@ void SerializeDnsHeader(uint8_t[restrict 12], const struct DnsHeader *);
 void DeserializeDnsHeader(struct DnsHeader *, const uint8_t[restrict 12]);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_DNS_DNSHEADER_H_ */

libc/dns/dnsquestion.h

@@ -1,6 +1,5 @@
 #ifndef COSMOPOLITAN_LIBC_DNS_DNSQUESTION_H_
 #define COSMOPOLITAN_LIBC_DNS_DNSQUESTION_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 struct DnsQuestion {
@@ -12,5 +11,4 @@ struct DnsQuestion {
 int SerializeDnsQuestion(uint8_t *, size_t, const struct DnsQuestion *);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_DNS_DNSQUESTION_H_ */

libc/dns/ent.h

@@ -8,7 +8,6 @@
 #define NO_DATA        4
 #define NO_ADDRESS     NO_DATA
 
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 struct netent {
@@ -69,5 +68,4 @@ void setservent(int);
 void endservent(void);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_DNS_ENT_H_ */

libc/dns/gethoststxt.c

@@ -21,7 +21,6 @@
 #include "libc/dce.h"
 #include "libc/dns/hoststxt.h"
 #include "libc/dns/servicestxt.h"
-#include "libc/intrin/bits.h"
 #include "libc/intrin/pushpop.internal.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/macros.internal.h"

libc/dns/hoststxt.h

@@ -2,7 +2,6 @@
 #define COSMOPOLITAN_LIBC_DNS_HOSTSTXT_H_
 #include "libc/sock/struct/sockaddr.h"
 #include "libc/stdio/stdio.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 struct HostsTxtEntry {
@@ -36,5 +35,4 @@ int ResolveHostsReverse(const struct HostsTxt *, int, const uint8_t *, char *,
                         size_t) paramsnonnull((1, 3));
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_DNS_HOSTSTXT_H_ */

libc/dns/prototxt.h

@@ -2,7 +2,6 @@
 #define COSMOPOLITAN_LIBC_DNS_PROTOTXT_H_
 #include "libc/sock/sock.h"
 #include "libc/stdio/stdio.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 const char *GetProtocolsTxtPath(char *, size_t);
@@ -15,5 +14,4 @@ int LookupProtoByName(const char *, char *, size_t, const char *)
 /* TODO: implement like struct HostsTxt? */
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_DNS_PROTOTXT_H_ */

libc/dns/resolvconf.h

@@ -2,7 +2,6 @@
 #define COSMOPOLITAN_LIBC_DNS_RESOLVCONF_H_
 #include "libc/sock/sock.h"
 #include "libc/stdio/stdio.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 struct Nameservers {
@@ -20,5 +19,4 @@ void FreeResolvConf(struct ResolvConf **) paramsnonnull();
 int GetNtNameServers(struct ResolvConf *) paramsnonnull();
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_DNS_RESOLVCONF_H_ */

libc/dns/resolvedns.c

@@ -22,7 +22,7 @@
 #include "libc/dns/dnsheader.h"
 #include "libc/dns/dnsquestion.h"
 #include "libc/dns/resolvconf.h"
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/internal.h"

libc/dns/resolvednsreverse.c

@@ -30,7 +30,7 @@
 #include "libc/dns/dnsheader.h"
 #include "libc/dns/dnsquestion.h"
 #include "libc/dns/resolvconf.h"
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"

libc/dns/resolvehostsreverse.c

@@ -19,7 +19,7 @@
 #include "libc/dns/consts.h"
 #include "libc/dns/dns.h"
 #include "libc/dns/hoststxt.h"
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/mem/alg.h"
 #include "libc/sock/sock.h"
 #include "libc/str/str.h"

libc/dns/servicestxt.h

@@ -2,7 +2,6 @@
 #define COSMOPOLITAN_LIBC_DNS_SERVICESTXT_H_
 #include "libc/sock/sock.h"
 #include "libc/stdio/stdio.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 char *GetSystemDirectoryPath(char *, size_t, const char *);
@@ -15,5 +14,4 @@ const char *GetServicesTxtPath(char *, size_t);
 /* TODO: implement like struct HostsTxt? */
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_DNS_SERVICESTXT_H_ */