Remove more nonstandard stuff from cosmopolitan.h

Fixes #61
2025-07-07 19:58:30 +00:00 · 2021-02-28 23:42:35 -08:00 · 2021-02-28 23:42:35 -08:00 · d932948fb4
commit d932948fb4
parent 5e069a64d4
954 changed files with 1095 additions and 1342 deletions
--- a/libc/str/crc32.S
+++ b/libc/str/crc32.S
@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"

 //	Computes Phil Katz CRC-32 used by zip/zlib/gzip/etc.
 //
--- a/libc/str/crc32c.S
+++ b/libc/str/crc32c.S
@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/notice.inc"

--- a/libc/str/crc32z.c
+++ b/libc/str/crc32z.c
@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/nexgen32e/x86feature.h"

--- a/libc/str/iswctype.c
+++ b/libc/str/iswctype.c
@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"

 #define ALNUM  1
--- a/libc/str/kx86processormodels.c
+++ b/libc/str/kx86processormodels.c
@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/x86info.h"

 hidden const struct X86ProcessorModel kX86ProcessorModels[] = {
--- a/libc/str/mbtowc.c
+++ b/libc/str/mbtowc.c
@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/str/tpdecode.internal.h"

--- a/libc/str/rindex.S
+++ b/libc/str/rindex.S
@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__

 //	Returns pointer to last instance of character the BSD way.
--- a/libc/str/strcmp8to16i.internal.h
+++ b/libc/str/strcmp8to16i.internal.h
@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_STR_STRCMP8TO16I_H_
 #define COSMOPOLITAN_LIBC_STR_STRCMP8TO16I_H_
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/oldutf16.internal.h"
 #include "libc/str/str.h"
 #include "libc/str/tpdecode.internal.h"
--- a/libc/str/strlcat.c
+++ b/libc/str/strlcat.c
@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/str/str.h"

 /**
--- a/libc/str/strlcpy.c
+++ b/libc/str/strlcpy.c
@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
-#include "libc/macros.h"
+#include "libc/bits/safemacros.internal.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"

 /**
--- a/libc/str/strsignal.c
+++ b/libc/str/strsignal.c
@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"

 static const char kSig[4] = "SIG";
--- a/libc/str/tpenc.S
+++ b/libc/str/tpenc.S
@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__

 //	Encodes Thompson-Pike varint.
--- a/libc/str/undeflate.c
+++ b/libc/str/undeflate.c
@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
 #include "libc/intrin/repmovsb.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/kompressor.h"
 #include "libc/str/str.h"
 #include "libc/str/undeflate.h"