From d932948fb49bf13a283e6d6f6c5f63026cf32370 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Sun, 28 Feb 2021 23:42:35 -0800 Subject: [PATCH] Remove more nonstandard stuff from cosmopolitan.h Fixes #61 --- .vscode/vscode.h | 2 +- ape/ape.lds | 5 ++-- ape/macros.internal.h | 2 +- dsp/core/c161.h | 2 +- dsp/core/c161s.h | 2 +- dsp/core/double2byte.c | 2 +- dsp/core/float2short.c | 2 +- dsp/core/getintegercoefficients.c | 2 +- dsp/core/getintegercoefficients8.c | 2 +- dsp/core/half.h | 2 +- dsp/core/ks8.h | 2 +- dsp/core/kss8.h | 2 +- dsp/core/mulaw.S | 2 +- dsp/core/q.h | 2 +- dsp/core/sad16x8n.S | 2 +- dsp/core/scalevolume.c | 2 +- dsp/mpeg/clamp4int256-core.S | 2 +- dsp/mpeg/mpeg1.c | 2 +- dsp/mpeg/slowrgb.c | 2 +- dsp/scale/gyarados.c | 2 +- dsp/scale/magikarp.c | 2 +- dsp/tty/ident.c | 2 +- dsp/tty/mpsadbw.S | 2 +- dsp/tty/rgb2ansi.c | 2 +- dsp/tty/rgb2ttyi2f.c | 2 +- dsp/tty/rgb2xterm24.c | 2 +- dsp/tty/ttymove.c | 2 +- dsp/tty/ttyraster.c | 4 +-- dsp/tty/ttyraw.c | 2 +- dsp/tty/windex-avx2.S | 2 +- dsp/tty/windex-sse4.S | 2 +- dsp/tty/windex.S | 2 +- examples/cplusplus.cc | 2 +- examples/curl.c | 4 +-- examples/dinlerp.c | 2 +- examples/e820.c | 2 +- examples/ispell.c | 2 +- examples/lstime.c | 2 +- examples/mappy.c | 2 +- examples/nesemu1.cc | 4 +-- examples/package/lib/myasm.S | 2 +- examples/poll.c | 2 +- examples/printargs.c | 2 +- examples/unbourne.c | 1 - libc/alg/replacestr.c | 2 +- libc/alg/{reverse.h => reverse.internal.h} | 4 +-- libc/alg/{shuffle.h => shuffle.internal.h} | 4 +-- libc/alg/tarjan.c | 2 +- libc/bits/abs.c | 2 +- libc/bits/atomic_load.c | 2 +- libc/bits/atomic_store.c | 2 +- libc/bits/emptytonull.c | 27 ----------------- libc/bits/firstnonnull.c | 28 ----------------- libc/bits/isempty.c | 25 ---------------- libc/bits/nulltoempty.c | 27 ----------------- libc/bits/pushpop.h | 2 +- libc/bits/rounddown.c | 26 ---------------- libc/bits/roundup.c | 26 ---------------- .../{safemacros.h => safemacros.internal.h} | 17 +---------- libc/bits/unsignedsubtract.c | 26 ---------------- libc/bits/{xchg.h => xchg.internal.h} | 0 libc/calls/atfork.c | 2 +- libc/calls/close.c | 2 +- libc/calls/commandv.c | 2 +- libc/calls/copyfd.c | 2 +- libc/calls/execve-sysv.c | 2 +- libc/calls/fstat-nt.c | 2 +- libc/calls/g_fds_init.S | 2 +- libc/calls/getcwd-nt.c | 2 +- libc/calls/getdomainname.c | 2 +- libc/calls/getntsyspath.S | 2 +- libc/calls/gettemppatha-flunk.S | 2 +- libc/calls/getuid.c | 2 +- libc/calls/internal.h | 2 +- libc/calls/ioctl.h | 5 ++-- libc/calls/isdebuggerpresent.c | 2 +- libc/calls/kill-nt.c | 2 +- libc/calls/kntprioritycombos.c | 2 +- libc/calls/kntsystemdirectory.S | 2 +- libc/calls/kntwindowsdirectory.S | 2 +- libc/calls/ktmppath.S | 2 +- libc/calls/madvise-nt.c | 2 +- libc/calls/mkntenvblock.c | 2 +- libc/calls/mkntpathat.c | 2 +- libc/calls/nanosleep-xnu.c | 2 +- libc/calls/netbsdtramp.S | 2 +- libc/calls/nice.c | 2 +- libc/calls/now.c | 3 +- libc/calls/nowl.S | 2 +- libc/calls/ntspawn.c | 2 +- libc/calls/onntconsoleevent_init.S | 2 +- libc/calls/onwincrash.S | 2 +- libc/calls/pipe-nt.c | 2 +- libc/calls/pread.c | 2 +- libc/calls/preadv.c | 2 +- libc/calls/pwrite.c | 2 +- libc/calls/pwritev.c | 2 +- libc/calls/readv-metal.c | 2 +- libc/calls/sched_setaffinity.c | 2 +- libc/calls/setegid.S | 2 +- libc/calls/seteuid.S | 2 +- libc/calls/setpriority-nt.c | 2 +- libc/calls/sigaction.c | 2 +- libc/calls/sigenter-freebsd.c | 2 +- libc/calls/sigenter-netbsd.c | 2 +- libc/calls/sigenter-openbsd.c | 2 +- libc/calls/sysinfo.c | 2 +- libc/calls/termios.h | 7 ++--- libc/calls/termios.internal.h | 2 +- libc/calls/vdprintf.c | 2 +- libc/calls/wait4-nt.c | 2 +- libc/calls/winalarm.S | 2 +- libc/calls/wincrash_init.S | 2 +- libc/crt/crt.S | 2 +- libc/crypto/kaessbox.S | 2 +- libc/crypto/kaessboxinverse.S | 2 +- libc/dns/dnsnamecmp.c | 2 +- libc/dns/getaddrinfo.c | 2 +- libc/dns/gethoststxt.c | 4 +-- libc/dns/getresolvconf.c | 2 +- libc/dns/newaddrinfo.c | 2 +- libc/fmt/dosdatetimetounix.c | 2 +- libc/fmt/fcvt.c | 2 +- libc/fmt/imaxabs.c | 2 +- libc/fmt/imaxabs.thunk.S | 2 +- libc/fmt/itoa128radix10.greg.c | 2 +- libc/fmt/itoa64.c | 2 +- libc/fmt/itoa64radix10.greg.c | 2 +- libc/fmt/itoa64radix16.greg.c | 2 +- libc/fmt/itoa64radix8.c | 2 +- libc/fmt/labs.c | 2 +- libc/fmt/llabs.c | 2 +- libc/fmt/strerror_r.c | 4 +-- libc/fmt/unbing.c | 2 +- libc/fmt/vsnprintf.c | 2 +- libc/intrin/addvdi3.S | 2 +- libc/intrin/addvsi3.S | 2 +- libc/intrin/addvti3.S | 2 +- libc/intrin/asan.c | 4 +-- libc/intrin/mpsadbw.c | 2 +- libc/intrin/mpsadbws.S | 2 +- libc/intrin/mulvdi3.S | 2 +- libc/intrin/mulvsi3.S | 2 +- libc/intrin/mulvti3.S | 2 +- libc/intrin/negvdi2.S | 2 +- libc/intrin/negvsi2.S | 2 +- libc/intrin/negvti2.S | 2 +- libc/intrin/onarithmeticoverflow.S | 2 +- libc/intrin/pabsb.c | 2 +- libc/intrin/pabsd.c | 2 +- libc/intrin/pabsw.c | 2 +- libc/intrin/packssdw.c | 2 +- libc/intrin/packsswb.c | 2 +- libc/intrin/packusdw.c | 2 +- libc/intrin/packuswb.c | 2 +- libc/intrin/paddsb.c | 2 +- libc/intrin/paddsw.c | 2 +- libc/intrin/paddusb.c | 2 +- libc/intrin/paddusw.c | 2 +- libc/intrin/palignr.c | 2 +- libc/intrin/palignrs.S | 2 +- libc/intrin/phaddsw.c | 2 +- libc/intrin/phsubsw.c | 2 +- libc/intrin/pmaddubsw.c | 2 +- libc/intrin/pmaxsw.c | 2 +- libc/intrin/pmaxub.c | 2 +- libc/intrin/pminsw.c | 2 +- libc/intrin/pminub.c | 2 +- libc/intrin/psadbw.c | 2 +- libc/intrin/pslldqs.S | 2 +- libc/intrin/psrldqs.S | 2 +- libc/intrin/psubsb.c | 2 +- libc/intrin/psubsw.c | 2 +- libc/intrin/psubusb.c | 2 +- libc/intrin/psubusw.c | 2 +- libc/intrin/somanyasan.S | 2 +- libc/intrin/subvdi3.S | 2 +- libc/intrin/subvsi3.S | 2 +- libc/intrin/subvti3.S | 2 +- libc/log/attachdebugger.c | 2 +- libc/log/backtrace2.c | 2 +- libc/log/backtrace3.c | 2 +- libc/log/check.h | 2 +- libc/log/checkfail.c | 3 +- libc/log/commandvenv.c | 2 +- libc/log/gdbexec.c | 2 +- libc/log/getttysize.c | 2 +- libc/log/isterminalinarticulate.c | 2 +- libc/log/log.h | 6 ++-- libc/log/logfile.initabi.c | 4 +-- libc/log/loglevel.S | 12 ++++---- libc/log/oncrash.c | 2 +- libc/log/oncrashthunks.S | 2 +- libc/log/onkill.c | 2 +- libc/log/showcrashreports.c | 2 +- libc/log/somanyubsan.S | 2 +- libc/log/thunks/__check_fail_eq.S | 2 +- libc/log/thunks/__check_fail_ge.S | 2 +- libc/log/thunks/__check_fail_gt.S | 2 +- libc/log/thunks/__check_fail_le.S | 2 +- libc/log/thunks/__check_fail_lt.S | 2 +- libc/log/thunks/__check_fail_ndebug.S | 2 +- libc/log/thunks/__check_fail_ne.S | 2 +- libc/log/vflogf.c | 2 +- libc/{macros.h => macros.internal.h} | 0 libc/mem/calloc.S | 2 +- libc/mem/cxx/free.S | 2 +- libc/mem/cxx/malloc.S | 2 +- libc/mem/cxx/memalign.S | 2 +- libc/mem/free.S | 2 +- libc/mem/hook/calloc.S | 2 +- libc/mem/hook/free.S | 2 +- libc/mem/hook/malloc.S | 2 +- libc/mem/hook/malloc_trim.S | 2 +- libc/mem/hook/malloc_usable_size.S | 2 +- libc/mem/hook/memalign.S | 2 +- libc/mem/hook/posix_memalign.S | 2 +- libc/mem/hook/pvalloc.S | 2 +- libc/mem/hook/realloc.S | 2 +- libc/mem/hook/realloc_in_place.S | 2 +- libc/mem/hook/valloc.S | 2 +- libc/mem/malloc.S | 2 +- libc/mem/malloc_trim.S | 2 +- libc/mem/malloc_usable_size.S | 2 +- libc/mem/memalign.S | 2 +- libc/mem/posix_memalign.S | 2 +- libc/mem/pvalloc.S | 2 +- libc/mem/realloc.S | 2 +- libc/mem/realloc_in_place.S | 2 +- libc/mem/valloc.S | 2 +- libc/nexgen32e/bsrmax.S | 2 +- libc/nexgen32e/bzero.S | 2 +- libc/nexgen32e/cescapec.S | 2 +- libc/nexgen32e/cmpsb.S | 2 +- libc/nexgen32e/cmpsl.S | 2 +- libc/nexgen32e/cmpsq.S | 2 +- libc/nexgen32e/cmpsw.S | 2 +- libc/nexgen32e/cmpub.S | 2 +- libc/nexgen32e/cmpul.S | 2 +- libc/nexgen32e/cmpuq.S | 2 +- libc/nexgen32e/cmpuw.S | 2 +- libc/nexgen32e/crc32-pclmul.S | 2 +- libc/nexgen32e/crc32init.S | 2 +- libc/nexgen32e/div1000000000int64.S | 2 +- libc/nexgen32e/div1000000int64.S | 2 +- libc/nexgen32e/div10000int64.S | 2 +- libc/nexgen32e/div1000int64.S | 2 +- libc/nexgen32e/div100int64.S | 2 +- libc/nexgen32e/div10int64.S | 2 +- libc/nexgen32e/djbsort-avx2.S | 2 +- libc/nexgen32e/environ.S | 2 +- libc/nexgen32e/errno.S | 2 +- libc/nexgen32e/errnolocation.S | 2 +- libc/nexgen32e/explicit_bzero.S | 2 +- libc/nexgen32e/fentry.S | 2 +- libc/nexgen32e/ffs.S | 2 +- libc/nexgen32e/ffsl.S | 2 +- libc/nexgen32e/g_argv.S | 2 +- libc/nexgen32e/g_auxv.S | 2 +- libc/nexgen32e/gc.S | 2 +- libc/nexgen32e/gclongjmp.S | 2 +- libc/nexgen32e/identity.S | 2 +- libc/nexgen32e/imapxlatab.S | 2 +- libc/nexgen32e/kbase36.S | 2 +- libc/nexgen32e/kcp437.S | 2 +- libc/nexgen32e/kcpuids.S | 4 +-- libc/nexgen32e/kcrc32ctab.S | 2 +- libc/nexgen32e/khalfcache3.S | 2 +- libc/nexgen32e/kreversebits.S | 2 +- libc/nexgen32e/ksha256tab.S | 2 +- libc/nexgen32e/ksigsetempty.S | 2 +- libc/nexgen32e/ksigsetfull.S | 2 +- libc/nexgen32e/kstarttsc.S | 2 +- libc/nexgen32e/ktolower.S | 2 +- libc/nexgen32e/llog10.S | 2 +- libc/nexgen32e/loadxmm.S | 2 +- libc/nexgen32e/lolendian.S | 2 +- libc/nexgen32e/longjmp.S | 2 +- libc/nexgen32e/lzcnt.S | 2 +- libc/nexgen32e/lzcntl.S | 2 +- libc/nexgen32e/macros.internal.inc | 2 +- libc/nexgen32e/mcount.S | 2 +- libc/nexgen32e/memcpy.S | 2 +- libc/nexgen32e/memeqmask.S | 2 +- libc/nexgen32e/memjmpinit.S | 2 +- libc/nexgen32e/memmove.S | 2 +- libc/nexgen32e/mempcpy.S | 2 +- libc/nexgen32e/memrchr.S | 2 +- libc/nexgen32e/memrchr16.S | 2 +- libc/nexgen32e/memrchr32.S | 2 +- libc/nexgen32e/memset.S | 2 +- libc/nexgen32e/missingno.S | 2 +- libc/nexgen32e/nt2sysv.S | 2 +- libc/nexgen32e/program_invocation_name.S | 2 +- libc/nexgen32e/rem1000000000int64.S | 2 +- libc/nexgen32e/rem1000000int64.S | 2 +- libc/nexgen32e/rem10000int64.S | 2 +- libc/nexgen32e/rem1000int64.S | 2 +- libc/nexgen32e/rem100int64.S | 2 +- libc/nexgen32e/rem10int64.S | 2 +- libc/nexgen32e/rldecode.S | 2 +- libc/nexgen32e/savexmm.S | 2 +- libc/nexgen32e/setjmp.S | 2 +- libc/nexgen32e/slowcall.S | 2 +- libc/nexgen32e/strcpyzbw.S | 2 +- libc/nexgen32e/strcspn.S | 2 +- libc/nexgen32e/strlen.S | 2 +- libc/nexgen32e/strsak.S | 2 +- libc/nexgen32e/strsak16.S | 2 +- libc/nexgen32e/strsak32.S | 2 +- libc/nexgen32e/strstr-sse42.S | 2 +- libc/nexgen32e/strstr16-sse42.S | 2 +- libc/nexgen32e/tinydivsi.greg.S | 2 +- libc/nexgen32e/tinystrlen.greg.S | 2 +- libc/nexgen32e/tinystrlen16.greg.S | 2 +- libc/nexgen32e/tinystrncmp.ncabi.S | 2 +- libc/nexgen32e/tinystrnlen.greg.S | 2 +- libc/nexgen32e/tinystrnlen16.greg.S | 2 +- libc/nexgen32e/tinywcslen.greg.S | 2 +- libc/nexgen32e/tinywcsnlen.greg.S | 2 +- libc/nexgen32e/tzcnt.S | 2 +- libc/nexgen32e/tzcntl.S | 2 +- libc/nexgen32e/zip.S | 2 +- libc/nt/nt.mk | 2 +- libc/nt/ntdllimport.S | 2 +- libc/nt/ntdllimport.h | 2 +- libc/rand/g_rando.S | 2 +- libc/rand/getrandom.c | 2 +- libc/rand/strfry.c | 2 +- libc/runtime/abort.S | 2 +- libc/runtime/assertfail.c | 2 +- libc/runtime/brk.c | 2 +- libc/runtime/construct.S | 2 +- libc/runtime/cosmo.S | 2 +- libc/runtime/cxaatexit.c | 2 +- libc/runtime/directmap-metal.c | 2 +- libc/runtime/directmap-nt.c | 2 +- libc/runtime/dsohandle.S | 2 +- libc/runtime/efimain.greg.c | 2 +- libc/runtime/ezmap.c | 2 +- libc/runtime/findcombinary.c | 2 +- libc/runtime/finddebugbinary.c | 4 +-- libc/runtime/fork-nt.c | 2 +- libc/runtime/fpreset.S | 2 +- libc/runtime/ftrace-hook.S | 2 +- libc/runtime/ftrace.c | 4 +-- libc/runtime/g_argc.S | 2 +- libc/runtime/getdosargv.c | 2 +- libc/runtime/getpagesize.S | 2 +- libc/runtime/grow.c | 2 +- libc/runtime/init.S | 2 +- libc/runtime/interruptiblecall.c | 2 +- libc/runtime/isheap.c | 2 +- libc/runtime/jmpstack.S | 2 +- libc/runtime/memtrack.c | 2 +- libc/runtime/memtrack.h | 2 +- libc/runtime/mman.greg.c | 2 +- libc/runtime/mmap.c | 2 +- libc/runtime/msync-nt.c | 2 +- libc/runtime/msync.c | 2 +- libc/runtime/munmap.c | 2 +- libc/runtime/peekall.S | 2 +- libc/runtime/progname.S | 2 +- libc/runtime/program_invocation_short_name.S | 2 +- libc/runtime/runtime.h | 1 - libc/runtime/setstack.S | 2 +- libc/runtime/untrackmemoryintervals.c | 2 +- libc/runtime/valist.c | 2 +- libc/runtime/vfork.S | 2 +- libc/runtime/weakfree.S | 2 +- libc/runtime/winmain.greg.c | 2 +- libc/sock/epoll.c | 2 +- libc/sock/iovec2nt.c | 2 +- libc/sock/poll-nt.c | 2 +- libc/sock/select-nt.c | 2 +- libc/sock/sendfile.c | 2 +- libc/stdio/dirstream.c | 2 +- libc/stdio/fclose.c | 2 +- libc/stdio/fdopen.c | 2 +- libc/stdio/fflush.c | 14 ++++----- libc/stdio/fflush.internal.h | 2 +- libc/stdio/{g_fflush.c => flushers.c} | 2 +- libc/stdio/flushlbf.c | 6 ++-- libc/stdio/fputs.c | 2 +- libc/stdio/fseeko.S | 2 +- libc/stdio/ftello.S | 2 +- libc/stdio/g_stdio.c | 21 ------------- libc/stdio/get_current_dir_name.c | 2 +- libc/stdio/getc.S | 2 +- libc/stdio/getchar.S | 2 +- libc/stdio/getdelim.c | 2 +- libc/stdio/getwc.S | 2 +- libc/stdio/getwchar.S | 2 +- libc/stdio/internal.h | 5 ++-- libc/stdio/putc.S | 2 +- libc/stdio/putwc.S | 2 +- libc/stdio/{g_stdbuf.c => stdbuf.c} | 0 libc/stdio/{g_stderr_init.S => stderr-init.S} | 10 +++---- libc/stdio/{g_stderr.c => stderr.c} | 12 ++++---- libc/stdio/{g_stdin_init.S => stdin-init.S} | 10 +++---- libc/stdio/{g_stdin.c => stdin.c} | 12 ++++---- libc/stdio/{g_stdout_init.S => stdout-init.S} | 10 +++---- libc/stdio/{g_stdout.c => stdout.c} | 12 ++++---- libc/stdio/unlocked/clearerr_unlocked.S | 2 +- libc/stdio/unlocked/feof_unlocked.S | 2 +- libc/stdio/unlocked/ferror_unlocked.S | 2 +- libc/stdio/unlocked/fflush_unlocked.S | 2 +- libc/stdio/unlocked/fgetc_unlocked.S | 2 +- libc/stdio/unlocked/fgets_unlocked.S | 2 +- libc/stdio/unlocked/fgetwc_unlocked.S | 2 +- libc/stdio/unlocked/fgetws_unlocked.S | 2 +- libc/stdio/unlocked/fileno_unlocked.S | 2 +- libc/stdio/unlocked/fputc_unlocked.S | 2 +- libc/stdio/unlocked/fputs_unlocked.S | 2 +- libc/stdio/unlocked/fputwc_unlocked.S | 2 +- libc/stdio/unlocked/fputws_unlocked.S | 2 +- libc/stdio/unlocked/fread_unlocked.S | 2 +- libc/stdio/unlocked/fwrite_unlocked.S | 2 +- libc/stdio/unlocked/getc_unlocked.S | 2 +- libc/stdio/unlocked/getchar_unlocked.S | 2 +- libc/stdio/unlocked/getwc_unlocked.S | 2 +- libc/stdio/unlocked/getwchar_unlocked.S | 2 +- libc/stdio/unlocked/putc_unlocked.S | 2 +- libc/stdio/unlocked/putchar_unlocked.S | 2 +- libc/stdio/unlocked/putwc_unlocked.S | 2 +- libc/stdio/unlocked/putwchar_unlocked.S | 2 +- libc/str/crc32.S | 2 +- libc/str/crc32c.S | 2 +- libc/str/crc32z.c | 2 +- libc/str/iswctype.c | 2 +- libc/str/kx86processormodels.c | 2 +- libc/str/mbtowc.c | 2 +- libc/str/rindex.S | 2 +- libc/str/strcmp8to16i.internal.h | 2 +- libc/str/strlcat.c | 2 +- libc/str/strlcpy.c | 4 +-- libc/str/strsignal.c | 2 +- libc/str/tpenc.S | 2 +- libc/str/undeflate.c | 2 +- libc/stubs/abort.S | 2 +- libc/stubs/assertfail.S | 2 +- libc/stubs/cxapurevirtual.S | 2 +- libc/stubs/debugbreak.S | 2 +- libc/stubs/gcov.S | 2 +- libc/stubs/instrumentation.S | 2 +- libc/stubs/panic.S | 7 +++-- libc/stubs/retpoline.S | 2 +- libc/stubs/stackchkguard.S | 2 +- libc/stubs/typeinfo.S | 2 +- libc/stubs/xnu.S | 2 +- libc/sysv/consts/syscon.internal.h | 2 +- libc/sysv/errfuns/e2big.S | 2 +- libc/sysv/errfuns/eacces.S | 2 +- libc/sysv/errfuns/eaddrinuse.S | 2 +- libc/sysv/errfuns/eaddrnotavail.S | 2 +- libc/sysv/errfuns/eadv.S | 2 +- libc/sysv/errfuns/eafnosupport.S | 2 +- libc/sysv/errfuns/eagain.S | 2 +- libc/sysv/errfuns/ealready.S | 2 +- libc/sysv/errfuns/ebade.S | 2 +- libc/sysv/errfuns/ebadf.S | 2 +- libc/sysv/errfuns/ebadfd.S | 2 +- libc/sysv/errfuns/ebadmsg.S | 2 +- libc/sysv/errfuns/ebadr.S | 2 +- libc/sysv/errfuns/ebadrqc.S | 2 +- libc/sysv/errfuns/ebadslt.S | 2 +- libc/sysv/errfuns/ebusy.S | 2 +- libc/sysv/errfuns/ecanceled.S | 2 +- libc/sysv/errfuns/echild.S | 2 +- libc/sysv/errfuns/echrng.S | 2 +- libc/sysv/errfuns/ecomm.S | 2 +- libc/sysv/errfuns/econnaborted.S | 2 +- libc/sysv/errfuns/econnrefused.S | 2 +- libc/sysv/errfuns/econnreset.S | 2 +- libc/sysv/errfuns/edeadlk.S | 2 +- libc/sysv/errfuns/edestaddrreq.S | 2 +- libc/sysv/errfuns/edom.S | 2 +- libc/sysv/errfuns/edotdot.S | 2 +- libc/sysv/errfuns/edquot.S | 2 +- libc/sysv/errfuns/eexist.S | 2 +- libc/sysv/errfuns/efault.S | 2 +- libc/sysv/errfuns/efbig.S | 2 +- libc/sysv/errfuns/ehostdown.S | 2 +- libc/sysv/errfuns/ehostunreach.S | 2 +- libc/sysv/errfuns/ehwpoison.S | 2 +- libc/sysv/errfuns/eidrm.S | 2 +- libc/sysv/errfuns/eilseq.S | 2 +- libc/sysv/errfuns/einprogress.S | 2 +- libc/sysv/errfuns/eintr.S | 2 +- libc/sysv/errfuns/einval.S | 2 +- libc/sysv/errfuns/eio.S | 2 +- libc/sysv/errfuns/eisconn.S | 2 +- libc/sysv/errfuns/eisdir.S | 2 +- libc/sysv/errfuns/eisnam.S | 2 +- libc/sysv/errfuns/ekeyexpired.S | 2 +- libc/sysv/errfuns/ekeyrejected.S | 2 +- libc/sysv/errfuns/ekeyrevoked.S | 2 +- libc/sysv/errfuns/el2hlt.S | 2 +- libc/sysv/errfuns/el2nsync.S | 2 +- libc/sysv/errfuns/el3hlt.S | 2 +- libc/sysv/errfuns/el3rst.S | 2 +- libc/sysv/errfuns/elibacc.S | 2 +- libc/sysv/errfuns/elibbad.S | 2 +- libc/sysv/errfuns/elibexec.S | 2 +- libc/sysv/errfuns/elibmax.S | 2 +- libc/sysv/errfuns/elibscn.S | 2 +- libc/sysv/errfuns/elnrng.S | 2 +- libc/sysv/errfuns/eloop.S | 2 +- libc/sysv/errfuns/emediumtype.S | 2 +- libc/sysv/errfuns/emfile.S | 2 +- libc/sysv/errfuns/emlink.S | 2 +- libc/sysv/errfuns/emsgsize.S | 2 +- libc/sysv/errfuns/emultihop.S | 2 +- libc/sysv/errfuns/enametoolong.S | 2 +- libc/sysv/errfuns/enavail.S | 2 +- libc/sysv/errfuns/enetdown.S | 2 +- libc/sysv/errfuns/enetreset.S | 2 +- libc/sysv/errfuns/enetunreach.S | 2 +- libc/sysv/errfuns/enfile.S | 2 +- libc/sysv/errfuns/enoano.S | 2 +- libc/sysv/errfuns/enobufs.S | 2 +- libc/sysv/errfuns/enocsi.S | 2 +- libc/sysv/errfuns/enodata.S | 2 +- libc/sysv/errfuns/enodev.S | 2 +- libc/sysv/errfuns/enoent.S | 2 +- libc/sysv/errfuns/enoexec.S | 2 +- libc/sysv/errfuns/enokey.S | 2 +- libc/sysv/errfuns/enolck.S | 2 +- libc/sysv/errfuns/enolink.S | 2 +- libc/sysv/errfuns/enomedium.S | 2 +- libc/sysv/errfuns/enomem.S | 2 +- libc/sysv/errfuns/enomsg.S | 2 +- libc/sysv/errfuns/enonet.S | 2 +- libc/sysv/errfuns/enopkg.S | 2 +- libc/sysv/errfuns/enoprotoopt.S | 2 +- libc/sysv/errfuns/enospc.S | 2 +- libc/sysv/errfuns/enosr.S | 2 +- libc/sysv/errfuns/enostr.S | 2 +- libc/sysv/errfuns/enosys.S | 2 +- libc/sysv/errfuns/enotblk.S | 2 +- libc/sysv/errfuns/enotconn.S | 2 +- libc/sysv/errfuns/enotdir.S | 2 +- libc/sysv/errfuns/enotempty.S | 2 +- libc/sysv/errfuns/enotnam.S | 2 +- libc/sysv/errfuns/enotrecoverable.S | 2 +- libc/sysv/errfuns/enotsock.S | 2 +- libc/sysv/errfuns/enotsup.S | 2 +- libc/sysv/errfuns/enotty.S | 2 +- libc/sysv/errfuns/enotuniq.S | 2 +- libc/sysv/errfuns/enxio.S | 2 +- libc/sysv/errfuns/eopnotsupp.S | 2 +- libc/sysv/errfuns/eoverflow.S | 2 +- libc/sysv/errfuns/eownerdead.S | 2 +- libc/sysv/errfuns/eperm.S | 2 +- libc/sysv/errfuns/epfnosupport.S | 2 +- libc/sysv/errfuns/epipe.S | 2 +- libc/sysv/errfuns/eproto.S | 2 +- libc/sysv/errfuns/eprotonosupport.S | 2 +- libc/sysv/errfuns/eprototype.S | 2 +- libc/sysv/errfuns/erange.S | 2 +- libc/sysv/errfuns/eremchg.S | 2 +- libc/sysv/errfuns/eremote.S | 2 +- libc/sysv/errfuns/eremoteio.S | 2 +- libc/sysv/errfuns/erestart.S | 2 +- libc/sysv/errfuns/erfkill.S | 2 +- libc/sysv/errfuns/erofs.S | 2 +- libc/sysv/errfuns/eshutdown.S | 2 +- libc/sysv/errfuns/esocktnosupport.S | 2 +- libc/sysv/errfuns/espipe.S | 2 +- libc/sysv/errfuns/esrch.S | 2 +- libc/sysv/errfuns/esrmnt.S | 2 +- libc/sysv/errfuns/estale.S | 2 +- libc/sysv/errfuns/estrpipe.S | 2 +- libc/sysv/errfuns/etime.S | 2 +- libc/sysv/errfuns/etimedout.S | 2 +- libc/sysv/errfuns/etoomanyrefs.S | 2 +- libc/sysv/errfuns/etxtbsy.S | 2 +- libc/sysv/errfuns/euclean.S | 2 +- libc/sysv/errfuns/eunatch.S | 2 +- libc/sysv/errfuns/eusers.S | 2 +- libc/sysv/errfuns/exdev.S | 2 +- libc/sysv/errfuns/exfull.S | 2 +- libc/sysv/g_syscount.S | 2 +- libc/sysv/gen.sh | 2 +- libc/sysv/restorert.S | 2 +- libc/sysv/syscall.S | 2 +- libc/sysv/systemfive.S | 2 +- libc/sysv/sysv.mk | 2 +- libc/testlib/bench.S | 2 +- libc/testlib/benchrunner.c | 2 +- libc/testlib/combo.S | 2 +- libc/testlib/comborunner.c | 2 +- libc/testlib/ezbench.h | 2 +- libc/testlib/fixture.S | 2 +- libc/testlib/formatint.c | 2 +- libc/testlib/formatstr.c | 2 +- libc/testlib/hyperion.S | 2 +- libc/testlib/showerror_.c | 2 +- libc/testlib/testcase.S | 2 +- libc/testlib/testmain.c | 6 ++-- libc/testlib/testrunner.c | 2 +- libc/testlib/thrashcodecache.S | 2 +- libc/testlib/thunks/assert_eq.S | 2 +- libc/testlib/thunks/assert_false.S | 2 +- libc/testlib/thunks/assert_ne.S | 2 +- libc/testlib/thunks/assert_true.S | 2 +- libc/testlib/thunks/expect_eq.S | 2 +- libc/testlib/thunks/expect_false.S | 2 +- libc/testlib/thunks/expect_ne.S | 2 +- libc/testlib/thunks/expect_true.S | 2 +- libc/testlib/thunks/free.S | 2 +- libc/testlib/thunks/jump.S | 2 +- libc/testlib/ugly.h | 2 +- libc/time/alarm.c | 2 +- libc/time/kmonthname.S | 2 +- libc/time/kmonthnameshort.S | 2 +- libc/time/kweekdayname.S | 2 +- libc/time/kweekdaynameshort.S | 2 +- libc/time/localtime.c | 2 +- libc/time/strftime.c | 2 +- libc/time/strptime.c | 2 +- libc/tinymath/acos.S | 2 +- libc/tinymath/acosf.S | 2 +- libc/tinymath/acosl.S | 2 +- libc/tinymath/asin.S | 2 +- libc/tinymath/asinf.S | 2 +- libc/tinymath/asinl.S | 2 +- libc/tinymath/atan.S | 2 +- libc/tinymath/atan2.S | 2 +- libc/tinymath/atan2f.S | 2 +- libc/tinymath/atan2l.S | 2 +- libc/tinymath/atanf.S | 2 +- libc/tinymath/atanl.S | 2 +- libc/tinymath/c2rangr.S | 2 +- libc/tinymath/cabs.S | 2 +- libc/tinymath/cabsf.S | 2 +- libc/tinymath/cabsl.S | 2 +- libc/tinymath/carg.S | 2 +- libc/tinymath/cargf.S | 2 +- libc/tinymath/cargl.S | 2 +- libc/tinymath/cbrt.S | 2 +- libc/tinymath/cbrtf.S | 2 +- libc/tinymath/cbrtl.S | 2 +- libc/tinymath/ceil.S | 2 +- libc/tinymath/ceilf.S | 2 +- libc/tinymath/ceill.S | 2 +- libc/tinymath/cimag.S | 2 +- libc/tinymath/cimagf.S | 2 +- libc/tinymath/cimagl.S | 2 +- libc/tinymath/conj.S | 2 +- libc/tinymath/conjf.S | 2 +- libc/tinymath/conjl.S | 2 +- libc/tinymath/copysign.S | 2 +- libc/tinymath/copysignf.S | 2 +- libc/tinymath/copysignl.S | 2 +- libc/tinymath/cos.S | 2 +- libc/tinymath/cosf.S | 2 +- libc/tinymath/cosl.S | 2 +- libc/tinymath/cprojf.S | 2 +- libc/tinymath/cprojl.S | 2 +- libc/tinymath/creal.S | 2 +- libc/tinymath/crealf.S | 2 +- libc/tinymath/creall.S | 2 +- libc/tinymath/d2ld2.S | 2 +- libc/tinymath/exp.S | 2 +- libc/tinymath/exp10.S | 2 +- libc/tinymath/exp10f.S | 2 +- libc/tinymath/exp10l.S | 2 +- libc/tinymath/exp2.S | 2 +- libc/tinymath/exp2f.S | 2 +- libc/tinymath/exp2l.S | 2 +- libc/tinymath/expf.S | 2 +- libc/tinymath/expl.S | 2 +- libc/tinymath/expm1.S | 2 +- libc/tinymath/expm1f.S | 2 +- libc/tinymath/expm1l.S | 2 +- libc/tinymath/f2ld2.S | 2 +- libc/tinymath/fabs.S | 2 +- libc/tinymath/fabsf.S | 2 +- libc/tinymath/fabsl.S | 2 +- libc/tinymath/floor.S | 2 +- libc/tinymath/floorf.S | 2 +- libc/tinymath/floorl.S | 2 +- libc/tinymath/fmod.S | 2 +- libc/tinymath/fmodf.S | 2 +- libc/tinymath/fmodl.S | 2 +- libc/tinymath/frexp.S | 2 +- libc/tinymath/ilogb.S | 2 +- libc/tinymath/ilogbf.S | 2 +- libc/tinymath/ilogbl.S | 2 +- libc/tinymath/ldexp.S | 2 +- libc/tinymath/ldexpf.S | 2 +- libc/tinymath/ldexpl.S | 2 +- libc/tinymath/log.S | 2 +- libc/tinymath/log10.S | 2 +- libc/tinymath/log10f.S | 2 +- libc/tinymath/log10l.S | 2 +- libc/tinymath/log1p.S | 2 +- libc/tinymath/log1pf.S | 2 +- libc/tinymath/log1pl.S | 2 +- libc/tinymath/log2.S | 2 +- libc/tinymath/log2f.S | 2 +- libc/tinymath/log2l.S | 2 +- libc/tinymath/logb.S | 2 +- libc/tinymath/logbf.S | 2 +- libc/tinymath/logbl.S | 2 +- libc/tinymath/logf.S | 2 +- libc/tinymath/logl.S | 2 +- libc/tinymath/lrint.S | 2 +- libc/tinymath/lrintf.S | 2 +- libc/tinymath/lrintl.S | 2 +- libc/tinymath/lround.S | 2 +- libc/tinymath/lroundf.S | 2 +- libc/tinymath/lroundl.S | 2 +- libc/tinymath/nearbyint.S | 2 +- libc/tinymath/nearbyintf.S | 2 +- libc/tinymath/nearbyintl.S | 2 +- libc/tinymath/pow.S | 2 +- libc/tinymath/powf.S | 2 +- libc/tinymath/powi.S | 2 +- libc/tinymath/powif.S | 2 +- libc/tinymath/powil.S | 2 +- libc/tinymath/powl.S | 2 +- libc/tinymath/remainder.S | 2 +- libc/tinymath/remainderf.S | 2 +- libc/tinymath/remainderl.S | 2 +- libc/tinymath/rint.S | 2 +- libc/tinymath/rintf.S | 2 +- libc/tinymath/rintl.S | 2 +- libc/tinymath/round.S | 2 +- libc/tinymath/roundf.S | 2 +- libc/tinymath/roundl.S | 2 +- libc/tinymath/scalb.S | 2 +- libc/tinymath/scalbf.S | 2 +- libc/tinymath/scalbl.S | 2 +- libc/tinymath/signbit.S | 2 +- libc/tinymath/signbitf.S | 2 +- libc/tinymath/signbitl.S | 2 +- libc/tinymath/significand.S | 2 +- libc/tinymath/significandf.S | 2 +- libc/tinymath/significandl.S | 2 +- libc/tinymath/sin.S | 2 +- libc/tinymath/sincos.S | 2 +- libc/tinymath/sincosf.S | 2 +- libc/tinymath/sincosl.S | 2 +- libc/tinymath/sinf.S | 2 +- libc/tinymath/sinl.S | 2 +- libc/tinymath/sqrt.S | 2 +- libc/tinymath/sqrtf.S | 2 +- libc/tinymath/sqrtl.S | 2 +- libc/tinymath/tan.S | 2 +- libc/tinymath/tanf.S | 2 +- libc/tinymath/tanl.S | 2 +- libc/tinymath/trunc.S | 2 +- libc/tinymath/truncf.S | 2 +- libc/tinymath/truncl.S | 2 +- libc/unicode/kcombiningchars.S | 2 +- libc/unicode/setlocale.c | 2 +- libc/unicode/strnwidth.c | 2 +- libc/unicode/strnwidth16.c | 2 +- libc/unicode/strwidth16.c | 2 +- libc/x/filecmp.c | 2 +- libc/x/replaceuser.c | 2 +- libc/x/xjoinpaths.c | 2 +- libc/zip.h | 2 +- libc/zipos/get.c | 2 +- libc/zipos/open.c | 2 +- libc/zipos/read.c | 2 +- libc/zipos/stat-impl.c | 2 +- libc/zipos/zipos.S | 2 +- net/http/negotiatehttprequest.c | 2 +- net/http/uricspn-avx.S | 2 +- net/http/urislice2cstr.c | 2 +- test/dsp/core/float2short_test.c | 2 +- test/dsp/core/getintegercoefficients_test.c | 2 +- test/dsp/core/scalevolume_test.c | 2 +- test/dsp/scale/scale_test.c | 2 +- test/dsp/tty/windex_test.c | 2 +- test/libc/alg/bisectcarleft_test.c | 2 +- test/libc/alg/djbsort_test.c | 2 +- test/libc/alg/qsort_test.c | 2 +- test/libc/alg/reverse_test.c | 4 +-- test/libc/alg/tarjan_test.c | 6 ++-- test/libc/bits/integralarithmetic_test.c | 2 +- test/libc/bits/rounddown2pow_test.c | 2 +- test/libc/bits/roundup2pow_test.c | 2 +- test/libc/bits/unsignedsubtract_test.c | 30 ------------------- test/libc/calls/commandv_test.c | 2 +- test/libc/calls/fcntl_test.c | 2 +- test/libc/calls/fork_test.c | 2 +- test/libc/calls/getcwd_test.c | 2 +- test/libc/fmt/palandprintf_test.c | 2 +- test/libc/fmt/sprintf_s_test.c | 2 +- test/libc/intrin/pmulhrsw_test.c | 2 +- test/libc/mem/malloc_test.c | 4 +-- test/libc/nexgen32e/crc32_test.c | 2 +- test/libc/nexgen32e/lz4decode_test.c | 2 +- test/libc/nexgen32e/memmove_test.c | 2 +- test/libc/runtime/carsort_test.c | 2 +- test/libc/runtime/grow_test.c | 2 +- test/libc/runtime/mmap_test.c | 2 +- test/libc/sock/inet_pton_test.c | 2 +- test/libc/sock/poll_test.c | 2 +- test/libc/str/sigset_test.c | 2 +- test/libc/str/strcmp_test.c | 2 +- test/libc/str/strlen_test.c | 2 +- test/libc/str/undeflate_test.c | 3 +- test/libc/time/clock_gettime_test.c | 2 +- test/libc/xed/x86ild_lib.c | 2 +- test/net/http/uriparse_test.c | 2 +- test/tool/build/lib/asmdown_test.c | 6 ++-- test/tool/build/lib/bitscan_test.c | 2 +- test/tool/build/lib/bsu_test.c | 2 +- test/tool/build/lib/optest.c | 2 +- test/tool/viz/lib/fun_test.c | 2 +- test/tool/viz/lib/ycbcr2rgb2_test.c | 2 +- third_party/chibicc/as.c | 2 +- third_party/chibicc/chibicc.h | 2 +- third_party/chibicc/test/vla_test.c | 2 +- third_party/compiler_rt/comprt.S | 2 +- third_party/dlmalloc/dlmalloc.c | 4 +-- third_party/dlmalloc/initdlmalloc.S | 2 +- third_party/duktape/dukhexdectab.S | 2 +- third_party/getopt/initgetopt.S | 2 +- third_party/regex/regerror.c | 2 +- third_party/stb/idct-sse.S | 2 +- third_party/stb/stb_image.c | 2 +- third_party/stb/stb_image_resize.c | 2 +- third_party/stb/stb_image_write.c | 2 +- third_party/stb/ycbcr-sse2.S | 2 +- third_party/stb/ycbcr.c | 2 +- third_party/xed/x86ild.greg.c | 2 +- third_party/xed/x86tab.S | 2 +- third_party/zlib/adler32.c | 2 +- .../{chunkcopy.h => chunkcopy.internal.h} | 2 +- third_party/zlib/crc32.c | 4 +-- third_party/zlib/crc32concat.c | 4 +-- third_party/zlib/crcfold.c | 2 +- third_party/zlib/deflate.c | 6 ++-- .../zlib/{deflate.h => deflate.internal.h} | 18 +++++------ third_party/zlib/deflateinit.S | 2 +- third_party/zlib/deflatesse.c | 4 +-- third_party/zlib/infback.c | 8 ++--- third_party/zlib/inffast.c | 8 ++--- .../zlib/{inffast.h => inffast.internal.h} | 2 +- third_party/zlib/inffastchunk.c | 10 +++---- third_party/zlib/inffixed.c | 6 ++-- third_party/zlib/inflate.c | 10 +++---- .../zlib/{inflate.h => inflate.internal.h} | 2 +- third_party/zlib/inflateinit.S | 4 +-- third_party/zlib/inftrees.c | 4 +-- .../zlib/{inftrees.h => inftrees.internal.h} | 0 third_party/zlib/internal.h | 2 +- third_party/zlib/kdistcode.S | 4 +-- third_party/zlib/klengthcode.S | 4 +-- third_party/zlib/kstaticdtree.c | 2 +- third_party/zlib/kstaticltree.c | 2 +- third_party/zlib/treeconst.c | 4 +-- third_party/zlib/trees.c | 6 ++-- third_party/zlib/zalloc.c | 2 +- third_party/zlib/zutil.c | 10 +++++-- .../zlib/{zutil.h => zutil.internal.h} | 4 +-- tool/build/ar.c | 4 +-- tool/build/blinkenlights.c | 10 +++---- tool/build/calculator.c | 2 +- tool/build/compile.c | 2 +- tool/build/dis.c | 2 +- tool/build/emucrt/emucrt.S | 2 +- tool/build/helpop.c | 4 +-- tool/build/lib/buffer.c | 2 +- tool/build/lib/cga.c | 2 +- tool/build/lib/cvt.c | 2 +- tool/build/lib/demangle.c | 4 +-- tool/build/lib/dis.c | 4 +-- tool/build/lib/disarg.c | 2 +- tool/build/lib/diself.c | 2 +- tool/build/lib/elfwriter.c | 2 +- tool/build/lib/errnos.S | 2 +- tool/build/lib/instruction.c | 2 +- tool/build/lib/interner.c | 2 +- tool/build/lib/iovs.h | 2 +- tool/build/lib/loader.c | 2 +- tool/build/lib/machine.c | 2 +- tool/build/lib/mda.c | 2 +- tool/build/lib/memory.c | 2 +- tool/build/lib/message.c | 2 +- tool/build/lib/panel.c | 2 +- tool/build/lib/persist.c | 2 +- tool/build/lib/pml4tfmt.c | 2 +- tool/build/lib/pty.c | 4 +-- tool/build/lib/reset.c | 2 +- tool/build/lib/sse.c | 2 +- tool/build/lib/ssefloat.c | 2 +- tool/build/lib/stack.c | 2 +- tool/build/lib/string.c | 2 +- tool/build/lib/syscall.c | 2 +- tool/build/lz4toasm.c | 2 +- tool/build/mkdeps.c | 4 +-- tool/build/package.c | 6 ++-- tool/build/refactor.c | 2 +- tool/build/runit.c | 4 +-- tool/build/runitd.c | 6 ++-- tool/build/x86combos.c | 2 +- tool/build/zipobj.c | 4 +-- tool/decode/elf.c | 4 +-- tool/decode/lib/asmcodegen.c | 2 +- tool/decode/lib/bitabuilder.c | 2 +- tool/decode/lib/pollnames.S | 2 +- tool/decode/macho.c | 2 +- tool/decode/mkcombos.c | 2 +- tool/decode/mkwides.c | 2 +- tool/decode/pe2.c | 2 +- tool/decode/x86opinfo.c | 2 +- tool/decode/zip.c | 2 +- tool/hash/crctab.c | 2 +- tool/net/echoserver.c | 2 +- tool/net/redbean.c | 6 ++-- tool/viz/basicidea.c | 4 +-- tool/viz/deathstar.c | 4 +-- tool/viz/derasterize.c | 2 +- tool/viz/double2int.c | 2 +- tool/viz/fold.c | 2 +- tool/viz/generatematrix.c | 4 +-- tool/viz/int2float.c | 2 +- tool/viz/lib/bilinearscale.c | 2 +- tool/viz/lib/dither.c | 2 +- tool/viz/lib/doublechrominance.S | 2 +- tool/viz/lib/formatstringtable-assembly.c | 2 +- tool/viz/lib/formatstringtable-code.c | 2 +- tool/viz/lib/formatstringtable-testlib.h | 2 +- tool/viz/lib/formatstringtable.c | 2 +- tool/viz/lib/gaussian.c | 2 +- tool/viz/lib/getxtermcodes.c | 2 +- tool/viz/lib/perlin3.c | 2 +- tool/viz/lib/sharpen.c | 2 +- tool/viz/lib/sobel.c | 2 +- tool/viz/lib/stringbuilder.c | 2 +- tool/viz/lib/thunks/expect_matrixeq.S | 2 +- tool/viz/lib/unsharp.c | 2 +- tool/viz/lib/writetoframebuffer.c | 2 +- tool/viz/lib/ycbcr2rgb3.c | 2 +- tool/viz/life.c | 6 ++-- tool/viz/magikarp.c | 2 +- tool/viz/memzoom.c | 4 +-- tool/viz/printansi.c | 6 ++-- tool/viz/printimage.c | 6 ++-- tool/viz/printpeb.c | 2 +- tool/viz/printvideo.c | 16 +++++----- tool/viz/tabalign.c | 2 +- tool/viz/tailf.c | 4 +-- tool/viz/upscalefloat.c | 2 +- tool/viz/upscaleint.c | 2 +- tool/viz/xterm256effective.c | 2 +- tool/viz/xterm256effective2.c | 2 +- 954 files changed, 1095 insertions(+), 1342 deletions(-) rename libc/alg/{reverse.h => reverse.internal.h} (94%) rename libc/alg/{shuffle.h => shuffle.internal.h} (91%) delete mode 100644 libc/bits/emptytonull.c delete mode 100644 libc/bits/firstnonnull.c delete mode 100644 libc/bits/isempty.c delete mode 100644 libc/bits/nulltoempty.c delete mode 100644 libc/bits/rounddown.c delete mode 100644 libc/bits/roundup.c rename libc/bits/{safemacros.h => safemacros.internal.h} (83%) delete mode 100644 libc/bits/unsignedsubtract.c rename libc/bits/{xchg.h => xchg.internal.h} (100%) rename libc/{macros.h => macros.internal.h} (100%) rename libc/stdio/{g_fflush.c => flushers.c} (98%) delete mode 100644 libc/stdio/g_stdio.c rename libc/stdio/{g_stdbuf.c => stdbuf.c} (100%) rename libc/stdio/{g_stderr_init.S => stderr-init.S} (93%) rename libc/stdio/{g_stderr.c => stderr.c} (89%) rename libc/stdio/{g_stdin_init.S => stdin-init.S} (93%) rename libc/stdio/{g_stdin.c => stdin.c} (89%) rename libc/stdio/{g_stdout_init.S => stdout-init.S} (93%) rename libc/stdio/{g_stdout.c => stdout.c} (90%) delete mode 100644 test/libc/bits/unsignedsubtract_test.c rename third_party/zlib/{chunkcopy.h => chunkcopy.internal.h} (99%) rename third_party/zlib/{deflate.h => deflate.internal.h} (96%) rename third_party/zlib/{inffast.h => inffast.internal.h} (95%) rename third_party/zlib/{inflate.h => inflate.internal.h} (99%) rename third_party/zlib/{inftrees.h => inftrees.internal.h} (100%) rename third_party/zlib/{zutil.h => zutil.internal.h} (96%) diff --git a/.vscode/vscode.h b/.vscode/vscode.h index 535d7a935..df52f069d 100644 --- a/.vscode/vscode.h +++ b/.vscode/vscode.h @@ -79,7 +79,7 @@ #define SWITCHEROO(...) 0 -extern unsigned g_loglevel; +extern unsigned __log_level; typedef void * va_list; diff --git a/ape/ape.lds b/ape/ape.lds index e0d14658c..1d9cf917a 100644 --- a/ape/ape.lds +++ b/ape/ape.lds @@ -364,9 +364,10 @@ SECTIONS { PROVIDE_HIDDEN(edata = .); } :Ram - .zip : { + .zip . : { KEEP(*(SORT_BY_NAME(.zip.*))) . = ALIGN(PAGESIZE); + HIDDEN(_efile = .); } .bss . : { @@ -540,7 +541,7 @@ HIDDEN(v_ape_highsectors = ZIPCONST(v_zip_cdoffset, __zip_start - IMAGE_BASE_VIRTUAL); ZIPCONST(v_zip_cdirsize, __zip_end - __zip_start); ZIPCONST(v_zip_records, v_zip_cdirsize / kZipCdirHdrLinkableSize); -ZIPCONST(v_zip_commentsize, 0); +ZIPCONST(v_zip_commentsize, _efile - __zip_end - kZipCdirHdrMinSize); #if SupportsXnu() /* Generates deterministic ID. */ diff --git a/ape/macros.internal.h b/ape/macros.internal.h index 578f7a885..f620f8261 100644 --- a/ape/macros.internal.h +++ b/ape/macros.internal.h @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #ifndef APE_MACROS_H_ #define APE_MACROS_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #ifdef __ASSEMBLER__ /* clang-format off */ diff --git a/dsp/core/c161.h b/dsp/core/c161.h index b6ea60972..d42b890f8 100644 --- a/dsp/core/c161.h +++ b/dsp/core/c161.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_DSP_CORE_C161_H_ #define COSMOPOLITAN_DSP_CORE_C161_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) #define EXTRA_SHARP 2 diff --git a/dsp/core/c161s.h b/dsp/core/c161s.h index 201b4544c..bccdb80f9 100644 --- a/dsp/core/c161s.h +++ b/dsp/core/c161s.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_DSP_CORE_C161S_H_ #define COSMOPOLITAN_DSP_CORE_C161S_H_ #include "dsp/core/c161.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) forceinline pureconst artificial signed char C161S(signed char al, diff --git a/dsp/core/double2byte.c b/dsp/core/double2byte.c index 07a8e6d1b..364b14407 100644 --- a/dsp/core/double2byte.c +++ b/dsp/core/double2byte.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/core/core.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" diff --git a/dsp/core/float2short.c b/dsp/core/float2short.c index bb4e47854..7d879d3be 100644 --- a/dsp/core/float2short.c +++ b/dsp/core/float2short.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/str/str.h" diff --git a/dsp/core/getintegercoefficients.c b/dsp/core/getintegercoefficients.c index ddf22a8c9..ff3ee8705 100644 --- a/dsp/core/getintegercoefficients.c +++ b/dsp/core/getintegercoefficients.c @@ -20,7 +20,7 @@ #include "libc/assert.h" #include "libc/dce.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/str/str.h" diff --git a/dsp/core/getintegercoefficients8.c b/dsp/core/getintegercoefficients8.c index 6ef649771..ac6edbb62 100644 --- a/dsp/core/getintegercoefficients8.c +++ b/dsp/core/getintegercoefficients8.c @@ -19,7 +19,7 @@ #include "dsp/core/core.h" #include "dsp/core/q.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/str/str.h" diff --git a/dsp/core/half.h b/dsp/core/half.h index 9a8fe8d1b..98770219a 100644 --- a/dsp/core/half.h +++ b/dsp/core/half.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_DSP_CORE_HALF_H_ #define COSMOPOLITAN_DSP_CORE_HALF_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) /** diff --git a/dsp/core/ks8.h b/dsp/core/ks8.h index 111480c3b..eebe38112 100644 --- a/dsp/core/ks8.h +++ b/dsp/core/ks8.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_DSP_CORE_KS8_H_ #define COSMOPOLITAN_DSP_CORE_KS8_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) /** diff --git a/dsp/core/kss8.h b/dsp/core/kss8.h index 60f86ff9f..64a8f8844 100644 --- a/dsp/core/kss8.h +++ b/dsp/core/kss8.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_DSP_CORE_KSS8_H_ #define COSMOPOLITAN_DSP_CORE_KSS8_H_ #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) /** diff --git a/dsp/core/mulaw.S b/dsp/core/mulaw.S index db4a7266f..bff7e6b19 100644 --- a/dsp/core/mulaw.S +++ b/dsp/core/mulaw.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" #define BIAS 0x84 diff --git a/dsp/core/q.h b/dsp/core/q.h index 5d40c64c7..ebc881844 100644 --- a/dsp/core/q.h +++ b/dsp/core/q.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_DSP_CORE_Q_H_ #define COSMOPOLITAN_DSP_CORE_Q_H_ #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) diff --git a/dsp/core/sad16x8n.S b/dsp/core/sad16x8n.S index 89a081dc6..280ce3ccd 100644 --- a/dsp/core/sad16x8n.S +++ b/dsp/core/sad16x8n.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" .align 16 // Mixes audio. diff --git a/dsp/core/scalevolume.c b/dsp/core/scalevolume.c index 44481a900..65087ff43 100644 --- a/dsp/core/scalevolume.c +++ b/dsp/core/scalevolume.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/core/core.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/limits.h" /** diff --git a/dsp/mpeg/clamp4int256-core.S b/dsp/mpeg/clamp4int256-core.S index 36b333091..92e8fb6be 100644 --- a/dsp/mpeg/clamp4int256-core.S +++ b/dsp/mpeg/clamp4int256-core.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__ clamp4int256$core: diff --git a/dsp/mpeg/mpeg1.c b/dsp/mpeg/mpeg1.c index d0c8a30c1..4ddadb7be 100644 --- a/dsp/mpeg/mpeg1.c +++ b/dsp/mpeg/mpeg1.c @@ -35,7 +35,7 @@ #include "libc/bits/initializer.internal.h" #include "libc/fmt/conv.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/dsp/mpeg/slowrgb.c b/dsp/mpeg/slowrgb.c index 2bfbafd55..b765295aa 100644 --- a/dsp/mpeg/slowrgb.c +++ b/dsp/mpeg/slowrgb.c @@ -28,7 +28,7 @@ │ SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/mpeg/mpeg.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" asm(".ident\t\"\\n\\n\ PL_MPEG (MIT License)\\n\ diff --git a/dsp/scale/gyarados.c b/dsp/scale/gyarados.c index 12b446876..e642aca80 100644 --- a/dsp/scale/gyarados.c +++ b/dsp/scale/gyarados.c @@ -24,7 +24,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bsr.h" diff --git a/dsp/scale/magikarp.c b/dsp/scale/magikarp.c index bcdbf6f91..95858403d 100644 --- a/dsp/scale/magikarp.c +++ b/dsp/scale/magikarp.c @@ -20,7 +20,7 @@ #include "dsp/core/ks8.h" #include "dsp/core/kss8.h" #include "dsp/scale/cdecimate2xuint8x8.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/x86feature.h" #include "libc/str/str.h" #include "libc/x/x.h" diff --git a/dsp/tty/ident.c b/dsp/tty/ident.c index 0cea4f1dd..a263d11b1 100644 --- a/dsp/tty/ident.c +++ b/dsp/tty/ident.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/tty.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/termios.h" diff --git a/dsp/tty/mpsadbw.S b/dsp/tty/mpsadbw.S index 478de0b40..9c1935852 100644 --- a/dsp/tty/mpsadbw.S +++ b/dsp/tty/mpsadbw.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" // TODO(jart): write me diff --git a/dsp/tty/rgb2ansi.c b/dsp/tty/rgb2ansi.c index ea0f4b3be..9ffdb73e6 100644 --- a/dsp/tty/rgb2ansi.c +++ b/dsp/tty/rgb2ansi.c @@ -22,7 +22,7 @@ #include "libc/bits/initializer.internal.h" #include "libc/limits.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/str/str.h" diff --git a/dsp/tty/rgb2ttyi2f.c b/dsp/tty/rgb2ttyi2f.c index 7ee0904c2..8c4ef41e5 100644 --- a/dsp/tty/rgb2ttyi2f.c +++ b/dsp/tty/rgb2ttyi2f.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/quant.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" struct TtyRgb rgb2ttyi2f_(int r, int g, int b) { return rgb2ttyf((__m128){r, g, b} / 255); diff --git a/dsp/tty/rgb2xterm24.c b/dsp/tty/rgb2xterm24.c index 1d38d06e2..1d67a1f8f 100644 --- a/dsp/tty/rgb2xterm24.c +++ b/dsp/tty/rgb2xterm24.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/quant.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" struct TtyRgb rgb2xterm24_(int r, int g, int b) { return (struct TtyRgb){MAX(MIN(r, 255), 0), MAX(MIN(g, 255), 0), diff --git a/dsp/tty/ttymove.c b/dsp/tty/ttymove.c index bea47bd08..92afe991d 100644 --- a/dsp/tty/ttymove.c +++ b/dsp/tty/ttymove.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/itoa8.h" #include "dsp/tty/tty.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/limits.h" #include "libc/log/check.h" diff --git a/dsp/tty/ttyraster.c b/dsp/tty/ttyraster.c index 80cfc4e55..fec1adf3d 100644 --- a/dsp/tty/ttyraster.c +++ b/dsp/tty/ttyraster.c @@ -23,11 +23,11 @@ #include "dsp/tty/windex.h" #include "libc/assert.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/nexgen32e/x86feature.h" #include "libc/runtime/runtime.h" diff --git a/dsp/tty/ttyraw.c b/dsp/tty/ttyraw.c index d4b93e4d9..1007afbf2 100644 --- a/dsp/tty/ttyraw.c +++ b/dsp/tty/ttyraw.c @@ -26,7 +26,7 @@ #include "libc/calls/typedef/sigaction_f.h" #include "libc/calls/ucontext.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/gc.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/dsp/tty/windex-avx2.S b/dsp/tty/windex-avx2.S index f2dcf5368..77cbddf92 100644 --- a/dsp/tty/windex-avx2.S +++ b/dsp/tty/windex-avx2.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 index of minimum uint16 in array. diff --git a/dsp/tty/windex-sse4.S b/dsp/tty/windex-sse4.S index 4b768c025..93ff50ea4 100644 --- a/dsp/tty/windex-sse4.S +++ b/dsp/tty/windex-sse4.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 index of minimum positive int16 in array. diff --git a/dsp/tty/windex.S b/dsp/tty/windex.S index 35e997c2e..eeecba61a 100644 --- a/dsp/tty/windex.S +++ b/dsp/tty/windex.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ // Dispatches to fastest windex() implementation. diff --git a/examples/cplusplus.cc b/examples/cplusplus.cc index dd6388a35..cada830d3 100644 --- a/examples/cplusplus.cc +++ b/examples/cplusplus.cc @@ -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/stdio/stdio.h" #include "libc/str/str.h" diff --git a/examples/curl.c b/examples/curl.c index 75d8a8a44..80bb51569 100644 --- a/examples/curl.c +++ b/examples/curl.c @@ -7,13 +7,13 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/dns/dns.h" #include "libc/fmt/conv.h" #include "libc/fmt/fmt.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/gc.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" diff --git a/examples/dinlerp.c b/examples/dinlerp.c index 17f8141ab..4f22a0614 100644 --- a/examples/dinlerp.c +++ b/examples/dinlerp.c @@ -20,7 +20,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/runtime/gc.h" diff --git a/examples/e820.c b/examples/e820.c index 28d9919cc..4178b1906 100644 --- a/examples/e820.c +++ b/examples/e820.c @@ -8,7 +8,7 @@ ╚─────────────────────────────────────────────────────────────────*/ #endif #include "libc/fmt/itoa.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/e820.internal.h" #include "libc/runtime/pc.internal.h" #include "libc/stdio/stdio.h" diff --git a/examples/ispell.c b/examples/ispell.c index 4524d17a8..73165be82 100644 --- a/examples/ispell.c +++ b/examples/ispell.c @@ -15,7 +15,7 @@ #include "libc/fmt/conv.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/examples/lstime.c b/examples/lstime.c index ef1cf5abd..ffeebfd34 100644 --- a/examples/lstime.c +++ b/examples/lstime.c @@ -9,7 +9,7 @@ #endif #include "libc/alg/alg.h" #include "libc/alg/arraylist2.internal.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/dirent.h" #include "libc/calls/struct/stat.h" diff --git a/examples/mappy.c b/examples/mappy.c index 299071ba7..e98096885 100644 --- a/examples/mappy.c +++ b/examples/mappy.c @@ -9,7 +9,7 @@ #endif #include "libc/bits/bits.h" #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/sysv/consts/map.h" diff --git a/examples/nesemu1.cc b/examples/nesemu1.cc index b5e5664b5..df39e02f4 100644 --- a/examples/nesemu1.cc +++ b/examples/nesemu1.cc @@ -13,7 +13,7 @@ #include "libc/alg/arraylist2.internal.h" #include "libc/assert.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/itimerval.h" #include "libc/calls/struct/winsize.h" @@ -23,7 +23,7 @@ #include "libc/inttypes.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/ohmyplus/vector.h" diff --git a/examples/package/lib/myasm.S b/examples/package/lib/myasm.S index d74444fc6..1711187fc 100644 --- a/examples/package/lib/myasm.S +++ b/examples/package/lib/myasm.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" // Example assembly function. // diff --git a/examples/poll.c b/examples/poll.c index 728dc509a..024e5f2ce 100644 --- a/examples/poll.c +++ b/examples/poll.c @@ -8,7 +8,7 @@ ╚─────────────────────────────────────────────────────────────────*/ #endif #include "libc/bits/bits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/sock/sock.h" #include "libc/stdio/stdio.h" #include "libc/sysv/consts/fileno.h" diff --git a/examples/printargs.c b/examples/printargs.c index 5cad82cb2..039205d5e 100644 --- a/examples/printargs.c +++ b/examples/printargs.c @@ -8,7 +8,7 @@ ╚─────────────────────────────────────────────────────────────────*/ #endif #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/examples/unbourne.c b/examples/unbourne.c index 2bc18f370..bbff708de 100644 --- a/examples/unbourne.c +++ b/examples/unbourne.c @@ -1609,7 +1609,6 @@ wontreturn static void exraise(int e) { INTOFF; exception = e; longjmp(handler->loc, 1); - panic(); } /* diff --git a/libc/alg/replacestr.c b/libc/alg/replacestr.c index 81717b566..ea4febe2f 100644 --- a/libc/alg/replacestr.c +++ b/libc/alg/replacestr.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" #include "libc/alg/arraylist2.internal.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/alg/reverse.h b/libc/alg/reverse.internal.h similarity index 94% rename from libc/alg/reverse.h rename to libc/alg/reverse.internal.h index 598f65826..2f8c2083c 100644 --- a/libc/alg/reverse.h +++ b/libc/alg/reverse.internal.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ALG_REVERSE_H_ #define COSMOPOLITAN_LIBC_ALG_REVERSE_H_ -#include "libc/bits/xchg.h" +#include "libc/bits/xchg.internal.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) /** @@ -11,7 +11,6 @@ * @return pointer to start of array * @see ARRAYLEN() */ -#ifndef reverse #define reverse(ARRAY, COUNT) \ ({ \ autotype(&(ARRAY)[0]) Array = (ARRAY); \ @@ -27,7 +26,6 @@ } \ Array; \ }) -#endif /* reverse */ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ALG_REVERSE_H_ */ diff --git a/libc/alg/shuffle.h b/libc/alg/shuffle.internal.h similarity index 91% rename from libc/alg/shuffle.h rename to libc/alg/shuffle.internal.h index 027675a4f..46001d8c7 100644 --- a/libc/alg/shuffle.h +++ b/libc/alg/shuffle.internal.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_ #define COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_ +#include "libc/bits/xchg.internal.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) -#include "libc/bits/xchg.h" /** * Fisher-Yates shuffle. @@ -11,7 +11,6 @@ * @param n is the number of items in A * @see ARRAYLEN() */ -#ifndef shuffle #define shuffle(R, A, n) \ do { \ autotype(A) Array = (A); \ @@ -19,7 +18,6 @@ xchg(&Array[i], &Array[R() % (i + 1)]); \ } \ } while (0) -#endif /* shuffle */ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_ */ diff --git a/libc/alg/tarjan.c b/libc/alg/tarjan.c index 721da2f87..d7109e1de 100644 --- a/libc/alg/tarjan.c +++ b/libc/alg/tarjan.c @@ -19,7 +19,7 @@ #include "libc/alg/alg.h" #include "libc/assert.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" /** diff --git a/libc/bits/abs.c b/libc/bits/abs.c index 5348062e6..a3627914f 100644 --- a/libc/bits/abs.c +++ b/libc/bits/abs.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * Returns absolute value of x. diff --git a/libc/bits/atomic_load.c b/libc/bits/atomic_load.c index fbfcae7ff..9f2ef57a7 100644 --- a/libc/bits/atomic_load.c +++ b/libc/bits/atomic_load.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" /** diff --git a/libc/bits/atomic_store.c b/libc/bits/atomic_store.c index 8075f8b89..74ddf68dd 100644 --- a/libc/bits/atomic_store.c +++ b/libc/bits/atomic_store.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" /** diff --git a/libc/bits/emptytonull.c b/libc/bits/emptytonull.c deleted file mode 100644 index d57e57cad..000000000 --- a/libc/bits/emptytonull.c +++ /dev/null @@ -1,27 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/safemacros.h" - -/** - * Returns string where empty string is made null. - * @see nulltoempty() - */ -const char *(emptytonull)(const char *s) { - return s && !*s ? 0 : s; -} diff --git a/libc/bits/firstnonnull.c b/libc/bits/firstnonnull.c deleted file mode 100644 index f84168042..000000000 --- a/libc/bits/firstnonnull.c +++ /dev/null @@ -1,28 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/runtime/runtime.h" - -/** - * Returns a or b or aborts if both are null. - */ -const char *(firstnonnull)(const char *a, const char *b) { - if (a) return a; - if (b) return b; - abort(); -} diff --git a/libc/bits/isempty.c b/libc/bits/isempty.c deleted file mode 100644 index 600429f31..000000000 --- a/libc/bits/isempty.c +++ /dev/null @@ -1,25 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ - -/** - * Returns true if s is empty string or null. - */ -bool isempty(const char *s) { - return !s || !*s; -} diff --git a/libc/bits/nulltoempty.c b/libc/bits/nulltoempty.c deleted file mode 100644 index e67b52d94..000000000 --- a/libc/bits/nulltoempty.c +++ /dev/null @@ -1,27 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/safemacros.h" - -/** - * Returns 𝑠 converting null to empty string. - * @see emptytonull() - */ -const char *(nulltoempty)(const char *s) { - return s ? s : ""; -} diff --git a/libc/bits/pushpop.h b/libc/bits/pushpop.h index 44dfd4caa..0040e7c71 100644 --- a/libc/bits/pushpop.h +++ b/libc/bits/pushpop.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_BITS_PUSHPOP_H_ #define COSMOPOLITAN_LIBC_BITS_PUSHPOP_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined(__GNUC__) || defined(__STRICT_ANSI__) diff --git a/libc/bits/rounddown.c b/libc/bits/rounddown.c deleted file mode 100644 index ea80d1fcd..000000000 --- a/libc/bits/rounddown.c +++ /dev/null @@ -1,26 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.h" - -/** - * Rounds down 𝑤 to next two power 𝑘. - */ -long(rounddown)(long w, long k) { - return ROUNDDOWN(w, k); -} diff --git a/libc/bits/roundup.c b/libc/bits/roundup.c deleted file mode 100644 index d675bc5cf..000000000 --- a/libc/bits/roundup.c +++ /dev/null @@ -1,26 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.h" - -/** - * Rounds up 𝑤 to next two power 𝑘. - */ -long(roundup)(long w, long k) { - return ROUNDUP(w, k); -} diff --git a/libc/bits/safemacros.h b/libc/bits/safemacros.internal.h similarity index 83% rename from libc/bits/safemacros.h rename to libc/bits/safemacros.internal.h index 01254d35b..ac1c1e03b 100644 --- a/libc/bits/safemacros.h +++ b/libc/bits/safemacros.internal.h @@ -1,23 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_ #define COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -long min(long, long); -long max(long, long); -long roundup(long, long); -long rounddown(long, long); -bool isempty(const char *); -const char *nulltoempty(const char *); -const char *emptytonull(const char *); -const char *firstnonnull(const char *, const char *); -uint64_t(unsignedsubtract)(uint64_t, uint64_t) pureconst; - -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) && \ -!defined(__VSCODE_INTELLISENSE__) - #define min(x, y) \ ({ \ autotype(x) MinX = (x); \ @@ -79,8 +66,6 @@ uint64_t(unsignedsubtract)(uint64_t, uint64_t) pureconst; UnsubA >= UnsubB ? UnsubA - UnsubB : ~UnsubB + UnsubA + 1; \ }) -#endif /* GNU && !ANSI */ - COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_ */ diff --git a/libc/bits/unsignedsubtract.c b/libc/bits/unsignedsubtract.c deleted file mode 100644 index 6d721cc92..000000000 --- a/libc/bits/unsignedsubtract.c +++ /dev/null @@ -1,26 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/safemacros.h" - -/** - * Subtracts unsigned integers w/ wraparound. - */ -uint64_t(unsignedsubtract)(uint64_t x, uint64_t y) { - return unsignedsubtract(x, y); -} diff --git a/libc/bits/xchg.h b/libc/bits/xchg.internal.h similarity index 100% rename from libc/bits/xchg.h rename to libc/bits/xchg.internal.h diff --git a/libc/calls/atfork.c b/libc/calls/atfork.c index 528e2745c..73ce94a0a 100644 --- a/libc/calls/atfork.c +++ b/libc/calls/atfork.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/runtime/runtime.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/close.c b/libc/calls/close.c index a12f8de9a..85b1c73c2 100644 --- a/libc/calls/close.c +++ b/libc/calls/close.c @@ -19,7 +19,7 @@ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/sock/internal.h" #include "libc/sysv/errfuns.h" #include "libc/zipos/zipos.internal.h" diff --git a/libc/calls/commandv.c b/libc/calls/commandv.c index 91246adde..2162a15e7 100644 --- a/libc/calls/commandv.c +++ b/libc/calls/commandv.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/calls/calls.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/calls/copyfd.c b/libc/calls/copyfd.c index 7adee22ae..7ef001d2b 100644 --- a/libc/calls/copyfd.c +++ b/libc/calls/copyfd.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * Copies data between file descriptors the slow way. diff --git a/libc/calls/execve-sysv.c b/libc/calls/execve-sysv.c index 2c77471a5..28b842734 100644 --- a/libc/calls/execve-sysv.c +++ b/libc/calls/execve-sysv.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/calls/calls.h" #include "libc/calls/internal.h" #include "libc/errno.h" diff --git a/libc/calls/fstat-nt.c b/libc/calls/fstat-nt.c index 82228d054..0e474f6ec 100644 --- a/libc/calls/fstat-nt.c +++ b/libc/calls/fstat-nt.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/calls/internal.h" #include "libc/calls/struct/stat.h" #include "libc/fmt/conv.h" diff --git a/libc/calls/g_fds_init.S b/libc/calls/g_fds_init.S index 0ad2a52f0..c08c217fc 100644 --- a/libc/calls/g_fds_init.S +++ b/libc/calls/g_fds_init.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" .init.start 302,_init_g_fds push %rdi diff --git a/libc/calls/getcwd-nt.c b/libc/calls/getcwd-nt.c index db109370e..5bc9cf563 100644 --- a/libc/calls/getcwd-nt.c +++ b/libc/calls/getcwd-nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/files.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/getdomainname.c b/libc/calls/getdomainname.c index 011d32624..87dd1d748 100644 --- a/libc/calls/getdomainname.c +++ b/libc/calls/getdomainname.c @@ -20,7 +20,7 @@ #include "libc/calls/internal.h" #include "libc/calls/struct/utsname.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/enum/computernameformat.h" #include "libc/nt/errors.h" #include "libc/nt/runtime.h" diff --git a/libc/calls/getntsyspath.S b/libc/calls/getntsyspath.S index 397e31296..3e4725e83 100644 --- a/libc/calls/getntsyspath.S +++ b/libc/calls/getntsyspath.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__ // Obtains WIN32 magic path, e.g. GetTempPathA. diff --git a/libc/calls/gettemppatha-flunk.S b/libc/calls/gettemppatha-flunk.S index 44b62f42c..dc1065213 100644 --- a/libc/calls/gettemppatha-flunk.S +++ b/libc/calls/gettemppatha-flunk.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__ // Calls GetTempPathA() w/ different API. diff --git a/libc/calls/getuid.c b/libc/calls/getuid.c index 3dd15f487..57a388082 100644 --- a/libc/calls/getuid.c +++ b/libc/calls/getuid.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/accounting.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/calls/internal.h b/libc/calls/internal.h index caffaa84b..0e53945fc 100644 --- a/libc/calls/internal.h +++ b/libc/calls/internal.h @@ -9,7 +9,7 @@ #include "libc/calls/struct/timeval.h" #include "libc/dce.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/struct/context.h" #include "libc/nt/struct/ntexceptionpointers.h" #include "libc/nt/struct/securityattributes.h" diff --git a/libc/calls/ioctl.h b/libc/calls/ioctl.h index 9236e7828..4fe29ccd0 100644 --- a/libc/calls/ioctl.h +++ b/libc/calls/ioctl.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_IOCTL_H_ #define COSMOPOLITAN_LIBC_CALLS_IOCTL_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/sysv/consts/termios.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ @@ -18,6 +18,7 @@ int ioctl(int, uint64_t, void *); #define ioctl(FD, REQUEST, MEMORY) ioctl_dispatch(FD, REQUEST, MEMORY) +#define __EQUIVALENT(X, Y) (__builtin_constant_p((X) == (Y)) && ((X) == (Y))) #define __IOCTL_DISPATCH(CMP, FD, REQUEST, MEMORY) \ do { \ if (CMP(request, TIOCGWINSZ)) return ioctl_tiocgwinsz(FD, MEMORY); \ @@ -39,7 +40,7 @@ int ioctl_tiocswinsz_nt(int, void *); int ioctl_default(int, uint64_t, void *); forceinline int ioctl_dispatch(int fd, uint64_t request, void *memory) { - __IOCTL_DISPATCH(EQUIVALENT, fd, request, memory); + __IOCTL_DISPATCH(__EQUIVALENT, fd, request, memory); return ioctl_default(fd, request, memory); } diff --git a/libc/calls/isdebuggerpresent.c b/libc/calls/isdebuggerpresent.c index d4096575e..6847fd73c 100644 --- a/libc/calls/isdebuggerpresent.c +++ b/libc/calls/isdebuggerpresent.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/dce.h" diff --git a/libc/calls/kill-nt.c b/libc/calls/kill-nt.c index 077d97479..f32ce4492 100644 --- a/libc/calls/kill-nt.c +++ b/libc/calls/kill-nt.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/console.h" #include "libc/nt/enum/ctrlevent.h" #include "libc/nt/process.h" diff --git a/libc/calls/kntprioritycombos.c b/libc/calls/kntprioritycombos.c index d0d6c3780..5d9abe47c 100644 --- a/libc/calls/kntprioritycombos.c +++ b/libc/calls/kntprioritycombos.c @@ -19,7 +19,7 @@ #include "libc/bits/bits.h" #include "libc/calls/kntprioritycombos.internal.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/ffs.h" #include "libc/nt/enum/processcreationflags.h" #include "libc/nt/enum/threadpriority.h" diff --git a/libc/calls/kntsystemdirectory.S b/libc/calls/kntsystemdirectory.S index 40a64d28d..6c20bde2b 100644 --- a/libc/calls/kntsystemdirectory.S +++ b/libc/calls/kntsystemdirectory.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ #define BYTES 64 diff --git a/libc/calls/kntwindowsdirectory.S b/libc/calls/kntwindowsdirectory.S index bb8eafb46..95ff82aa3 100644 --- a/libc/calls/kntwindowsdirectory.S +++ b/libc/calls/kntwindowsdirectory.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ #define BYTES 64 diff --git a/libc/calls/ktmppath.S b/libc/calls/ktmppath.S index 290c82772..7866690f5 100644 --- a/libc/calls/ktmppath.S +++ b/libc/calls/ktmppath.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/runtime.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #define kTmpPathMax 80 diff --git a/libc/calls/madvise-nt.c b/libc/calls/madvise-nt.c index a1c1aef0b..6592ff700 100644 --- a/libc/calls/madvise-nt.c +++ b/libc/calls/madvise-nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/enum/offerpriority.h" #include "libc/nt/memory.h" #include "libc/nt/runtime.h" diff --git a/libc/calls/mkntenvblock.c b/libc/calls/mkntenvblock.c index 4fb63e6b1..9884faeaa 100644 --- a/libc/calls/mkntenvblock.c +++ b/libc/calls/mkntenvblock.c @@ -19,7 +19,7 @@ #include "libc/alg/arraylist2.internal.h" #include "libc/calls/ntspawn.h" #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/alloca.h" #include "libc/mem/mem.h" #include "libc/str/oldutf16.internal.h" diff --git a/libc/calls/mkntpathat.c b/libc/calls/mkntpathat.c index a94eee07b..0925c2d18 100644 --- a/libc/calls/mkntpathat.c +++ b/libc/calls/mkntpathat.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/files.h" #include "libc/str/str.h" #include "libc/sysv/consts/at.h" diff --git a/libc/calls/nanosleep-xnu.c b/libc/calls/nanosleep-xnu.c index 3c5d84bda..6517cfcf4 100644 --- a/libc/calls/nanosleep-xnu.c +++ b/libc/calls/nanosleep-xnu.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/struct/timeval.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/nexgen32e.h" #include "libc/sock/internal.h" diff --git a/libc/calls/netbsdtramp.S b/libc/calls/netbsdtramp.S index 80211c8b4..e0493b16e 100644 --- a/libc/calls/netbsdtramp.S +++ b/libc/calls/netbsdtramp.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" .privileged __restore_rt_netbsd: diff --git a/libc/calls/nice.c b/libc/calls/nice.c index b35b82b8b..54603634a 100644 --- a/libc/calls/nice.c +++ b/libc/calls/nice.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/calls/calls.h" #include "libc/fmt/conv.h" #include "libc/sysv/consts/prio.h" diff --git a/libc/calls/now.c b/libc/calls/now.c index acaaaed3d..d695255c8 100644 --- a/libc/calls/now.c +++ b/libc/calls/now.c @@ -18,9 +18,10 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/bits/initializer.internal.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/dce.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/nexgen32e/x86feature.h" #include "libc/str/str.h" diff --git a/libc/calls/nowl.S b/libc/calls/nowl.S index 1ea325fc0..09be0ff64 100644 --- a/libc/calls/nowl.S +++ b/libc/calls/nowl.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Returns timestamp without needing system calls. // diff --git a/libc/calls/ntspawn.c b/libc/calls/ntspawn.c index 1ee9b41dd..99644a287 100644 --- a/libc/calls/ntspawn.c +++ b/libc/calls/ntspawn.c @@ -19,7 +19,7 @@ #include "libc/bits/pushpop.h" #include "libc/calls/internal.h" #include "libc/calls/ntspawn.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/enum/filemapflags.h" #include "libc/nt/enum/pageflags.h" #include "libc/nt/enum/processcreationflags.h" diff --git a/libc/calls/onntconsoleevent_init.S b/libc/calls/onntconsoleevent_init.S index b493e4861..754fac4b2 100644 --- a/libc/calls/onntconsoleevent_init.S +++ b/libc/calls/onntconsoleevent_init.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" .text.windows .source __FILE__ diff --git a/libc/calls/onwincrash.S b/libc/calls/onwincrash.S index 187c1606d..ce4bfc96b 100644 --- a/libc/calls/onwincrash.S +++ b/libc/calls/onwincrash.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" .text.windows .source __FILE__ diff --git a/libc/calls/pipe-nt.c b/libc/calls/pipe-nt.c index b86c959da..2dede30c1 100644 --- a/libc/calls/pipe-nt.c +++ b/libc/calls/pipe-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/alg/reverse.h" +#include "libc/alg/reverse.internal.h" #include "libc/calls/internal.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" diff --git a/libc/calls/pread.c b/libc/calls/pread.c index ac769ed9f..cd138221c 100644 --- a/libc/calls/pread.c +++ b/libc/calls/pread.c @@ -22,7 +22,7 @@ #include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/sysv/errfuns.h" #include "libc/zipos/zipos.internal.h" diff --git a/libc/calls/preadv.c b/libc/calls/preadv.c index f1813fc5d..fa23cbdc3 100644 --- a/libc/calls/preadv.c +++ b/libc/calls/preadv.c @@ -22,7 +22,7 @@ #include "libc/calls/struct/iovec.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/sysv/consts/iov.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/pwrite.c b/libc/calls/pwrite.c index d13be02e2..d8a061d3d 100644 --- a/libc/calls/pwrite.c +++ b/libc/calls/pwrite.c @@ -21,7 +21,7 @@ #include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/calls/pwritev.c b/libc/calls/pwritev.c index 9125cb075..36a64587d 100644 --- a/libc/calls/pwritev.c +++ b/libc/calls/pwritev.c @@ -21,7 +21,7 @@ #include "libc/calls/struct/iovec.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/sysv/consts/iov.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/readv-metal.c b/libc/calls/readv-metal.c index d105ebc5f..4215c95ad 100644 --- a/libc/calls/readv-metal.c +++ b/libc/calls/readv-metal.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/calls/metalfile.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/sched_setaffinity.c b/libc/calls/sched_setaffinity.c index 8aaecf9af..9a40c69f0 100644 --- a/libc/calls/sched_setaffinity.c +++ b/libc/calls/sched_setaffinity.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/calls/calls.h" #include "libc/calls/internal.h" #include "libc/dce.h" diff --git a/libc/calls/setegid.S b/libc/calls/setegid.S index 922e63d2a..ad9713903 100644 --- a/libc/calls/setegid.S +++ b/libc/calls/setegid.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__ // Sets effective group ID. diff --git a/libc/calls/seteuid.S b/libc/calls/seteuid.S index 6e6cd5547..c17239722 100644 --- a/libc/calls/seteuid.S +++ b/libc/calls/seteuid.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__ // Sets effective user ID. diff --git a/libc/calls/setpriority-nt.c b/libc/calls/setpriority-nt.c index 162f378e9..cb762d0eb 100644 --- a/libc/calls/setpriority-nt.c +++ b/libc/calls/setpriority-nt.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/calls/internal.h" #include "libc/calls/kntprioritycombos.internal.h" #include "libc/nt/process.h" diff --git a/libc/calls/sigaction.c b/libc/calls/sigaction.c index f57ae69bc..ac36db971 100644 --- a/libc/calls/sigaction.c +++ b/libc/calls/sigaction.c @@ -31,7 +31,7 @@ #include "libc/calls/ucontext.h" #include "libc/dce.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/calls/sigenter-freebsd.c b/libc/calls/sigenter-freebsd.c index 7acb710eb..e933541ed 100644 --- a/libc/calls/sigenter-freebsd.c +++ b/libc/calls/sigenter-freebsd.c @@ -22,7 +22,7 @@ #include "libc/calls/struct/siginfo.h" #include "libc/calls/typedef/sigaction_f.h" #include "libc/calls/ucontext.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" union sigval_freebsd { diff --git a/libc/calls/sigenter-netbsd.c b/libc/calls/sigenter-netbsd.c index 46baac23f..2931cfd3d 100644 --- a/libc/calls/sigenter-netbsd.c +++ b/libc/calls/sigenter-netbsd.c @@ -22,7 +22,7 @@ #include "libc/calls/struct/siginfo.h" #include "libc/calls/typedef/sigaction_f.h" #include "libc/calls/ucontext.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" #define RDI 0 diff --git a/libc/calls/sigenter-openbsd.c b/libc/calls/sigenter-openbsd.c index 85e8fd29a..61844f099 100644 --- a/libc/calls/sigenter-openbsd.c +++ b/libc/calls/sigenter-openbsd.c @@ -22,7 +22,7 @@ #include "libc/calls/struct/siginfo.h" #include "libc/calls/typedef/sigaction_f.h" #include "libc/calls/ucontext.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" union sigval_openbsd { diff --git a/libc/calls/sysinfo.c b/libc/calls/sysinfo.c index 752d5b54b..a5a555e58 100644 --- a/libc/calls/sysinfo.c +++ b/libc/calls/sysinfo.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/struct/sysinfo.h" diff --git a/libc/calls/termios.h b/libc/calls/termios.h index 9a6d67177..9dfef3902 100644 --- a/libc/calls/termios.h +++ b/libc/calls/termios.h @@ -3,7 +3,6 @@ #include "libc/calls/ioctl.h" #include "libc/calls/struct/termios.h" #include "libc/calls/struct/winsize.h" -#include "libc/macros.h" #include "libc/sysv/consts/termios.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ @@ -34,9 +33,9 @@ int posix_openpt(int) nodiscard; #define tcsetattr(FD, OPT, TIO) tcsetattr_dispatch(FD, OPT, TIO) forceinline int tcsetattr_dispatch(int fd, int opt, const struct termios *tio) { - if (EQUIVALENT(opt, TCSANOW)) return ioctl(fd, TCSETS, (void *)tio); - if (EQUIVALENT(opt, TCSADRAIN)) return ioctl(fd, TCSETSW, (void *)tio); - if (EQUIVALENT(opt, TCSAFLUSH)) return ioctl(fd, TCSETSF, (void *)tio); + if (__EQUIVALENT(opt, TCSANOW)) return ioctl(fd, TCSETS, (void *)tio); + if (__EQUIVALENT(opt, TCSADRAIN)) return ioctl(fd, TCSETSW, (void *)tio); + if (__EQUIVALENT(opt, TCSAFLUSH)) return ioctl(fd, TCSETSF, (void *)tio); return (tcsetattr)(fd, opt, tio); } diff --git a/libc/calls/termios.internal.h b/libc/calls/termios.internal.h index c76a3467c..0a44c6db0 100644 --- a/libc/calls/termios.internal.h +++ b/libc/calls/termios.internal.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_TERMIOS_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_TERMIOS_INTERNAL_H_ #ifndef __STRICT_ANSI__ -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/struct/metatermios.internal.h" #include "libc/calls/struct/termios.h" #include "libc/str/str.h" diff --git a/libc/calls/vdprintf.c b/libc/calls/vdprintf.c index 977d07b5d..394280d26 100644 --- a/libc/calls/vdprintf.c +++ b/libc/calls/vdprintf.c @@ -20,7 +20,7 @@ #include "libc/dce.h" #include "libc/fmt/fmt.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/files.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/wait4-nt.c b/libc/calls/wait4-nt.c index d04156b00..a500eb72a 100644 --- a/libc/calls/wait4-nt.c +++ b/libc/calls/wait4-nt.c @@ -20,7 +20,7 @@ #include "libc/calls/internal.h" #include "libc/calls/struct/rusage.h" #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/accounting.h" #include "libc/nt/enum/status.h" #include "libc/nt/enum/wait.h" diff --git a/libc/calls/winalarm.S b/libc/calls/winalarm.S index 292758094..84055d2b5 100644 --- a/libc/calls/winalarm.S +++ b/libc/calls/winalarm.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" .text.windows .source __FILE__ diff --git a/libc/calls/wincrash_init.S b/libc/calls/wincrash_init.S index 093ddf653..6bbe00f5d 100644 --- a/libc/calls/wincrash_init.S +++ b/libc/calls/wincrash_init.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__ .init.start 300,_init_wincrash diff --git a/libc/crt/crt.S b/libc/crt/crt.S index dc5dc3fbd..beaf1e657 100644 --- a/libc/crt/crt.S +++ b/libc/crt/crt.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/notice.inc" #include "libc/runtime/internal.h" .section .start,"ax",@progbits diff --git a/libc/crypto/kaessbox.S b/libc/crypto/kaessbox.S index 228ee04e8..38e95a2ce 100644 --- a/libc/crypto/kaessbox.S +++ b/libc/crypto/kaessbox.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" .rodata .align 64 # for cacheline yoinking diff --git a/libc/crypto/kaessboxinverse.S b/libc/crypto/kaessboxinverse.S index 139577763..19456688a 100644 --- a/libc/crypto/kaessboxinverse.S +++ b/libc/crypto/kaessboxinverse.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" .rodata .align 64 # for cacheline yoinking diff --git a/libc/dns/dnsnamecmp.c b/libc/dns/dnsnamecmp.c index 07ae0a8da..81958aca2 100644 --- a/libc/dns/dnsnamecmp.c +++ b/libc/dns/dnsnamecmp.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/dns/dns.h" #include "libc/str/str.h" diff --git a/libc/dns/getaddrinfo.c b/libc/dns/getaddrinfo.c index f7b765e7c..3443877ed 100644 --- a/libc/dns/getaddrinfo.c +++ b/libc/dns/getaddrinfo.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/calls/calls.h" #include "libc/dns/dns.h" #include "libc/dns/hoststxt.h" diff --git a/libc/dns/gethoststxt.c b/libc/dns/gethoststxt.c index 8844fa4bf..f2420328d 100644 --- a/libc/dns/gethoststxt.c +++ b/libc/dns/gethoststxt.c @@ -18,11 +18,11 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/bits/pushpop.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/dce.h" #include "libc/dns/hoststxt.h" #include "libc/fmt/fmt.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/systeminfo.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/libc/dns/getresolvconf.c b/libc/dns/getresolvconf.c index 7f5dee0e3..a9035af92 100644 --- a/libc/dns/getresolvconf.c +++ b/libc/dns/getresolvconf.c @@ -20,7 +20,7 @@ #include "libc/dce.h" #include "libc/dns/resolvconf.h" #include "libc/fmt/fmt.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" #include "libc/stdio/stdio.h" diff --git a/libc/dns/newaddrinfo.c b/libc/dns/newaddrinfo.c index 7934df3d9..8ee20a5fd 100644 --- a/libc/dns/newaddrinfo.c +++ b/libc/dns/newaddrinfo.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dns/dns.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/sock/sock.h" #include "libc/sysv/consts/af.h" diff --git a/libc/fmt/dosdatetimetounix.c b/libc/fmt/dosdatetimetounix.c index 0b3ec0f9e..edf9facfb 100644 --- a/libc/fmt/dosdatetimetounix.c +++ b/libc/fmt/dosdatetimetounix.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/time/time.h" /** diff --git a/libc/fmt/fcvt.c b/libc/fmt/fcvt.c index 65086221f..5d81ed541 100644 --- a/libc/fmt/fcvt.c +++ b/libc/fmt/fcvt.c @@ -17,7 +17,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/fmt/fmt.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/fmt/imaxabs.c b/libc/fmt/imaxabs.c index 2f0186bd1..664d4d616 100644 --- a/libc/fmt/imaxabs.c +++ b/libc/fmt/imaxabs.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" intmax_t(imaxabs)(intmax_t x) { return ABS(x); diff --git a/libc/fmt/imaxabs.thunk.S b/libc/fmt/imaxabs.thunk.S index 065e64493..6f4025137 100644 --- a/libc/fmt/imaxabs.thunk.S +++ b/libc/fmt/imaxabs.thunk.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" __imaxabs: jmp imaxabs diff --git a/libc/fmt/itoa128radix10.greg.c b/libc/fmt/itoa128radix10.greg.c index e2ae21397..824c4af20 100644 --- a/libc/fmt/itoa128radix10.greg.c +++ b/libc/fmt/itoa128radix10.greg.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/alg/reverse.h" +#include "libc/alg/reverse.internal.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/limits.h" diff --git a/libc/fmt/itoa64.c b/libc/fmt/itoa64.c index 056262bad..126e21838 100644 --- a/libc/fmt/itoa64.c +++ b/libc/fmt/itoa64.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/alg/reverse.h" +#include "libc/alg/reverse.internal.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" diff --git a/libc/fmt/itoa64radix10.greg.c b/libc/fmt/itoa64radix10.greg.c index 4444e9acd..182bc5dcf 100644 --- a/libc/fmt/itoa64radix10.greg.c +++ b/libc/fmt/itoa64radix10.greg.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/alg/reverse.h" +#include "libc/alg/reverse.internal.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/limits.h" diff --git a/libc/fmt/itoa64radix16.greg.c b/libc/fmt/itoa64radix16.greg.c index f7645c9e9..5d4e8565c 100644 --- a/libc/fmt/itoa64radix16.greg.c +++ b/libc/fmt/itoa64radix16.greg.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/bsr.h" size_t uint64toarray_radix16(uint64_t x, char b[hasatleast 17]) { diff --git a/libc/fmt/itoa64radix8.c b/libc/fmt/itoa64radix8.c index be3957971..13c882429 100644 --- a/libc/fmt/itoa64radix8.c +++ b/libc/fmt/itoa64radix8.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/alg/reverse.h" +#include "libc/alg/reverse.internal.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/limits.h" diff --git a/libc/fmt/labs.c b/libc/fmt/labs.c index e0f477267..e3a1d3916 100644 --- a/libc/fmt/labs.c +++ b/libc/fmt/labs.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" long(labs)(long x) { return ABS(x); diff --git a/libc/fmt/llabs.c b/libc/fmt/llabs.c index 123fd1eb8..5ded9754c 100644 --- a/libc/fmt/llabs.c +++ b/libc/fmt/llabs.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" long long(llabs)(long long x) { return ABS(x); diff --git a/libc/fmt/strerror_r.c b/libc/fmt/strerror_r.c index 65555e699..814869bc5 100644 --- a/libc/fmt/strerror_r.c +++ b/libc/fmt/strerror_r.c @@ -16,11 +16,11 @@ │ 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/dce.h" #include "libc/errno.h" #include "libc/fmt/fmt.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/enum/formatmessageflags.h" #include "libc/nt/process.h" #include "libc/nt/runtime.h" diff --git a/libc/fmt/unbing.c b/libc/fmt/unbing.c index e58fa2483..1f586ea58 100644 --- a/libc/fmt/unbing.c +++ b/libc/fmt/unbing.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/nexgen32e.h" #include "libc/str/str.h" diff --git a/libc/fmt/vsnprintf.c b/libc/fmt/vsnprintf.c index f7a69db5c..10d51d343 100644 --- a/libc/fmt/vsnprintf.c +++ b/libc/fmt/vsnprintf.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/dce.h" #include "libc/fmt/fmt.h" #include "libc/limits.h" diff --git a/libc/intrin/addvdi3.S b/libc/intrin/addvdi3.S index 72c0ceb7a..cdebf6d30 100644 --- a/libc/intrin/addvdi3.S +++ b/libc/intrin/addvdi3.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__ .privileged .alignfunc diff --git a/libc/intrin/addvsi3.S b/libc/intrin/addvsi3.S index 2902a280e..0d6294ba6 100644 --- a/libc/intrin/addvsi3.S +++ b/libc/intrin/addvsi3.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__ .privileged .alignfunc diff --git a/libc/intrin/addvti3.S b/libc/intrin/addvti3.S index bfa28fddc..675dcebac 100644 --- a/libc/intrin/addvti3.S +++ b/libc/intrin/addvti3.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__ .privileged .alignfunc diff --git a/libc/intrin/asan.c b/libc/intrin/asan.c index 441634f82..8c3fd939e 100644 --- a/libc/intrin/asan.c +++ b/libc/intrin/asan.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/alg/reverse.h" +#include "libc/alg/reverse.internal.h" #include "libc/bits/bits.h" #include "libc/bits/likely.h" #include "libc/bits/weaken.h" @@ -24,7 +24,7 @@ #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/hook/hook.internal.h" #include "libc/nt/enum/version.h" #include "libc/nt/runtime.h" diff --git a/libc/intrin/mpsadbw.c b/libc/intrin/mpsadbw.c index cca2076c0..8b7d7a8b9 100644 --- a/libc/intrin/mpsadbw.c +++ b/libc/intrin/mpsadbw.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/mpsadbw.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/mpsadbws.S b/libc/intrin/mpsadbws.S index 2957f0bcc..bf8ca8fa4 100644 --- a/libc/intrin/mpsadbws.S +++ b/libc/intrin/mpsadbws.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" // Jump table for mpsadbw() with non-constexpr immediate parameter. // diff --git a/libc/intrin/mulvdi3.S b/libc/intrin/mulvdi3.S index 7e7a8ee26..fbf5752e5 100644 --- a/libc/intrin/mulvdi3.S +++ b/libc/intrin/mulvdi3.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__ .privileged .alignfunc diff --git a/libc/intrin/mulvsi3.S b/libc/intrin/mulvsi3.S index cae1e681d..a55c96513 100644 --- a/libc/intrin/mulvsi3.S +++ b/libc/intrin/mulvsi3.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__ .privileged .alignfunc diff --git a/libc/intrin/mulvti3.S b/libc/intrin/mulvti3.S index c41ffe730..d6f163314 100644 --- a/libc/intrin/mulvti3.S +++ b/libc/intrin/mulvti3.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__ .privileged .alignfunc diff --git a/libc/intrin/negvdi2.S b/libc/intrin/negvdi2.S index 3ffb289bb..b05f7bbde 100644 --- a/libc/intrin/negvdi2.S +++ b/libc/intrin/negvdi2.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__ .privileged .alignfunc diff --git a/libc/intrin/negvsi2.S b/libc/intrin/negvsi2.S index b783398d4..57390047e 100644 --- a/libc/intrin/negvsi2.S +++ b/libc/intrin/negvsi2.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__ .privileged .alignfunc diff --git a/libc/intrin/negvti2.S b/libc/intrin/negvti2.S index 73ff8b0e1..39d3af164 100644 --- a/libc/intrin/negvti2.S +++ b/libc/intrin/negvti2.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__ .privileged .alignfunc diff --git a/libc/intrin/onarithmeticoverflow.S b/libc/intrin/onarithmeticoverflow.S index 04c88004b..b1a09b546 100644 --- a/libc/intrin/onarithmeticoverflow.S +++ b/libc/intrin/onarithmeticoverflow.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" .privileged .source __FILE__ diff --git a/libc/intrin/pabsb.c b/libc/intrin/pabsb.c index c12f059b6..8eb89a384 100644 --- a/libc/intrin/pabsb.c +++ b/libc/intrin/pabsb.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/pabsb.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/pabsd.c b/libc/intrin/pabsd.c index 28825217e..d9ab15607 100644 --- a/libc/intrin/pabsd.c +++ b/libc/intrin/pabsd.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/pabsd.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/pabsw.c b/libc/intrin/pabsw.c index ff4a5ec8f..746fe000e 100644 --- a/libc/intrin/pabsw.c +++ b/libc/intrin/pabsw.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/pabsw.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/packssdw.c b/libc/intrin/packssdw.c index a0c1e6bae..13f2b8ab8 100644 --- a/libc/intrin/packssdw.c +++ b/libc/intrin/packssdw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/packssdw.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * Casts ints to shorts w/ saturation. diff --git a/libc/intrin/packsswb.c b/libc/intrin/packsswb.c index a418c2756..303164ce1 100644 --- a/libc/intrin/packsswb.c +++ b/libc/intrin/packsswb.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/packsswb.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/packusdw.c b/libc/intrin/packusdw.c index eff3e0617..000ba0e27 100644 --- a/libc/intrin/packusdw.c +++ b/libc/intrin/packusdw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/packusdw.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/packuswb.c b/libc/intrin/packuswb.c index 440fef981..7ac7d14c4 100644 --- a/libc/intrin/packuswb.c +++ b/libc/intrin/packuswb.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/packuswb.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/paddsb.c b/libc/intrin/paddsb.c index 2160458a6..7662d6d52 100644 --- a/libc/intrin/paddsb.c +++ b/libc/intrin/paddsb.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/paddsb.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/paddsw.c b/libc/intrin/paddsw.c index 38e3a31c9..25af32986 100644 --- a/libc/intrin/paddsw.c +++ b/libc/intrin/paddsw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/paddsw.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/paddusb.c b/libc/intrin/paddusb.c index bcb1435a3..72c846273 100644 --- a/libc/intrin/paddusb.c +++ b/libc/intrin/paddusb.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/paddusb.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/paddusw.c b/libc/intrin/paddusw.c index 334547ee1..7cbcdbddd 100644 --- a/libc/intrin/paddusw.c +++ b/libc/intrin/paddusw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/paddusw.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/palignr.c b/libc/intrin/palignr.c index 00cca3b32..79d73321b 100644 --- a/libc/intrin/palignr.c +++ b/libc/intrin/palignr.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/intrin/palignr.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * Overlaps vectors. diff --git a/libc/intrin/palignrs.S b/libc/intrin/palignrs.S index b33d55942..218cfce61 100644 --- a/libc/intrin/palignrs.S +++ b/libc/intrin/palignrs.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" // Jump table for palignr() with non-constexpr immediate parameter. // diff --git a/libc/intrin/phaddsw.c b/libc/intrin/phaddsw.c index 0e0267616..40fc4b697 100644 --- a/libc/intrin/phaddsw.c +++ b/libc/intrin/phaddsw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/phaddsw.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * Adds adjacent shorts w/ saturation. diff --git a/libc/intrin/phsubsw.c b/libc/intrin/phsubsw.c index 8d8c59d22..1e0f04bc5 100644 --- a/libc/intrin/phsubsw.c +++ b/libc/intrin/phsubsw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/phsubsw.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * Subtracts adjacent shorts w/ saturation. diff --git a/libc/intrin/pmaddubsw.c b/libc/intrin/pmaddubsw.c index d5d956aca..efef3092e 100644 --- a/libc/intrin/pmaddubsw.c +++ b/libc/intrin/pmaddubsw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/pmaddubsw.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/pmaxsw.c b/libc/intrin/pmaxsw.c index ae6efb9c1..75471b360 100644 --- a/libc/intrin/pmaxsw.c +++ b/libc/intrin/pmaxsw.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/pmaxsw.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/pmaxub.c b/libc/intrin/pmaxub.c index cbdcda658..be0041da3 100644 --- a/libc/intrin/pmaxub.c +++ b/libc/intrin/pmaxub.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/pmaxub.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * Returns minimum of 8-bit unsigned integers. diff --git a/libc/intrin/pminsw.c b/libc/intrin/pminsw.c index a66e61fcd..6c5e7eb6a 100644 --- a/libc/intrin/pminsw.c +++ b/libc/intrin/pminsw.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/pminsw.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/pminub.c b/libc/intrin/pminub.c index c5461536f..497c25cf5 100644 --- a/libc/intrin/pminub.c +++ b/libc/intrin/pminub.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/pminub.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * Returns minimum of 8-bit unsigned integers. diff --git a/libc/intrin/psadbw.c b/libc/intrin/psadbw.c index 76a14298c..4f77eb8c2 100644 --- a/libc/intrin/psadbw.c +++ b/libc/intrin/psadbw.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/psadbw.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * Computes sum of absolute differences. diff --git a/libc/intrin/pslldqs.S b/libc/intrin/pslldqs.S index 5c5302a7f..f3e8eb34b 100644 --- a/libc/intrin/pslldqs.S +++ b/libc/intrin/pslldqs.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" // Jump table for pslldq() with non-constexpr immediate parameter. .align 8 diff --git a/libc/intrin/psrldqs.S b/libc/intrin/psrldqs.S index 9dbae8ee3..d5b849c7e 100644 --- a/libc/intrin/psrldqs.S +++ b/libc/intrin/psrldqs.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" // Jump table for psrldq() with non-constexpr immediate parameter. .align 8 diff --git a/libc/intrin/psubsb.c b/libc/intrin/psubsb.c index 530f9e67f..934f0e9e9 100644 --- a/libc/intrin/psubsb.c +++ b/libc/intrin/psubsb.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/psubsb.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/psubsw.c b/libc/intrin/psubsw.c index 9aebdca74..0ca566ec1 100644 --- a/libc/intrin/psubsw.c +++ b/libc/intrin/psubsw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/psubsw.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/psubusb.c b/libc/intrin/psubusb.c index 5474af0c3..93d3abbd2 100644 --- a/libc/intrin/psubusb.c +++ b/libc/intrin/psubusb.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/psubusb.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/psubusw.c b/libc/intrin/psubusw.c index 7ed0e622c..560960d3c 100644 --- a/libc/intrin/psubusw.c +++ b/libc/intrin/psubusw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/psubusw.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/somanyasan.S b/libc/intrin/somanyasan.S index ec11d4366..5bd1076be 100644 --- a/libc/intrin/somanyasan.S +++ b/libc/intrin/somanyasan.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__ .rodata.cst4 diff --git a/libc/intrin/subvdi3.S b/libc/intrin/subvdi3.S index 53b464b41..a6f826590 100644 --- a/libc/intrin/subvdi3.S +++ b/libc/intrin/subvdi3.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__ .privileged .alignfunc diff --git a/libc/intrin/subvsi3.S b/libc/intrin/subvsi3.S index 8fb2a1877..99a4af1f9 100644 --- a/libc/intrin/subvsi3.S +++ b/libc/intrin/subvsi3.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__ .privileged .alignfunc diff --git a/libc/intrin/subvti3.S b/libc/intrin/subvti3.S index a85330cb4..29ed27fb3 100644 --- a/libc/intrin/subvti3.S +++ b/libc/intrin/subvti3.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__ .privileged .alignfunc diff --git a/libc/log/attachdebugger.c b/libc/log/attachdebugger.c index c86773656..1544252be 100644 --- a/libc/log/attachdebugger.c +++ b/libc/log/attachdebugger.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/calls/calls.h" #include "libc/fmt/fmt.h" #include "libc/log/gdb.h" diff --git a/libc/log/backtrace2.c b/libc/log/backtrace2.c index 8d28e0ea2..bbfac5f9b 100644 --- a/libc/log/backtrace2.c +++ b/libc/log/backtrace2.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" #include "libc/alg/bisectcarleft.internal.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/sigbits.h" diff --git a/libc/log/backtrace3.c b/libc/log/backtrace3.c index 17f5eabd2..956cefabc 100644 --- a/libc/log/backtrace3.c +++ b/libc/log/backtrace3.c @@ -23,7 +23,7 @@ #include "libc/fmt/fmt.h" #include "libc/fmt/itoa.h" #include "libc/log/backtrace.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/gc.internal.h" #include "libc/nexgen32e/stackframe.h" #include "libc/runtime/runtime.h" diff --git a/libc/log/check.h b/libc/log/check.h index f7b0b0f73..1f72317c4 100644 --- a/libc/log/check.h +++ b/libc/log/check.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_LOG_CHECK_H_ #define COSMOPOLITAN_LIBC_LOG_CHECK_H_ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /** * @fileoverview Modern assertions, courtesy of Elgoog. diff --git a/libc/log/checkfail.c b/libc/log/checkfail.c index d22d61103..3c6fca620 100644 --- a/libc/log/checkfail.c +++ b/libc/log/checkfail.c @@ -17,7 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" +#include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/dce.h" #include "libc/errno.h" diff --git a/libc/log/commandvenv.c b/libc/log/commandvenv.c index 3318908bc..5b1f10385 100644 --- a/libc/log/commandvenv.c +++ b/libc/log/commandvenv.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/calls/calls.h" #include "libc/log/log.h" #include "libc/mem/mem.h" diff --git a/libc/log/gdbexec.c b/libc/log/gdbexec.c index d1df93bf2..fc781f4ed 100644 --- a/libc/log/gdbexec.c +++ b/libc/log/gdbexec.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/calls/calls.h" #include "libc/fmt/fmt.h" #include "libc/log/gdb.h" diff --git a/libc/log/getttysize.c b/libc/log/getttysize.c index a91672310..b9ef3c65a 100644 --- a/libc/log/getttysize.c +++ b/libc/log/getttysize.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/calls/calls.h" #include "libc/calls/termios.h" #include "libc/fmt/conv.h" diff --git a/libc/log/isterminalinarticulate.c b/libc/log/isterminalinarticulate.c index b1397135f..7d302ca6b 100644 --- a/libc/log/isterminalinarticulate.c +++ b/libc/log/isterminalinarticulate.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/log/log.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/log/log.h b/libc/log/log.h index de79742ed..170153b4c 100644 --- a/libc/log/log.h +++ b/libc/log/log.h @@ -30,7 +30,7 @@ #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -extern FILE *g_logfile; +extern FILE *__log_file; void perror(const char *) relegated; /* print the last system error */ void __die(void) relegated wontreturn; /* print backtrace and abort() */ @@ -53,11 +53,11 @@ bool IsRunningUnderMake(void); ╚────────────────────────────────────────────────────────────────────────────│*/ #ifndef __STRICT_ANSI__ -extern unsigned g_loglevel; /* log level for runtime check */ +extern unsigned __log_level; /* log level for runtime check */ #define LOGGABLE(LEVEL) \ ((!__builtin_constant_p(LEVEL) || (LEVEL) <= LOGGABLELEVEL) && \ - (LEVEL) <= g_loglevel) + (LEVEL) <= __log_level) #define LOGF(FMT, ...) \ do { \ diff --git a/libc/log/logfile.initabi.c b/libc/log/logfile.initabi.c index 38ac45bd5..3e5936c3a 100644 --- a/libc/log/logfile.initabi.c +++ b/libc/log/logfile.initabi.c @@ -19,6 +19,6 @@ #include "libc/bits/initializer.internal.h" #include "libc/stdio/stdio.h" -FILE *g_logfile; +FILE *__log_file; -INITIALIZER(401, _init_g_logfile, (g_logfile = stderr)); +INITIALIZER(401, _init_log_file, (__log_file = stderr)); diff --git a/libc/log/loglevel.S b/libc/log/loglevel.S index d75e797ab..a823b7e50 100644 --- a/libc/log/loglevel.S +++ b/libc/log/loglevel.S @@ -17,16 +17,16 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ .bss .align 4 -g_loglevel: +__log_level: .long 0 - .endobj g_loglevel,globl + .endobj __log_level,globl .previous - .init.start 200,_init_g_loglevel - movb $kLogInfo,g_loglevel(%rip) - .init.end 200,_init_g_loglevel + .init.start 200,_init_log_level + movb $kLogInfo,__log_level(%rip) + .init.end 200,_init_log_level diff --git a/libc/log/oncrash.c b/libc/log/oncrash.c index b22690e24..313aed3bd 100644 --- a/libc/log/oncrash.c +++ b/libc/log/oncrash.c @@ -29,7 +29,7 @@ #include "libc/log/gdb.h" #include "libc/log/internal.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/stackframe.h" #include "libc/runtime/internal.h" #include "libc/runtime/memtrack.h" diff --git a/libc/log/oncrashthunks.S b/libc/log/oncrashthunks.S index 6f0fad31a..b5f317500 100644 --- a/libc/log/oncrashthunks.S +++ b/libc/log/oncrashthunks.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__ // These function names make it a bit more obvious which signal diff --git a/libc/log/onkill.c b/libc/log/onkill.c index a6218eeb6..f296ceca3 100644 --- a/libc/log/onkill.c +++ b/libc/log/onkill.c @@ -22,7 +22,7 @@ #include "libc/calls/struct/sigaction.h" #include "libc/dce.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" #include "libc/sysv/consts/sa.h" diff --git a/libc/log/showcrashreports.c b/libc/log/showcrashreports.c index 3c3bc65c4..d7a0b726d 100644 --- a/libc/log/showcrashreports.c +++ b/libc/log/showcrashreports.c @@ -24,7 +24,7 @@ #include "libc/log/internal.h" #include "libc/log/log.h" #include "libc/log/ubsan.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/signals.h" #include "libc/str/str.h" #include "libc/sysv/consts/sa.h" diff --git a/libc/log/somanyubsan.S b/libc/log/somanyubsan.S index d2b0b4942..9e481ef09 100644 --- a/libc/log/somanyubsan.S +++ b/libc/log/somanyubsan.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" .text.unlikely .source __FILE__ diff --git a/libc/log/thunks/__check_fail_eq.S b/libc/log/thunks/__check_fail_eq.S index 9c7e2bde2..d79ab39d3 100644 --- a/libc/log/thunks/__check_fail_eq.S +++ b/libc/log/thunks/__check_fail_eq.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" .text.unlikely .source __FILE__ diff --git a/libc/log/thunks/__check_fail_ge.S b/libc/log/thunks/__check_fail_ge.S index 14078b899..ed3f9d8d3 100644 --- a/libc/log/thunks/__check_fail_ge.S +++ b/libc/log/thunks/__check_fail_ge.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" .text.unlikely .source __FILE__ diff --git a/libc/log/thunks/__check_fail_gt.S b/libc/log/thunks/__check_fail_gt.S index 2ad94b3f9..b86c96a4d 100644 --- a/libc/log/thunks/__check_fail_gt.S +++ b/libc/log/thunks/__check_fail_gt.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" .text.unlikely .source __FILE__ diff --git a/libc/log/thunks/__check_fail_le.S b/libc/log/thunks/__check_fail_le.S index 55d62611a..e21fabf2e 100644 --- a/libc/log/thunks/__check_fail_le.S +++ b/libc/log/thunks/__check_fail_le.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" .text.unlikely .source __FILE__ diff --git a/libc/log/thunks/__check_fail_lt.S b/libc/log/thunks/__check_fail_lt.S index 6060b8ed4..ea2161ed1 100644 --- a/libc/log/thunks/__check_fail_lt.S +++ b/libc/log/thunks/__check_fail_lt.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" .text.unlikely .source __FILE__ diff --git a/libc/log/thunks/__check_fail_ndebug.S b/libc/log/thunks/__check_fail_ndebug.S index 522ed14c7..65a16c051 100644 --- a/libc/log/thunks/__check_fail_ndebug.S +++ b/libc/log/thunks/__check_fail_ndebug.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__ __check_fail_ndebug: diff --git a/libc/log/thunks/__check_fail_ne.S b/libc/log/thunks/__check_fail_ne.S index cfead6331..a0a8afbc0 100644 --- a/libc/log/thunks/__check_fail_ne.S +++ b/libc/log/thunks/__check_fail_ne.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" .text.unlikely .source __FILE__ diff --git a/libc/log/vflogf.c b/libc/log/vflogf.c index 2809abf53..32a3f2c5d 100644 --- a/libc/log/vflogf.c +++ b/libc/log/vflogf.c @@ -101,7 +101,7 @@ void(vflogf)(unsigned level, const char *file, int line, FILE *f, bool issamesecond; char buf32[32], *buf32p; int64_t secs, nsec, dots; - if (!f) f = g_logfile; + if (!f) f = __log_file; if (fileno(f) == -1) return; t2 = nowl(); secs = t2; diff --git a/libc/macros.h b/libc/macros.internal.h similarity index 100% rename from libc/macros.h rename to libc/macros.internal.h diff --git a/libc/mem/calloc.S b/libc/mem/calloc.S index 7e7175362..ded1a095f 100644 --- a/libc/mem/calloc.S +++ b/libc/mem/calloc.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/mem/cxx/free.S b/libc/mem/cxx/free.S index 417f1525c..72a92b52b 100644 --- a/libc/mem/cxx/free.S +++ b/libc/mem/cxx/free.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__ // Frees memory the C++ way. diff --git a/libc/mem/cxx/malloc.S b/libc/mem/cxx/malloc.S index 7f67f4ef9..a5e98e8cc 100644 --- a/libc/mem/cxx/malloc.S +++ b/libc/mem/cxx/malloc.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__ // Allocates memory the C++ way. diff --git a/libc/mem/cxx/memalign.S b/libc/mem/cxx/memalign.S index 5df4e079f..dded5b421 100644 --- a/libc/mem/cxx/memalign.S +++ b/libc/mem/cxx/memalign.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__ // Allocates aligned memory the C++ way. diff --git a/libc/mem/free.S b/libc/mem/free.S index 224815fde..44af4076e 100644 --- a/libc/mem/free.S +++ b/libc/mem/free.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__ // Free memory returned by malloc() & co. diff --git a/libc/mem/hook/calloc.S b/libc/mem/hook/calloc.S index 9512139d5..b2c537347 100644 --- a/libc/mem/hook/calloc.S +++ b/libc/mem/hook/calloc.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__ .initbss 202,_init_calloc diff --git a/libc/mem/hook/free.S b/libc/mem/hook/free.S index 89aca147b..e130ec1de 100644 --- a/libc/mem/hook/free.S +++ b/libc/mem/hook/free.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__ .initbss 202,_init_free diff --git a/libc/mem/hook/malloc.S b/libc/mem/hook/malloc.S index d17d2a9ff..b6df454a1 100644 --- a/libc/mem/hook/malloc.S +++ b/libc/mem/hook/malloc.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__ .initbss 202,_init_malloc diff --git a/libc/mem/hook/malloc_trim.S b/libc/mem/hook/malloc_trim.S index 82a795bfb..b98b2a647 100644 --- a/libc/mem/hook/malloc_trim.S +++ b/libc/mem/hook/malloc_trim.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__ .initbss 202,_init_malloc_trim diff --git a/libc/mem/hook/malloc_usable_size.S b/libc/mem/hook/malloc_usable_size.S index 78ce01b5d..ed8dffaff 100644 --- a/libc/mem/hook/malloc_usable_size.S +++ b/libc/mem/hook/malloc_usable_size.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__ .initbss 202,_init_malloc_usable_size diff --git a/libc/mem/hook/memalign.S b/libc/mem/hook/memalign.S index e48fd9451..70ad1bfa8 100644 --- a/libc/mem/hook/memalign.S +++ b/libc/mem/hook/memalign.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__ .initbss 202,_init_memalign diff --git a/libc/mem/hook/posix_memalign.S b/libc/mem/hook/posix_memalign.S index d928f7096..750c606b9 100644 --- a/libc/mem/hook/posix_memalign.S +++ b/libc/mem/hook/posix_memalign.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__ .initbss 202,_init_posix_memalign diff --git a/libc/mem/hook/pvalloc.S b/libc/mem/hook/pvalloc.S index 07ef0c09f..1b0f0acc4 100644 --- a/libc/mem/hook/pvalloc.S +++ b/libc/mem/hook/pvalloc.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__ .initbss 202,_init_pvalloc diff --git a/libc/mem/hook/realloc.S b/libc/mem/hook/realloc.S index d9655685b..18d0beba5 100644 --- a/libc/mem/hook/realloc.S +++ b/libc/mem/hook/realloc.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__ .initbss 202,_init_realloc diff --git a/libc/mem/hook/realloc_in_place.S b/libc/mem/hook/realloc_in_place.S index 18ebf39d3..374c6b46c 100644 --- a/libc/mem/hook/realloc_in_place.S +++ b/libc/mem/hook/realloc_in_place.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__ .initbss 202,_init_realloc_in_place diff --git a/libc/mem/hook/valloc.S b/libc/mem/hook/valloc.S index 05f75e3fe..a55cbf241 100644 --- a/libc/mem/hook/valloc.S +++ b/libc/mem/hook/valloc.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__ .initbss 202,_init_valloc diff --git a/libc/mem/malloc.S b/libc/mem/malloc.S index 9c99155a8..e678191c7 100644 --- a/libc/mem/malloc.S +++ b/libc/mem/malloc.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__ // Allocates uninitialized memory. diff --git a/libc/mem/malloc_trim.S b/libc/mem/malloc_trim.S index 0dcb648a1..873f27553 100644 --- a/libc/mem/malloc_trim.S +++ b/libc/mem/malloc_trim.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" // Releases freed memory back to system. // diff --git a/libc/mem/malloc_usable_size.S b/libc/mem/malloc_usable_size.S index f80d4264f..c534fef64 100644 --- a/libc/mem/malloc_usable_size.S +++ b/libc/mem/malloc_usable_size.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/mem/memalign.S b/libc/mem/memalign.S index 7925ef723..247046e72 100644 --- a/libc/mem/memalign.S +++ b/libc/mem/memalign.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/mem/posix_memalign.S b/libc/mem/posix_memalign.S index 6867b0e4d..f2b551d36 100644 --- a/libc/mem/posix_memalign.S +++ b/libc/mem/posix_memalign.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__ // Allocates aligned memory the POSIX way. diff --git a/libc/mem/pvalloc.S b/libc/mem/pvalloc.S index 2cc5c37d5..5f4dc422d 100644 --- a/libc/mem/pvalloc.S +++ b/libc/mem/pvalloc.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/mem/realloc.S b/libc/mem/realloc.S index 3adff627a..d0c53c378 100644 --- a/libc/mem/realloc.S +++ b/libc/mem/realloc.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/mem/realloc_in_place.S b/libc/mem/realloc_in_place.S index c8f41f8fe..ac7e5b975 100644 --- a/libc/mem/realloc_in_place.S +++ b/libc/mem/realloc_in_place.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/mem/valloc.S b/libc/mem/valloc.S index 8e11ccedc..8541aa7b7 100644 --- a/libc/mem/valloc.S +++ b/libc/mem/valloc.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/nexgen32e/bsrmax.S b/libc/nexgen32e/bsrmax.S index fb9a058b8..122133dc9 100644 --- a/libc/nexgen32e/bsrmax.S +++ b/libc/nexgen32e/bsrmax.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" // Returns binary logarithm of integer 𝑥. // diff --git a/libc/nexgen32e/bzero.S b/libc/nexgen32e/bzero.S index 0ea9cb731..6bba2d4ca 100644 --- a/libc/nexgen32e/bzero.S +++ b/libc/nexgen32e/bzero.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" // Sets memory to zero. // diff --git a/libc/nexgen32e/cescapec.S b/libc/nexgen32e/cescapec.S index 1840dfdd7..3ce5685e6 100644 --- a/libc/nexgen32e/cescapec.S +++ b/libc/nexgen32e/cescapec.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "ape/relocations.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Escapes byte for string literal. // diff --git a/libc/nexgen32e/cmpsb.S b/libc/nexgen32e/cmpsb.S index acd173e3b..025389384 100644 --- a/libc/nexgen32e/cmpsb.S +++ b/libc/nexgen32e/cmpsb.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" // Compares 8-bit signed integers. // diff --git a/libc/nexgen32e/cmpsl.S b/libc/nexgen32e/cmpsl.S index 9e0cfe21e..d0aa19924 100644 --- a/libc/nexgen32e/cmpsl.S +++ b/libc/nexgen32e/cmpsl.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" // Compares 32-bit signed integers. // diff --git a/libc/nexgen32e/cmpsq.S b/libc/nexgen32e/cmpsq.S index 54edd8004..bcb9f4048 100644 --- a/libc/nexgen32e/cmpsq.S +++ b/libc/nexgen32e/cmpsq.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" // Compares 64-bit signed integers. // diff --git a/libc/nexgen32e/cmpsw.S b/libc/nexgen32e/cmpsw.S index 021a32003..ff4a78e9f 100644 --- a/libc/nexgen32e/cmpsw.S +++ b/libc/nexgen32e/cmpsw.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" // Compares 16-bit signed integers. // diff --git a/libc/nexgen32e/cmpub.S b/libc/nexgen32e/cmpub.S index 7c949ec1b..ca848a23e 100644 --- a/libc/nexgen32e/cmpub.S +++ b/libc/nexgen32e/cmpub.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" // Compares 8-bit unsigned integers. // diff --git a/libc/nexgen32e/cmpul.S b/libc/nexgen32e/cmpul.S index 51f7cf8ff..fc4739b6c 100644 --- a/libc/nexgen32e/cmpul.S +++ b/libc/nexgen32e/cmpul.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" // Compares 32-bit unsigned integers. // diff --git a/libc/nexgen32e/cmpuq.S b/libc/nexgen32e/cmpuq.S index 1d6f348dc..9c8e30144 100644 --- a/libc/nexgen32e/cmpuq.S +++ b/libc/nexgen32e/cmpuq.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" // Compares 64-bit unsigned integers. // diff --git a/libc/nexgen32e/cmpuw.S b/libc/nexgen32e/cmpuw.S index 87a308ed9..33f59a871 100644 --- a/libc/nexgen32e/cmpuw.S +++ b/libc/nexgen32e/cmpuw.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" // Compares 16-bit unsigned integers. // diff --git a/libc/nexgen32e/crc32-pclmul.S b/libc/nexgen32e/crc32-pclmul.S index 4d75928fc..0772eb781 100644 --- a/libc/nexgen32e/crc32-pclmul.S +++ b/libc/nexgen32e/crc32-pclmul.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 w/ carryless multiply isa. // diff --git a/libc/nexgen32e/crc32init.S b/libc/nexgen32e/crc32init.S index 116129af1..30205e4c1 100644 --- a/libc/nexgen32e/crc32init.S +++ b/libc/nexgen32e/crc32init.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" // Generates lookup table for computing CRC-32 byte-by-byte. // diff --git a/libc/nexgen32e/div1000000000int64.S b/libc/nexgen32e/div1000000000int64.S index 858216968..682764355 100644 --- a/libc/nexgen32e/div1000000000int64.S +++ b/libc/nexgen32e/div1000000000int64.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" // Divides 64-bit signed integer by 1,000,000,000. // diff --git a/libc/nexgen32e/div1000000int64.S b/libc/nexgen32e/div1000000int64.S index 6fc38915c..599414c20 100644 --- a/libc/nexgen32e/div1000000int64.S +++ b/libc/nexgen32e/div1000000int64.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" // Divides 64-bit signed integer by 1,000,000. // diff --git a/libc/nexgen32e/div10000int64.S b/libc/nexgen32e/div10000int64.S index ae278b1f1..ca4dadde1 100644 --- a/libc/nexgen32e/div10000int64.S +++ b/libc/nexgen32e/div10000int64.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" // Divides 64-bit signed integer by 10,000. // diff --git a/libc/nexgen32e/div1000int64.S b/libc/nexgen32e/div1000int64.S index 4e45b971e..d74e59792 100644 --- a/libc/nexgen32e/div1000int64.S +++ b/libc/nexgen32e/div1000int64.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" // Divides 64-bit signed integer by 1,000. // diff --git a/libc/nexgen32e/div100int64.S b/libc/nexgen32e/div100int64.S index c63400ef7..f9525016b 100644 --- a/libc/nexgen32e/div100int64.S +++ b/libc/nexgen32e/div100int64.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" // Divides 64-bit signed integer by 100. // diff --git a/libc/nexgen32e/div10int64.S b/libc/nexgen32e/div10int64.S index 0cf78748e..95eb4f8a3 100644 --- a/libc/nexgen32e/div10int64.S +++ b/libc/nexgen32e/div10int64.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" // Divides 64-bit signed integer by 10. // diff --git a/libc/nexgen32e/djbsort-avx2.S b/libc/nexgen32e/djbsort-avx2.S index d653a7283..1cd7dec27 100644 --- a/libc/nexgen32e/djbsort-avx2.S +++ b/libc/nexgen32e/djbsort-avx2.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ // D.J. Bernstein's outrageously fast integer sorting algorithm. diff --git a/libc/nexgen32e/environ.S b/libc/nexgen32e/environ.S index 6f8036c43..c8b23baea 100644 --- a/libc/nexgen32e/environ.S +++ b/libc/nexgen32e/environ.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" #include "libc/notice.inc" // Environment variable pointer list. diff --git a/libc/nexgen32e/errno.S b/libc/nexgen32e/errno.S index 27e0296cf..5e51e0f96 100644 --- a/libc/nexgen32e/errno.S +++ b/libc/nexgen32e/errno.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__ // Global variable for last error. diff --git a/libc/nexgen32e/errnolocation.S b/libc/nexgen32e/errnolocation.S index 562ccb6f0..1b9ccbc0a 100644 --- a/libc/nexgen32e/errnolocation.S +++ b/libc/nexgen32e/errnolocation.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__ .keep.text # gdb needs it diff --git a/libc/nexgen32e/explicit_bzero.S b/libc/nexgen32e/explicit_bzero.S index 46166a7e0..a7ecaf8d9 100644 --- a/libc/nexgen32e/explicit_bzero.S +++ b/libc/nexgen32e/explicit_bzero.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" // Sets memory to zero w/ accompanying non-optimizing macro. // diff --git a/libc/nexgen32e/fentry.S b/libc/nexgen32e/fentry.S index 8da24a65a..297da31f3 100644 --- a/libc/nexgen32e/fentry.S +++ b/libc/nexgen32e/fentry.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" .real .source __FILE__ .code16 # ∩ .code32 ∩ .code64 diff --git a/libc/nexgen32e/ffs.S b/libc/nexgen32e/ffs.S index 503b99544..5231f070a 100644 --- a/libc/nexgen32e/ffs.S +++ b/libc/nexgen32e/ffs.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" // Finds lowest set bit in word. // diff --git a/libc/nexgen32e/ffsl.S b/libc/nexgen32e/ffsl.S index 25cef203e..f6138045d 100644 --- a/libc/nexgen32e/ffsl.S +++ b/libc/nexgen32e/ffsl.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" // Finds lowest set bit in word. // diff --git a/libc/nexgen32e/g_argv.S b/libc/nexgen32e/g_argv.S index 2946b012f..c69a3f4f2 100644 --- a/libc/nexgen32e/g_argv.S +++ b/libc/nexgen32e/g_argv.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" #include "libc/notice.inc" .initbss 300,_init_argv diff --git a/libc/nexgen32e/g_auxv.S b/libc/nexgen32e/g_auxv.S index e62ede3d8..6486b3584 100644 --- a/libc/nexgen32e/g_auxv.S +++ b/libc/nexgen32e/g_auxv.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" #include "libc/notice.inc" .initbss 300,_init_auxv diff --git a/libc/nexgen32e/gc.S b/libc/nexgen32e/gc.S index 5c2a6fee4..a337e3909 100644 --- a/libc/nexgen32e/gc.S +++ b/libc/nexgen32e/gc.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" #include "libc/dce.h" #include "libc/notice.inc" #define INITIAL_CAPACITY 4 diff --git a/libc/nexgen32e/gclongjmp.S b/libc/nexgen32e/gclongjmp.S index d248814f1..71332655a 100644 --- a/libc/nexgen32e/gclongjmp.S +++ b/libc/nexgen32e/gclongjmp.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" // Jumps up stack to previous setjmp() invocation. // diff --git a/libc/nexgen32e/identity.S b/libc/nexgen32e/identity.S index f74a3c2d1..0708c5533 100644 --- a/libc/nexgen32e/identity.S +++ b/libc/nexgen32e/identity.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" #include "libc/notice.inc" // The identity() function. diff --git a/libc/nexgen32e/imapxlatab.S b/libc/nexgen32e/imapxlatab.S index f5307dc1b..753d740aa 100644 --- a/libc/nexgen32e/imapxlatab.S +++ b/libc/nexgen32e/imapxlatab.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" .text.startup .align 8 diff --git a/libc/nexgen32e/kbase36.S b/libc/nexgen32e/kbase36.S index 7b8a9f178..4b6486adc 100644 --- a/libc/nexgen32e/kbase36.S +++ b/libc/nexgen32e/kbase36.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" // Base 36 Decoder Table. // diff --git a/libc/nexgen32e/kcp437.S b/libc/nexgen32e/kcp437.S index fa86458c2..4dbd6aca4 100644 --- a/libc/nexgen32e/kcp437.S +++ b/libc/nexgen32e/kcp437.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" .rodata .align 16 .source __FILE__ diff --git a/libc/nexgen32e/kcpuids.S b/libc/nexgen32e/kcpuids.S index e6da54be8..ddaee90eb 100644 --- a/libc/nexgen32e/kcpuids.S +++ b/libc/nexgen32e/kcpuids.S @@ -18,10 +18,11 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/kcpuids.h" #include "libc/nexgen32e/x86feature.h" + .initbss 201,_init_kCpuids // Globally precomputed CPUID. // // This module lets us check CPUID in 0.06ns rather than 51.00ns. @@ -30,7 +31,6 @@ // are quite toilsome. // // @see www.felixcloutier.com/x86/cpuid - .initbss 201,_init_kCpuids kCpuids:.long 0,0,0,0 # EAX=0 (Basic Processor Info) .long 0,0,0,0 # EAX=1 (Processor Info) .long 0,0,0,0 # EAX=2 diff --git a/libc/nexgen32e/kcrc32ctab.S b/libc/nexgen32e/kcrc32ctab.S index 0e0defa06..7ec41907e 100644 --- a/libc/nexgen32e/kcrc32ctab.S +++ b/libc/nexgen32e/kcrc32ctab.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" // Castagnoli CRC32 ISCSI Polynomial // x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1 diff --git a/libc/nexgen32e/khalfcache3.S b/libc/nexgen32e/khalfcache3.S index 4c10a7746..df3ec8a93 100644 --- a/libc/nexgen32e/khalfcache3.S +++ b/libc/nexgen32e/khalfcache3.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" .initbss 202,_init_kHalfCache3 // Half size of level 3 cache in bytes. diff --git a/libc/nexgen32e/kreversebits.S b/libc/nexgen32e/kreversebits.S index 44784c74a..293f4142c 100644 --- a/libc/nexgen32e/kreversebits.S +++ b/libc/nexgen32e/kreversebits.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" .rodata kReverseBits: diff --git a/libc/nexgen32e/ksha256tab.S b/libc/nexgen32e/ksha256tab.S index 7a9198f88..03e97828d 100644 --- a/libc/nexgen32e/ksha256tab.S +++ b/libc/nexgen32e/ksha256tab.S @@ -7,7 +7,7 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/macros.h" +#include "libc/macros.internal.h" .rodata.cst16 .align 16 diff --git a/libc/nexgen32e/ksigsetempty.S b/libc/nexgen32e/ksigsetempty.S index ee39533d7..a73f071bd 100644 --- a/libc/nexgen32e/ksigsetempty.S +++ b/libc/nexgen32e/ksigsetempty.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" // Signal mask constant w/ no signal bits set. .initbss 300,_init_kSigsetEmpty diff --git a/libc/nexgen32e/ksigsetfull.S b/libc/nexgen32e/ksigsetfull.S index 720646b86..4a973dbdb 100644 --- a/libc/nexgen32e/ksigsetfull.S +++ b/libc/nexgen32e/ksigsetfull.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" // Signal mask constant w/ every signal bit set. .initbss 300,_init_kSigsetFull diff --git a/libc/nexgen32e/kstarttsc.S b/libc/nexgen32e/kstarttsc.S index b9fe316f8..8822ae9cb 100644 --- a/libc/nexgen32e/kstarttsc.S +++ b/libc/nexgen32e/kstarttsc.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" // Stores CPU Timestamp Counter at startup. // diff --git a/libc/nexgen32e/ktolower.S b/libc/nexgen32e/ktolower.S index 68ca851d5..c75433330 100644 --- a/libc/nexgen32e/ktolower.S +++ b/libc/nexgen32e/ktolower.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" // ASCII uppercase → lowercase translation tables. // diff --git a/libc/nexgen32e/llog10.S b/libc/nexgen32e/llog10.S index fd33d641b..869f0ca29 100644 --- a/libc/nexgen32e/llog10.S +++ b/libc/nexgen32e/llog10.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" // Fast log₁₀ when 𝑥 is an integer. // diff --git a/libc/nexgen32e/loadxmm.S b/libc/nexgen32e/loadxmm.S index b9f4b07f6..24628744c 100644 --- a/libc/nexgen32e/loadxmm.S +++ b/libc/nexgen32e/loadxmm.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" .privileged // Loads XMM registers from buffer. diff --git a/libc/nexgen32e/lolendian.S b/libc/nexgen32e/lolendian.S index 7c2c54912..3b7b71686 100644 --- a/libc/nexgen32e/lolendian.S +++ b/libc/nexgen32e/lolendian.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" // @fileoverview Byte-order conversion functions. // diff --git a/libc/nexgen32e/longjmp.S b/libc/nexgen32e/longjmp.S index 323542993..45aa3f486 100644 --- a/libc/nexgen32e/longjmp.S +++ b/libc/nexgen32e/longjmp.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" .privileged // Loads previously saved processor state. diff --git a/libc/nexgen32e/lzcnt.S b/libc/nexgen32e/lzcnt.S index acce0409e..fff23114a 100644 --- a/libc/nexgen32e/lzcnt.S +++ b/libc/nexgen32e/lzcnt.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" // Finds leading bits in 𝑥. // diff --git a/libc/nexgen32e/lzcntl.S b/libc/nexgen32e/lzcntl.S index fb325614b..9fe6a7817 100644 --- a/libc/nexgen32e/lzcntl.S +++ b/libc/nexgen32e/lzcntl.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" // Finds leading bits in 𝑥. // diff --git a/libc/nexgen32e/macros.internal.inc b/libc/nexgen32e/macros.internal.inc index 0b997508d..10ff923a4 100644 --- a/libc/nexgen32e/macros.internal.inc +++ b/libc/nexgen32e/macros.internal.inc @@ -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/nexgen32e/x86feature.h" // Broadcast byte literal to vector, e.g. diff --git a/libc/nexgen32e/mcount.S b/libc/nexgen32e/mcount.S index aee886b3d..5d0653eeb 100644 --- a/libc/nexgen32e/mcount.S +++ b/libc/nexgen32e/mcount.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" .real .source __FILE__ .code16 # ∩ .code32 ∩ .code64 diff --git a/libc/nexgen32e/memcpy.S b/libc/nexgen32e/memcpy.S index b7b269117..ac9c9e35e 100644 --- a/libc/nexgen32e/memcpy.S +++ b/libc/nexgen32e/memcpy.S @@ -28,7 +28,7 @@ It's so easy that even a child could use it, and they do. */ #include "libc/nexgen32e/x86feature.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Copies memory. // diff --git a/libc/nexgen32e/memeqmask.S b/libc/nexgen32e/memeqmask.S index 2db3b5919..6276bdc97 100644 --- a/libc/nexgen32e/memeqmask.S +++ b/libc/nexgen32e/memeqmask.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" // Creates bit mask of which bytes are the same. // diff --git a/libc/nexgen32e/memjmpinit.S b/libc/nexgen32e/memjmpinit.S index 6ea6e7130..2b5ebb1e5 100644 --- a/libc/nexgen32e/memjmpinit.S +++ b/libc/nexgen32e/memjmpinit.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.startup // Initializes jump table for memset() and memcpy(). diff --git a/libc/nexgen32e/memmove.S b/libc/nexgen32e/memmove.S index 33f631437..4de34b5a5 100644 --- a/libc/nexgen32e/memmove.S +++ b/libc/nexgen32e/memmove.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" // Copies memory. // diff --git a/libc/nexgen32e/mempcpy.S b/libc/nexgen32e/mempcpy.S index 51ba0bef7..4c61b234c 100644 --- a/libc/nexgen32e/mempcpy.S +++ b/libc/nexgen32e/mempcpy.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__ // Copies memory. diff --git a/libc/nexgen32e/memrchr.S b/libc/nexgen32e/memrchr.S index 03abb4fce..b8296a37a 100644 --- a/libc/nexgen32e/memrchr.S +++ b/libc/nexgen32e/memrchr.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Searches for last instance of byte in memory region. // diff --git a/libc/nexgen32e/memrchr16.S b/libc/nexgen32e/memrchr16.S index 055ef4ad8..57dbd6a03 100644 --- a/libc/nexgen32e/memrchr16.S +++ b/libc/nexgen32e/memrchr16.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Searches for last instance of uint16_t in memory region. // diff --git a/libc/nexgen32e/memrchr32.S b/libc/nexgen32e/memrchr32.S index d30ce2c22..fbdd7937e 100644 --- a/libc/nexgen32e/memrchr32.S +++ b/libc/nexgen32e/memrchr32.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Searches for last instance of wchar_t in memory region. // diff --git a/libc/nexgen32e/memset.S b/libc/nexgen32e/memset.S index 8860123bc..e9ac3899c 100644 --- a/libc/nexgen32e/memset.S +++ b/libc/nexgen32e/memset.S @@ -22,7 +22,7 @@ which is about 110 GBps. */ #include "libc/nexgen32e/x86feature.h" #include "libc/nexgen32e/macros.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Sets memory. // diff --git a/libc/nexgen32e/missingno.S b/libc/nexgen32e/missingno.S index 9c9db5920..1bffd54b9 100644 --- a/libc/nexgen32e/missingno.S +++ b/libc/nexgen32e/missingno.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" .real .source __FILE__ .code16 # ∩ .code32 ∩ .code64 diff --git a/libc/nexgen32e/nt2sysv.S b/libc/nexgen32e/nt2sysv.S index 3ea1f369d..a01c207a8 100644 --- a/libc/nexgen32e/nt2sysv.S +++ b/libc/nexgen32e/nt2sysv.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" .text.windows // Translates function call from code built w/ MS-style compiler. diff --git a/libc/nexgen32e/program_invocation_name.S b/libc/nexgen32e/program_invocation_name.S index dd6823ea8..454fb4127 100644 --- a/libc/nexgen32e/program_invocation_name.S +++ b/libc/nexgen32e/program_invocation_name.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" // Supplies argv[0] the GNU way. .initbss 300,_init_program_invocation_name diff --git a/libc/nexgen32e/rem1000000000int64.S b/libc/nexgen32e/rem1000000000int64.S index 98a7c7de2..4a8ab74d1 100644 --- a/libc/nexgen32e/rem1000000000int64.S +++ b/libc/nexgen32e/rem1000000000int64.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" // Returns 𝑥 % 1,000,000,000. // diff --git a/libc/nexgen32e/rem1000000int64.S b/libc/nexgen32e/rem1000000int64.S index 20150445c..37fbbd573 100644 --- a/libc/nexgen32e/rem1000000int64.S +++ b/libc/nexgen32e/rem1000000int64.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" // Returns 𝑥 % 1,000,000. // diff --git a/libc/nexgen32e/rem10000int64.S b/libc/nexgen32e/rem10000int64.S index fbe793fbc..cd34b88b9 100644 --- a/libc/nexgen32e/rem10000int64.S +++ b/libc/nexgen32e/rem10000int64.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" // Returns 𝑥 % 10,000. // diff --git a/libc/nexgen32e/rem1000int64.S b/libc/nexgen32e/rem1000int64.S index 9b16a2a5a..825c1e643 100644 --- a/libc/nexgen32e/rem1000int64.S +++ b/libc/nexgen32e/rem1000int64.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" // Returns 𝑥 % 1,000. // diff --git a/libc/nexgen32e/rem100int64.S b/libc/nexgen32e/rem100int64.S index 7e1aadf50..e5566e658 100644 --- a/libc/nexgen32e/rem100int64.S +++ b/libc/nexgen32e/rem100int64.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" // Returns 𝑥 % 100. // diff --git a/libc/nexgen32e/rem10int64.S b/libc/nexgen32e/rem10int64.S index 181ac31f0..8ae95ca79 100644 --- a/libc/nexgen32e/rem10int64.S +++ b/libc/nexgen32e/rem10int64.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" // Returns 𝑥 % 10. // diff --git a/libc/nexgen32e/rldecode.S b/libc/nexgen32e/rldecode.S index 5d5cc4ded..b44fb8dae 100644 --- a/libc/nexgen32e/rldecode.S +++ b/libc/nexgen32e/rldecode.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" .text.startup // Seventeen byte decompressor. diff --git a/libc/nexgen32e/savexmm.S b/libc/nexgen32e/savexmm.S index 0bfde8c55..b6156bfb5 100644 --- a/libc/nexgen32e/savexmm.S +++ b/libc/nexgen32e/savexmm.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" .privileged // Stores XMM registers to buffer. diff --git a/libc/nexgen32e/setjmp.S b/libc/nexgen32e/setjmp.S index c29167ab6..5b3d00eb8 100644 --- a/libc/nexgen32e/setjmp.S +++ b/libc/nexgen32e/setjmp.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" // Saves caller CPU state to cacheline. // diff --git a/libc/nexgen32e/slowcall.S b/libc/nexgen32e/slowcall.S index 1bb9a54e6..755e98c17 100644 --- a/libc/nexgen32e/slowcall.S +++ b/libc/nexgen32e/slowcall.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" #include "libc/notice.inc" // Applies no-clobber guarantee to System Five function call. diff --git a/libc/nexgen32e/strcpyzbw.S b/libc/nexgen32e/strcpyzbw.S index 0d6e220d7..641ca6a94 100644 --- a/libc/nexgen32e/strcpyzbw.S +++ b/libc/nexgen32e/strcpyzbw.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" // TODO(jart): pmovzxbw and vpunpcklbw strcpyzbw: diff --git a/libc/nexgen32e/strcspn.S b/libc/nexgen32e/strcspn.S index 914389133..5c6fba29e 100644 --- a/libc/nexgen32e/strcspn.S +++ b/libc/nexgen32e/strcspn.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" // Returns prefix length, consisting of chars not in reject. // diff --git a/libc/nexgen32e/strlen.S b/libc/nexgen32e/strlen.S index f9f3c44f8..cab8bcf74 100644 --- a/libc/nexgen32e/strlen.S +++ b/libc/nexgen32e/strlen.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" // Returns length of NUL-terminated string. // diff --git a/libc/nexgen32e/strsak.S b/libc/nexgen32e/strsak.S index 94a7c83db..7789ecb51 100644 --- a/libc/nexgen32e/strsak.S +++ b/libc/nexgen32e/strsak.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" #include "libc/nexgen32e/macros.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ // Returns length of NUL-terminated string w/ security blankets. diff --git a/libc/nexgen32e/strsak16.S b/libc/nexgen32e/strsak16.S index 46ff5b335..acd0c41e0 100644 --- a/libc/nexgen32e/strsak16.S +++ b/libc/nexgen32e/strsak16.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Returns pointer to first instance of character. // diff --git a/libc/nexgen32e/strsak32.S b/libc/nexgen32e/strsak32.S index 7d30a98b2..296c84b91 100644 --- a/libc/nexgen32e/strsak32.S +++ b/libc/nexgen32e/strsak32.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Returns pointer to first instance of character. // diff --git a/libc/nexgen32e/strstr-sse42.S b/libc/nexgen32e/strstr-sse42.S index 0c884e319..1bb75db77 100644 --- a/libc/nexgen32e/strstr-sse42.S +++ b/libc/nexgen32e/strstr-sse42.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" #include "libc/nexgen32e/pcmpstr.inc" #include "libc/nexgen32e/strstr.inc" diff --git a/libc/nexgen32e/strstr16-sse42.S b/libc/nexgen32e/strstr16-sse42.S index 1d9fb474f..c72d78f27 100644 --- a/libc/nexgen32e/strstr16-sse42.S +++ b/libc/nexgen32e/strstr16-sse42.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" #include "libc/nexgen32e/pcmpstr.inc" #include "libc/nexgen32e/strstr.inc" diff --git a/libc/nexgen32e/tinydivsi.greg.S b/libc/nexgen32e/tinydivsi.greg.S index 0d4551ac9..c1d536575 100644 --- a/libc/nexgen32e/tinydivsi.greg.S +++ b/libc/nexgen32e/tinydivsi.greg.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" // Support code for fast integer division by Si units. // diff --git a/libc/nexgen32e/tinystrlen.greg.S b/libc/nexgen32e/tinystrlen.greg.S index 7b5371b69..2bb9cd236 100644 --- a/libc/nexgen32e/tinystrlen.greg.S +++ b/libc/nexgen32e/tinystrlen.greg.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" // 8-bit strlen that's tiny and near optimal if data's tiny. // diff --git a/libc/nexgen32e/tinystrlen16.greg.S b/libc/nexgen32e/tinystrlen16.greg.S index f575ae844..dafa416a0 100644 --- a/libc/nexgen32e/tinystrlen16.greg.S +++ b/libc/nexgen32e/tinystrlen16.greg.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" // 16-bit strlen that's tiny and near optimal if data's tiny. // diff --git a/libc/nexgen32e/tinystrncmp.ncabi.S b/libc/nexgen32e/tinystrncmp.ncabi.S index 270f97f14..4f1963167 100644 --- a/libc/nexgen32e/tinystrncmp.ncabi.S +++ b/libc/nexgen32e/tinystrncmp.ncabi.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" // Compares strings w/ limit & no-clobber greg abi. // diff --git a/libc/nexgen32e/tinystrnlen.greg.S b/libc/nexgen32e/tinystrnlen.greg.S index cfaf37ddf..194074291 100644 --- a/libc/nexgen32e/tinystrnlen.greg.S +++ b/libc/nexgen32e/tinystrnlen.greg.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" // 8-bit strnlen that's tiny and near optimal if data's tiny. // diff --git a/libc/nexgen32e/tinystrnlen16.greg.S b/libc/nexgen32e/tinystrnlen16.greg.S index 923466dd8..86e331817 100644 --- a/libc/nexgen32e/tinystrnlen16.greg.S +++ b/libc/nexgen32e/tinystrnlen16.greg.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" // 16-bit strnlen that's tiny and near optimal if data's tiny. // diff --git a/libc/nexgen32e/tinywcslen.greg.S b/libc/nexgen32e/tinywcslen.greg.S index 59c71f815..018590c80 100644 --- a/libc/nexgen32e/tinywcslen.greg.S +++ b/libc/nexgen32e/tinywcslen.greg.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" // 32-bit strlen that's tiny and near optimal if data's tiny. // diff --git a/libc/nexgen32e/tinywcsnlen.greg.S b/libc/nexgen32e/tinywcsnlen.greg.S index 135457cb7..cfa7c7e71 100644 --- a/libc/nexgen32e/tinywcsnlen.greg.S +++ b/libc/nexgen32e/tinywcsnlen.greg.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" // 32-bit strnlen that's tiny and near optimal if data's tiny. // diff --git a/libc/nexgen32e/tzcnt.S b/libc/nexgen32e/tzcnt.S index e22c148b6..e709d02a6 100644 --- a/libc/nexgen32e/tzcnt.S +++ b/libc/nexgen32e/tzcnt.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__ // Finds lowest set bit in 𝑥. diff --git a/libc/nexgen32e/tzcntl.S b/libc/nexgen32e/tzcntl.S index c7f2aa5e3..5d0993b35 100644 --- a/libc/nexgen32e/tzcntl.S +++ b/libc/nexgen32e/tzcntl.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" // Finds lowest set bit in 𝑥. // diff --git a/libc/nexgen32e/zip.S b/libc/nexgen32e/zip.S index 01210ec76..0d3778770 100644 --- a/libc/nexgen32e/zip.S +++ b/libc/nexgen32e/zip.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" #include "ape/relocations.h" #include "libc/zip.h" diff --git a/libc/nt/nt.mk b/libc/nt/nt.mk index 759a5073f..dfb10d2b7 100644 --- a/libc/nt/nt.mk +++ b/libc/nt/nt.mk @@ -162,7 +162,7 @@ $(LIBC_NT_NTDLL_A_OBJS): \ o/libc/nt/ntdllimport.inc: \ ape/relocations.h \ libc/nt/ntdllimport.h \ - libc/macros.h \ + libc/macros.internal.h \ libc/macros.internal.inc \ libc/macros-cpp.internal.inc diff --git a/libc/nt/ntdllimport.S b/libc/nt/ntdllimport.S index 1fd5bf04b..b0572aa7c 100644 --- a/libc/nt/ntdllimport.S +++ b/libc/nt/ntdllimport.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nt/enum/status.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // @fileoverview NTDLL.DLL Non-Mandatory Importer // diff --git a/libc/nt/ntdllimport.h b/libc/nt/ntdllimport.h index 4b2285124..170b1b04d 100644 --- a/libc/nt/ntdllimport.h +++ b/libc/nt/ntdllimport.h @@ -19,7 +19,7 @@ #ifndef COSMOPOLITAN_LIBC_NT_NTDLLIMPORT_H_ #define COSMOPOLITAN_LIBC_NT_NTDLLIMPORT_H_ #include "ape/relocations.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #ifdef __ASSEMBLER__ /* clang-format off */ diff --git a/libc/rand/g_rando.S b/libc/rand/g_rando.S index a29f2971f..ab9d3bc25 100644 --- a/libc/rand/g_rando.S +++ b/libc/rand/g_rando.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" .bss .align 8 diff --git a/libc/rand/getrandom.c b/libc/rand/getrandom.c index 95403ffe5..81464207f 100644 --- a/libc/rand/getrandom.c +++ b/libc/rand/getrandom.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/calls/internal.h" #include "libc/errno.h" #include "libc/rand/rand.h" diff --git a/libc/rand/strfry.c b/libc/rand/strfry.c index dcd2fe4ca..bcae53090 100644 --- a/libc/rand/strfry.c +++ b/libc/rand/strfry.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/alg/shuffle.h" +#include "libc/alg/shuffle.internal.h" #include "libc/rand/rand.h" #include "libc/str/str.h" diff --git a/libc/runtime/abort.S b/libc/runtime/abort.S index 1c6f64766..2d7bf3e08 100644 --- a/libc/runtime/abort.S +++ b/libc/runtime/abort.S @@ -20,7 +20,7 @@ #include "libc/runtime/internal.h" #include "libc/sysv/consts/sig.h" #include "libc/sysv/consts/nr.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .privileged // Terminates program abnormally. diff --git a/libc/runtime/assertfail.c b/libc/runtime/assertfail.c index 319c3b9e3..bfbf58ebe 100644 --- a/libc/runtime/assertfail.c +++ b/libc/runtime/assertfail.c @@ -21,7 +21,7 @@ #include "libc/bits/weaken.h" #include "libc/dce.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/alloca.h" #include "libc/nt/runtime.h" #include "libc/sysv/consts/nr.h" diff --git a/libc/runtime/brk.c b/libc/runtime/brk.c index 6e95b6841..481ae5b86 100644 --- a/libc/runtime/brk.c +++ b/libc/runtime/brk.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/prot.h" diff --git a/libc/runtime/construct.S b/libc/runtime/construct.S index 01ce4d4cd..a127b9b15 100644 --- a/libc/runtime/construct.S +++ b/libc/runtime/construct.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.startup .source __FILE__ diff --git a/libc/runtime/cosmo.S b/libc/runtime/cosmo.S index 46d25a0a4..86cac8453 100644 --- a/libc/runtime/cosmo.S +++ b/libc/runtime/cosmo.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/notice.inc" #include "libc/sysv/consts/prot.h" #include "libc/sysv/consts/map.h" diff --git a/libc/runtime/cxaatexit.c b/libc/runtime/cxaatexit.c index 444c611bd..d0e04bb03 100644 --- a/libc/runtime/cxaatexit.c +++ b/libc/runtime/cxaatexit.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/bits/weaken.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bsf.h" #include "libc/nexgen32e/bsr.h" diff --git a/libc/runtime/directmap-metal.c b/libc/runtime/directmap-metal.c index 1d751ad30..3dbaebddd 100644 --- a/libc/runtime/directmap-metal.c +++ b/libc/runtime/directmap-metal.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/directmap.internal.h" #include "libc/runtime/pc.internal.h" #include "libc/str/str.h" diff --git a/libc/runtime/directmap-nt.c b/libc/runtime/directmap-nt.c index 464fdf537..aaa69afd8 100644 --- a/libc/runtime/directmap-nt.c +++ b/libc/runtime/directmap-nt.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/enum/filemapflags.h" #include "libc/nt/enum/pageflags.h" #include "libc/nt/memory.h" diff --git a/libc/runtime/dsohandle.S b/libc/runtime/dsohandle.S index a4c9382c4..698c09d99 100644 --- a/libc/runtime/dsohandle.S +++ b/libc/runtime/dsohandle.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/runtime/efimain.greg.c b/libc/runtime/efimain.greg.c index 5737ba15b..e6ac87bc3 100644 --- a/libc/runtime/efimain.greg.c +++ b/libc/runtime/efimain.greg.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/efi.h" #include "libc/nt/thunk/msabi.h" #include "libc/runtime/e820.internal.h" diff --git a/libc/runtime/ezmap.c b/libc/runtime/ezmap.c index 90dd3f7f2..48d994bdc 100644 --- a/libc/runtime/ezmap.c +++ b/libc/runtime/ezmap.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/calls/calls.h" #include "libc/limits.h" #include "libc/runtime/ezmap.internal.h" diff --git a/libc/runtime/findcombinary.c b/libc/runtime/findcombinary.c index 6b69f1446..6aeba1bc1 100644 --- a/libc/runtime/findcombinary.c +++ b/libc/runtime/findcombinary.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/runtime/runtime.h" #include "libc/str/str.h" #include "libc/sysv/consts/auxv.h" diff --git a/libc/runtime/finddebugbinary.c b/libc/runtime/finddebugbinary.c index 3b5a37d85..9ff07c09f 100644 --- a/libc/runtime/finddebugbinary.c +++ b/libc/runtime/finddebugbinary.c @@ -17,10 +17,10 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/runtime/symbols.internal.h" #include "libc/str/str.h" diff --git a/libc/runtime/fork-nt.c b/libc/runtime/fork-nt.c index a1b8ad790..35ba46248 100644 --- a/libc/runtime/fork-nt.c +++ b/libc/runtime/fork-nt.c @@ -22,7 +22,7 @@ #include "libc/calls/internal.h" #include "libc/calls/ntspawn.h" #include "libc/fmt/itoa.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/nt2sysv.h" #include "libc/nt/dll.h" #include "libc/nt/enum/filemapflags.h" diff --git a/libc/runtime/fpreset.S b/libc/runtime/fpreset.S index b012d084f..8aad22603 100644 --- a/libc/runtime/fpreset.S +++ b/libc/runtime/fpreset.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__ // Re-initializes FPU. diff --git a/libc/runtime/ftrace-hook.S b/libc/runtime/ftrace-hook.S index da962abee..24c114ef9 100644 --- a/libc/runtime/ftrace-hook.S +++ b/libc/runtime/ftrace-hook.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" .privileged ftrace_hook: diff --git a/libc/runtime/ftrace.c b/libc/runtime/ftrace.c index 1c38e8cba..293b6b2f3 100644 --- a/libc/runtime/ftrace.c +++ b/libc/runtime/ftrace.c @@ -18,13 +18,13 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/bisectcarleft.internal.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/struct/sigset.h" #include "libc/dce.h" #include "libc/intrin/repmovsb.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/stackframe.h" #include "libc/nt/files.h" #include "libc/nt/runtime.h" diff --git a/libc/runtime/g_argc.S b/libc/runtime/g_argc.S index d824b00f0..2c4d1b213 100644 --- a/libc/runtime/g_argc.S +++ b/libc/runtime/g_argc.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" #include "libc/notice.inc" .initbss 300,_init_argc diff --git a/libc/runtime/getdosargv.c b/libc/runtime/getdosargv.c index 3dcc50427..699f1d1af 100644 --- a/libc/runtime/getdosargv.c +++ b/libc/runtime/getdosargv.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/bits/bits.h" #include "libc/bits/pushpop.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/runtime/internal.h" #include "libc/str/str.h" #include "libc/str/tpenc.h" diff --git a/libc/runtime/getpagesize.S b/libc/runtime/getpagesize.S index 4c046a464..f837fbb65 100644 --- a/libc/runtime/getpagesize.S +++ b/libc/runtime/getpagesize.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 granularity of memory manager. diff --git a/libc/runtime/grow.c b/libc/runtime/grow.c index 56c9ebb6c..6bf247c40 100644 --- a/libc/runtime/grow.c +++ b/libc/runtime/grow.c @@ -20,7 +20,7 @@ #include "libc/bits/bits.h" #include "libc/bits/weaken.h" #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/runtime/init.S b/libc/runtime/init.S index 933b680e2..c48d82549 100644 --- a/libc/runtime/init.S +++ b/libc/runtime/init.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" #include "libc/runtime/internal.h" #include "libc/sysv/consts/prot.h" #include "libc/dce.h" diff --git a/libc/runtime/interruptiblecall.c b/libc/runtime/interruptiblecall.c index 6574d45d1..e5cbd35e2 100644 --- a/libc/runtime/interruptiblecall.c +++ b/libc/runtime/interruptiblecall.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/mem/mem.h" #include "libc/runtime/interruptiblecall.h" #include "libc/runtime/runtime.h" diff --git a/libc/runtime/isheap.c b/libc/runtime/isheap.c index 770281406..9308d235a 100644 --- a/libc/runtime/isheap.c +++ b/libc/runtime/isheap.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/runtime/memtrack.h" #include "libc/runtime/runtime.h" diff --git a/libc/runtime/jmpstack.S b/libc/runtime/jmpstack.S index 04bb24681..7044ad3b1 100644 --- a/libc/runtime/jmpstack.S +++ b/libc/runtime/jmpstack.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" // Switches stack. // diff --git a/libc/runtime/memtrack.c b/libc/runtime/memtrack.c index 46a7924ab..78e8ba301 100644 --- a/libc/runtime/memtrack.c +++ b/libc/runtime/memtrack.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/memtrack.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/runtime/memtrack.h b/libc/runtime/memtrack.h index eab6a19e8..8f7e71a9b 100644 --- a/libc/runtime/memtrack.h +++ b/libc/runtime/memtrack.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_RUNTIME_MEMTRACK_H_ #define COSMOPOLITAN_LIBC_RUNTIME_MEMTRACK_H_ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/enum/version.h" #include "libc/runtime/runtime.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) diff --git a/libc/runtime/mman.greg.c b/libc/runtime/mman.greg.c index c3625bbbe..020dd7df0 100644 --- a/libc/runtime/mman.greg.c +++ b/libc/runtime/mman.greg.c @@ -35,7 +35,7 @@ #include "ape/relocations.h" #include "libc/elf/def.h" #include "libc/elf/struct/phdr.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/uart.internal.h" #include "libc/runtime/e820.internal.h" #include "libc/runtime/metalprintf.internal.h" diff --git a/libc/runtime/mmap.c b/libc/runtime/mmap.c index 671231932..3992db5c1 100644 --- a/libc/runtime/mmap.c +++ b/libc/runtime/mmap.c @@ -22,7 +22,7 @@ #include "libc/calls/internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/rand/rand.h" #include "libc/runtime/directmap.internal.h" #include "libc/runtime/memtrack.h" diff --git a/libc/runtime/msync-nt.c b/libc/runtime/msync-nt.c index 72a309b1d..51601d7ec 100644 --- a/libc/runtime/msync-nt.c +++ b/libc/runtime/msync-nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/files.h" #include "libc/nt/memory.h" #include "libc/runtime/memtrack.h" diff --git a/libc/runtime/msync.c b/libc/runtime/msync.c index 060ce9a08..fde0b2b9f 100644 --- a/libc/runtime/msync.c +++ b/libc/runtime/msync.c @@ -20,7 +20,7 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/sysv/consts/msync.h" /** diff --git a/libc/runtime/munmap.c b/libc/runtime/munmap.c index 3309882ee..0b9831702 100644 --- a/libc/runtime/munmap.c +++ b/libc/runtime/munmap.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/directmap.internal.h" #include "libc/runtime/memtrack.h" #include "libc/runtime/runtime.h" diff --git a/libc/runtime/peekall.S b/libc/runtime/peekall.S index 816290dcf..04d2ef9d0 100644 --- a/libc/runtime/peekall.S +++ b/libc/runtime/peekall.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "ape/relocations.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ // Loads all pages from program image into memory. diff --git a/libc/runtime/progname.S b/libc/runtime/progname.S index 6e0e2b20b..d10a94011 100644 --- a/libc/runtime/progname.S +++ b/libc/runtime/progname.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__ // Provides argv[0] The BSD Way. diff --git a/libc/runtime/program_invocation_short_name.S b/libc/runtime/program_invocation_short_name.S index da4c678fd..ee0c2d871 100644 --- a/libc/runtime/program_invocation_short_name.S +++ b/libc/runtime/program_invocation_short_name.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__ // Supplies basename(argv[0]) The GNU Way. diff --git a/libc/runtime/runtime.h b/libc/runtime/runtime.h index f342f4340..7e76a8aef 100644 --- a/libc/runtime/runtime.h +++ b/libc/runtime/runtime.h @@ -43,7 +43,6 @@ void exit(int) wontreturn; void _exit(int) libcesque wontreturn; void _Exit(int) libcesque wontreturn; void abort(void) wontreturn noinstrument; -void panic(void) wontreturn noinstrument privileged; void triplf(void) wontreturn noinstrument privileged; int __cxa_atexit(void *, void *, void *) libcesque; int atfork(void *, void *) libcesque; diff --git a/libc/runtime/setstack.S b/libc/runtime/setstack.S index 284766f77..fd2ae7a2f 100644 --- a/libc/runtime/setstack.S +++ b/libc/runtime/setstack.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" // Switches stack. // diff --git a/libc/runtime/untrackmemoryintervals.c b/libc/runtime/untrackmemoryintervals.c index 3db62e817..8d9dc8857 100644 --- a/libc/runtime/untrackmemoryintervals.c +++ b/libc/runtime/untrackmemoryintervals.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/memtrack.h" int UntrackMemoryIntervals(void *addr, size_t size) { diff --git a/libc/runtime/valist.c b/libc/runtime/valist.c index 06a590487..ea8e764d2 100644 --- a/libc/runtime/valist.c +++ b/libc/runtime/valist.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/runtime/valist.h" static void *__va_arg_mem(struct __va_list *ap, size_t sz, size_t align) { diff --git a/libc/runtime/vfork.S b/libc/runtime/vfork.S index db2743480..8af42732f 100644 --- a/libc/runtime/vfork.S +++ b/libc/runtime/vfork.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .privileged // Forks process without copying page tables. diff --git a/libc/runtime/weakfree.S b/libc/runtime/weakfree.S index ba0f2c5ee..d9499e271 100644 --- a/libc/runtime/weakfree.S +++ b/libc/runtime/weakfree.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__ // Thunks free() if it's linked, otherwise do nothing. diff --git a/libc/runtime/winmain.greg.c b/libc/runtime/winmain.greg.c index d3e9d2d3d..77844de97 100644 --- a/libc/runtime/winmain.greg.c +++ b/libc/runtime/winmain.greg.c @@ -22,7 +22,7 @@ #include "libc/calls/internal.h" #include "libc/dce.h" #include "libc/fmt/fmt.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/console.h" #include "libc/nt/enum/consolemodeflags.h" #include "libc/nt/enum/filemapflags.h" diff --git a/libc/sock/epoll.c b/libc/sock/epoll.c index 83da90894..b48c18030 100644 --- a/libc/sock/epoll.c +++ b/libc/sock/epoll.c @@ -37,7 +37,7 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nt/enum/accessmask.h" #include "libc/nt/enum/afd.h" diff --git a/libc/sock/iovec2nt.c b/libc/sock/iovec2nt.c index ba35fcd3a..4c0fdbf8e 100644 --- a/libc/sock/iovec2nt.c +++ b/libc/sock/iovec2nt.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/calls/struct/iovec.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/sock/internal.h" #include "libc/sysv/consts/iov.h" diff --git a/libc/sock/poll-nt.c b/libc/sock/poll-nt.c index f566a3b3d..f8318fb02 100644 --- a/libc/sock/poll-nt.c +++ b/libc/sock/poll-nt.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/calls/internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/struct/pollfd.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" diff --git a/libc/sock/select-nt.c b/libc/sock/select-nt.c index 971e27264..ba21cd6d6 100644 --- a/libc/sock/select-nt.c +++ b/libc/sock/select-nt.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/popcnt.h" #include "libc/calls/internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" diff --git a/libc/sock/sendfile.c b/libc/sock/sendfile.c index fde33bad3..fa092c5e3 100644 --- a/libc/sock/sendfile.c +++ b/libc/sock/sendfile.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/calls/calls.h" #include "libc/calls/internal.h" #include "libc/dce.h" diff --git a/libc/stdio/dirstream.c b/libc/stdio/dirstream.c index 42a9abc7c..77940a08a 100644 --- a/libc/stdio/dirstream.c +++ b/libc/stdio/dirstream.c @@ -20,7 +20,7 @@ #include "libc/calls/internal.h" #include "libc/calls/struct/dirent.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/enum/filetype.h" diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c index da3bb2bbe..cd75a500e 100644 --- a/libc/stdio/fclose.c +++ b/libc/stdio/fclose.c @@ -37,7 +37,7 @@ int fclose(FILE *f) { int rc; if (!f) return 0; - _fflushunregister(f); + __fflush_unregister(f); fflush(f); if (!f->nofree) { free_s(&f->buf); diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c index e1d45d266..7a6ceb652 100644 --- a/libc/stdio/fdopen.c +++ b/libc/stdio/fdopen.c @@ -42,7 +42,7 @@ FILE *fdopen(int fd, const char *mode) { f->size = BUFSIZ; if ((f->buf = valloc(f->size))) { if ((f->iomode & O_ACCMODE) != O_RDONLY) { - _fflushregister(f); + __fflush_register(f); } return f; } diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c index f16652593..18d120fb7 100644 --- a/libc/stdio/fflush.c +++ b/libc/stdio/fflush.c @@ -20,7 +20,7 @@ #include "libc/bits/bits.h" #include "libc/bits/pushpop.h" #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/stdio/fflush.internal.h" @@ -39,8 +39,8 @@ int fflush(FILE *f) { int res, wrote; res = 0; if (!f) { - for (i = g_fflush.handles.i; i; --i) { - if ((f = g_fflush.handles.p[i - 1])) { + for (i = __fflush.handles.i; i; --i) { + if ((f = __fflush.handles.p[i - 1])) { if ((wrote = fflush(f)) != -1) { res += wrote; } else { @@ -61,10 +61,10 @@ int fflush(FILE *f) { return res; } -textstartup int _fflushregister(FILE *f) { +textstartup int __fflush_register(FILE *f) { size_t i; struct StdioFlush *sf; - sf = &g_fflush; + sf = &__fflush; if (!sf->handles.p) { sf->handles.p = &sf->handles_initmem[0]; pushmov(&sf->handles.n, ARRAYLEN(sf->handles_initmem)); @@ -79,10 +79,10 @@ textstartup int _fflushregister(FILE *f) { return append(&sf->handles, &f); } -void _fflushunregister(FILE *f) { +void __fflush_unregister(FILE *f) { size_t i; struct StdioFlush *sf; - sf = &g_fflush; + sf = &__fflush; sf = pushpop(sf); for (i = sf->handles.i; i; --i) { if (sf->handles.p[i - 1] == f) { diff --git a/libc/stdio/fflush.internal.h b/libc/stdio/fflush.internal.h index e5c8bd710..d49156dd1 100644 --- a/libc/stdio/fflush.internal.h +++ b/libc/stdio/fflush.internal.h @@ -14,7 +14,7 @@ struct StdioFlush { FILE *handles_initmem[8]; }; -extern struct StdioFlush g_fflush; +extern struct StdioFlush __fflush hidden; COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ diff --git a/libc/stdio/g_fflush.c b/libc/stdio/flushers.c similarity index 98% rename from libc/stdio/g_fflush.c rename to libc/stdio/flushers.c index 80139bd9b..3b7c976bb 100644 --- a/libc/stdio/g_fflush.c +++ b/libc/stdio/flushers.c @@ -18,4 +18,4 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/stdio/fflush.internal.h" -struct StdioFlush g_fflush; +struct StdioFlush __fflush; diff --git a/libc/stdio/flushlbf.c b/libc/stdio/flushlbf.c index 01166e0b2..a714b2559 100644 --- a/libc/stdio/flushlbf.c +++ b/libc/stdio/flushlbf.c @@ -25,9 +25,9 @@ */ void _flushlbf(void) { int i; - for (i = 0; i < g_fflush.handles.i; ++i) { - if (g_fflush.handles.p[i]->bufmode == _IOLBF) { - fflush(g_fflush.handles.p[i]); + for (i = 0; i < __fflush.handles.i; ++i) { + if (__fflush.handles.p[i]->bufmode == _IOLBF) { + fflush(__fflush.handles.p[i]); } } } diff --git a/libc/stdio/fputs.c b/libc/stdio/fputs.c index 49c4ea2e2..cfc89ab1f 100644 --- a/libc/stdio/fputs.c +++ b/libc/stdio/fputs.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/libc/stdio/fseeko.S b/libc/stdio/fseeko.S index 76f53bf15..e9d0373e5 100644 --- a/libc/stdio/fseeko.S +++ b/libc/stdio/fseeko.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__ fseeko: jmp fseek diff --git a/libc/stdio/ftello.S b/libc/stdio/ftello.S index bec17bbf9..d763fac10 100644 --- a/libc/stdio/ftello.S +++ b/libc/stdio/ftello.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__ ftello: jmp ftell diff --git a/libc/stdio/g_stdio.c b/libc/stdio/g_stdio.c deleted file mode 100644 index 17b477495..000000000 --- a/libc/stdio/g_stdio.c +++ /dev/null @@ -1,21 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/stdio/internal.h" - -hidden FILE g_stdio[3]; diff --git a/libc/stdio/get_current_dir_name.c b/libc/stdio/get_current_dir_name.c index 005973750..f9fdd0bdf 100644 --- a/libc/stdio/get_current_dir_name.c +++ b/libc/stdio/get_current_dir_name.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/calls/calls.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/libc/stdio/getc.S b/libc/stdio/getc.S index 82adab4c1..a86ec2b7e 100644 --- a/libc/stdio/getc.S +++ b/libc/stdio/getc.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/stdio/getchar.S b/libc/stdio/getchar.S index b46fcee44..f65c831ac 100644 --- a/libc/stdio/getchar.S +++ b/libc/stdio/getchar.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__ // Reads uint8_t from standard input. diff --git a/libc/stdio/getdelim.c b/libc/stdio/getdelim.c index 6cbf0252a..8001703ec 100644 --- a/libc/stdio/getdelim.c +++ b/libc/stdio/getdelim.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/errno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" diff --git a/libc/stdio/getwc.S b/libc/stdio/getwc.S index 4d3911ff6..3f22a614b 100644 --- a/libc/stdio/getwc.S +++ b/libc/stdio/getwc.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__ getwc: jmp fgetwc diff --git a/libc/stdio/getwchar.S b/libc/stdio/getwchar.S index 358f7eee9..a51d8f41c 100644 --- a/libc/stdio/getwchar.S +++ b/libc/stdio/getwchar.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__ // Reads Thompson-Pike encoded varint from standard input. diff --git a/libc/stdio/internal.h b/libc/stdio/internal.h index 745b94a0a..d70e7e51e 100644 --- a/libc/stdio/internal.h +++ b/libc/stdio/internal.h @@ -4,13 +4,12 @@ #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -extern FILE g_stdio[3]; extern unsigned char g_stdinbuf[BUFSIZ]; extern unsigned char g_stdoutbuf[BUFSIZ]; extern unsigned char g_stderrbuf[BUFSIZ]; -int _fflushregister(FILE *) hidden; -void _fflushunregister(FILE *) hidden; +int __fflush_register(FILE *) hidden; +void __fflush_unregister(FILE *) hidden; int __freadbuf(FILE *) hidden; int __fwritebuf(FILE *) hidden; diff --git a/libc/stdio/putc.S b/libc/stdio/putc.S index 69c8e8a1b..27fd1cd38 100644 --- a/libc/stdio/putc.S +++ b/libc/stdio/putc.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__ putc: jmp fputc diff --git a/libc/stdio/putwc.S b/libc/stdio/putwc.S index a2d5f31d1..de67ea0ee 100644 --- a/libc/stdio/putwc.S +++ b/libc/stdio/putwc.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__ // Writes wide character to stream. diff --git a/libc/stdio/g_stdbuf.c b/libc/stdio/stdbuf.c similarity index 100% rename from libc/stdio/g_stdbuf.c rename to libc/stdio/stdbuf.c diff --git a/libc/stdio/g_stderr_init.S b/libc/stdio/stderr-init.S similarity index 93% rename from libc/stdio/g_stderr_init.S rename to libc/stdio/stderr-init.S index 156805c74..373a98ab8 100644 --- a/libc/stdio/g_stderr_init.S +++ b/libc/stdio/stderr-init.S @@ -20,22 +20,22 @@ #include "libc/dce.h" #include "libc/calls/calls.h" #include "libc/sysv/consts/fileno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ - .init.start 400,_init_g_stderr - ezlea g_stderr,ax + .init.start 400,_init_stderr + ezlea __stderr,ax push $_IOLBF pop (%rax) #→ f.fd push STDERR_FILENO pop 12(%rax) mov O_WRONLY,%edx mov %edx,4(%rax) #→ f.iomode - ezlea g_stderr_buf,cx + ezlea __stderr_buf,cx mov %rcx,24(%rax) #→ f.buf movl $BUFSIZ,32(%rax) #→ f.size ezlea __fwritebuf,cx mov %rcx,%rdx mov %rdx,48(%rax) #→ f.writer mov %rax,stderr(%rip) - .init.end 400,_init_g_stderr,globl,hidden + .init.end 400,_init_stderr,globl,hidden diff --git a/libc/stdio/g_stderr.c b/libc/stdio/stderr.c similarity index 89% rename from libc/stdio/g_stderr.c rename to libc/stdio/stderr.c index 6b1de57ad..9529789e3 100644 --- a/libc/stdio/g_stderr.c +++ b/libc/stdio/stderr.c @@ -19,18 +19,18 @@ #include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" -STATIC_YOINK("_init_g_stderr"); +STATIC_YOINK("_init_stderr"); /** * Pointer to standard error stream. */ FILE *stderr; -hidden FILE g_stderr; -hidden unsigned char g_stderr_buf[BUFSIZ]; +hidden FILE __stderr; +hidden unsigned char __stderr_buf[BUFSIZ]; -static textstartup void _init_g_stderr2() { - _fflushregister(stderr); +static textstartup void __stderr_init() { + __fflush_register(stderr); } -const void *const g_stderr_ctor[] initarray = {_init_g_stderr2}; +const void *const __stderr_ctor[] initarray = {__stderr_init}; diff --git a/libc/stdio/g_stdin_init.S b/libc/stdio/stdin-init.S similarity index 93% rename from libc/stdio/g_stdin_init.S rename to libc/stdio/stdin-init.S index ffd34bc83..8f05aa1f8 100644 --- a/libc/stdio/g_stdin_init.S +++ b/libc/stdio/stdin-init.S @@ -20,18 +20,18 @@ #include "libc/dce.h" #include "libc/calls/calls.h" #include "libc/sysv/consts/fileno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ - .init.start 400,_init_g_stdin - ezlea g_stdin,ax + .init.start 400,_init_stdin + ezlea __stdin,ax mov O_RDONLY,%edx mov %edx,4(%rax) #→ f.iomode - ezlea g_stdin_buf,cx + ezlea __stdin_buf,cx mov %rcx,24(%rax) #→ f.buf movl $BUFSIZ,32(%rax) #→ f.size ezlea __freadbuf,cx mov %rcx,%rdx mov %rdx,40(%rax) #→ f.reader mov %rax,stdin(%rip) - .init.end 400,_init_g_stdin,globl,hidden + .init.end 400,_init_stdin,globl,hidden diff --git a/libc/stdio/g_stdin.c b/libc/stdio/stdin.c similarity index 89% rename from libc/stdio/g_stdin.c rename to libc/stdio/stdin.c index ae5329940..716a0b613 100644 --- a/libc/stdio/g_stdin.c +++ b/libc/stdio/stdin.c @@ -19,18 +19,18 @@ #include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" -STATIC_YOINK("_init_g_stdin"); +STATIC_YOINK("_init_stdin"); /** * Pointer to standard input stream. */ FILE *stdin; -hidden FILE g_stdin; -hidden unsigned char g_stdin_buf[BUFSIZ]; +hidden FILE __stdin; +hidden unsigned char __stdin_buf[BUFSIZ]; -static textstartup void g_stdin_init() { - _fflushregister(stdin); +static textstartup void __stdin_init() { + __fflush_register(stdin); } -const void *const g_stdin_ctor[] initarray = {g_stdin_init}; +const void *const __stdin_ctor[] initarray = {__stdin_init}; diff --git a/libc/stdio/g_stdout_init.S b/libc/stdio/stdout-init.S similarity index 93% rename from libc/stdio/g_stdout_init.S rename to libc/stdio/stdout-init.S index 37a145568..39b1f5d1a 100644 --- a/libc/stdio/g_stdout_init.S +++ b/libc/stdio/stdout-init.S @@ -20,20 +20,20 @@ #include "libc/dce.h" #include "libc/calls/calls.h" #include "libc/sysv/consts/fileno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ - .init.start 400,_init_g_stdout - ezlea g_stdout,ax + .init.start 400,_init_stdout + ezlea __stdout,ax push STDOUT_FILENO pop 12(%rax) #→ f.fd mov O_WRONLY,%edx mov %edx,4(%rax) #→ f.iomode - ezlea g_stdout_buf,cx + ezlea __stdout_buf,cx mov %rcx,24(%rax) #→ f.buf movl $BUFSIZ,32(%rax) #→ f.size ezlea __fwritebuf,cx mov %rcx,%rdx mov %rdx,48(%rax) #→ f.writer mov %rax,stdout(%rip) - .init.end 400,_init_g_stdout,globl,hidden + .init.end 400,_init_stdout,globl,hidden diff --git a/libc/stdio/g_stdout.c b/libc/stdio/stdout.c similarity index 90% rename from libc/stdio/g_stdout.c rename to libc/stdio/stdout.c index 761fd2f42..41227ad12 100644 --- a/libc/stdio/g_stdout.c +++ b/libc/stdio/stdout.c @@ -22,24 +22,24 @@ #include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" -STATIC_YOINK("_init_g_stdout"); +STATIC_YOINK("_init_stdout"); /** * Pointer to standard output stream. */ FILE *stdout; -hidden FILE g_stdout; -hidden unsigned char g_stdout_buf[BUFSIZ]; +hidden FILE __stdout; +hidden unsigned char __stdout_buf[BUFSIZ]; -static textstartup void _init_g_stdout2() { +static textstartup void __stdout_init() { struct FILE *sf; sf = stdout; asm("" : "+r"(sf)); if (IsWindows() || ischardev(pushpop(sf->fd))) { sf->bufmode = _IOLBF; } - _fflushregister(sf); + __fflush_register(sf); } -const void *const g_stdout_ctor[] initarray = {_init_g_stdout2}; +const void *const __stdout_ctor[] initarray = {__stdout_init}; diff --git a/libc/stdio/unlocked/clearerr_unlocked.S b/libc/stdio/unlocked/clearerr_unlocked.S index 11b144644..a1da35482 100644 --- a/libc/stdio/unlocked/clearerr_unlocked.S +++ b/libc/stdio/unlocked/clearerr_unlocked.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__ clearerr_unlocked: diff --git a/libc/stdio/unlocked/feof_unlocked.S b/libc/stdio/unlocked/feof_unlocked.S index 331399387..a3a80c1a2 100644 --- a/libc/stdio/unlocked/feof_unlocked.S +++ b/libc/stdio/unlocked/feof_unlocked.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__ feof_unlocked: diff --git a/libc/stdio/unlocked/ferror_unlocked.S b/libc/stdio/unlocked/ferror_unlocked.S index 5eaf65a4a..e6598fbe6 100644 --- a/libc/stdio/unlocked/ferror_unlocked.S +++ b/libc/stdio/unlocked/ferror_unlocked.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__ ferror_unlocked: diff --git a/libc/stdio/unlocked/fflush_unlocked.S b/libc/stdio/unlocked/fflush_unlocked.S index a8cf74638..280d08028 100644 --- a/libc/stdio/unlocked/fflush_unlocked.S +++ b/libc/stdio/unlocked/fflush_unlocked.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__ fflush_unlocked: diff --git a/libc/stdio/unlocked/fgetc_unlocked.S b/libc/stdio/unlocked/fgetc_unlocked.S index 99790f224..f4c77bc31 100644 --- a/libc/stdio/unlocked/fgetc_unlocked.S +++ b/libc/stdio/unlocked/fgetc_unlocked.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__ fgetc_unlocked: diff --git a/libc/stdio/unlocked/fgets_unlocked.S b/libc/stdio/unlocked/fgets_unlocked.S index a70b32470..7521d8c4f 100644 --- a/libc/stdio/unlocked/fgets_unlocked.S +++ b/libc/stdio/unlocked/fgets_unlocked.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__ fgets_unlocked: diff --git a/libc/stdio/unlocked/fgetwc_unlocked.S b/libc/stdio/unlocked/fgetwc_unlocked.S index 4e482afaf..52bbb7a9a 100644 --- a/libc/stdio/unlocked/fgetwc_unlocked.S +++ b/libc/stdio/unlocked/fgetwc_unlocked.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__ fgetwc_unlocked: diff --git a/libc/stdio/unlocked/fgetws_unlocked.S b/libc/stdio/unlocked/fgetws_unlocked.S index 06f180415..02b1dd7e5 100644 --- a/libc/stdio/unlocked/fgetws_unlocked.S +++ b/libc/stdio/unlocked/fgetws_unlocked.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__ fgetws_unlocked: diff --git a/libc/stdio/unlocked/fileno_unlocked.S b/libc/stdio/unlocked/fileno_unlocked.S index 5d7321602..f90be6127 100644 --- a/libc/stdio/unlocked/fileno_unlocked.S +++ b/libc/stdio/unlocked/fileno_unlocked.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__ fileno_unlocked: diff --git a/libc/stdio/unlocked/fputc_unlocked.S b/libc/stdio/unlocked/fputc_unlocked.S index 6128e9d0e..7c357889f 100644 --- a/libc/stdio/unlocked/fputc_unlocked.S +++ b/libc/stdio/unlocked/fputc_unlocked.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__ fputc_unlocked: diff --git a/libc/stdio/unlocked/fputs_unlocked.S b/libc/stdio/unlocked/fputs_unlocked.S index b888c221a..2adf21027 100644 --- a/libc/stdio/unlocked/fputs_unlocked.S +++ b/libc/stdio/unlocked/fputs_unlocked.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__ fputs_unlocked: diff --git a/libc/stdio/unlocked/fputwc_unlocked.S b/libc/stdio/unlocked/fputwc_unlocked.S index fdc91f6af..1b505fab9 100644 --- a/libc/stdio/unlocked/fputwc_unlocked.S +++ b/libc/stdio/unlocked/fputwc_unlocked.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__ fputwc_unlocked: diff --git a/libc/stdio/unlocked/fputws_unlocked.S b/libc/stdio/unlocked/fputws_unlocked.S index 60d784296..611be6abd 100644 --- a/libc/stdio/unlocked/fputws_unlocked.S +++ b/libc/stdio/unlocked/fputws_unlocked.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__ fputws_unlocked: diff --git a/libc/stdio/unlocked/fread_unlocked.S b/libc/stdio/unlocked/fread_unlocked.S index 59c160a39..3cbb06159 100644 --- a/libc/stdio/unlocked/fread_unlocked.S +++ b/libc/stdio/unlocked/fread_unlocked.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__ fread_unlocked: diff --git a/libc/stdio/unlocked/fwrite_unlocked.S b/libc/stdio/unlocked/fwrite_unlocked.S index d4b0490ee..d296e2837 100644 --- a/libc/stdio/unlocked/fwrite_unlocked.S +++ b/libc/stdio/unlocked/fwrite_unlocked.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__ fwrite_unlocked: diff --git a/libc/stdio/unlocked/getc_unlocked.S b/libc/stdio/unlocked/getc_unlocked.S index 91116401b..1d6e9c75e 100644 --- a/libc/stdio/unlocked/getc_unlocked.S +++ b/libc/stdio/unlocked/getc_unlocked.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__ getc_unlocked: diff --git a/libc/stdio/unlocked/getchar_unlocked.S b/libc/stdio/unlocked/getchar_unlocked.S index 3eaeb59c2..ebb6b764a 100644 --- a/libc/stdio/unlocked/getchar_unlocked.S +++ b/libc/stdio/unlocked/getchar_unlocked.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__ getchar_unlocked: diff --git a/libc/stdio/unlocked/getwc_unlocked.S b/libc/stdio/unlocked/getwc_unlocked.S index 1c73921d3..a02438707 100644 --- a/libc/stdio/unlocked/getwc_unlocked.S +++ b/libc/stdio/unlocked/getwc_unlocked.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__ getwc_unlocked: diff --git a/libc/stdio/unlocked/getwchar_unlocked.S b/libc/stdio/unlocked/getwchar_unlocked.S index 4a3f770da..bb6710a50 100644 --- a/libc/stdio/unlocked/getwchar_unlocked.S +++ b/libc/stdio/unlocked/getwchar_unlocked.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__ getwchar_unlocked: diff --git a/libc/stdio/unlocked/putc_unlocked.S b/libc/stdio/unlocked/putc_unlocked.S index 1cc02367b..842d740e7 100644 --- a/libc/stdio/unlocked/putc_unlocked.S +++ b/libc/stdio/unlocked/putc_unlocked.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__ putc_unlocked: diff --git a/libc/stdio/unlocked/putchar_unlocked.S b/libc/stdio/unlocked/putchar_unlocked.S index b2346255b..df0b807e9 100644 --- a/libc/stdio/unlocked/putchar_unlocked.S +++ b/libc/stdio/unlocked/putchar_unlocked.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__ putchar_unlocked: diff --git a/libc/stdio/unlocked/putwc_unlocked.S b/libc/stdio/unlocked/putwc_unlocked.S index 6a0f53126..3890a2d6b 100644 --- a/libc/stdio/unlocked/putwc_unlocked.S +++ b/libc/stdio/unlocked/putwc_unlocked.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__ putwc_unlocked: diff --git a/libc/stdio/unlocked/putwchar_unlocked.S b/libc/stdio/unlocked/putwchar_unlocked.S index f29bca0bf..5e7f38eb5 100644 --- a/libc/stdio/unlocked/putwchar_unlocked.S +++ b/libc/stdio/unlocked/putwchar_unlocked.S @@ -17,7 +17,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__ putwchar_unlocked: diff --git a/libc/str/crc32.S b/libc/str/crc32.S index ecb11a82a..889dd400e 100644 --- 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. // diff --git a/libc/str/crc32c.S b/libc/str/crc32c.S index 12d1f6153..85af9effd 100644 --- 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" diff --git a/libc/str/crc32z.c b/libc/str/crc32z.c index 19259aeb0..683e5f7bd 100644 --- 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" diff --git a/libc/str/iswctype.c b/libc/str/iswctype.c index d78f7e49a..531f40228 100644 --- 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 diff --git a/libc/str/kx86processormodels.c b/libc/str/kx86processormodels.c index 53845ed75..bfaa5a1e6 100644 --- 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[] = { diff --git a/libc/str/mbtowc.c b/libc/str/mbtowc.c index 8e5160f40..7c923f4f7 100644 --- 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" diff --git a/libc/str/rindex.S b/libc/str/rindex.S index 7f5bf723f..3fb36e2d3 100644 --- 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. diff --git a/libc/str/strcmp8to16i.internal.h b/libc/str/strcmp8to16i.internal.h index 7841377cc..bf065b6b8 100644 --- 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" diff --git a/libc/str/strlcat.c b/libc/str/strlcat.c index 44ce1878a..79d77919c 100644 --- 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" /** diff --git a/libc/str/strlcpy.c b/libc/str/strlcpy.c index 03af3f0f9..05eafaf07 100644 --- 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" /** diff --git a/libc/str/strsignal.c b/libc/str/strsignal.c index dbd16f8e3..a999c589d 100644 --- 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"; diff --git a/libc/str/tpenc.S b/libc/str/tpenc.S index c4aa9fca9..542d3dc81 100644 --- 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. diff --git a/libc/str/undeflate.c b/libc/str/undeflate.c index b79ed1e5a..d849417d2 100644 --- 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" diff --git a/libc/stubs/abort.S b/libc/stubs/abort.S index 446c05870..a6b47d083 100644 --- a/libc/stubs/abort.S +++ b/libc/stubs/abort.S @@ -26,6 +26,6 @@ // @mode long,legacy,real abort: push %bp mov %sp,%bp - rlcall panic + rlcall __panic int3 .endfn abort,weak diff --git a/libc/stubs/assertfail.S b/libc/stubs/assertfail.S index 18edb1e52..fa791e228 100644 --- a/libc/stubs/assertfail.S +++ b/libc/stubs/assertfail.S @@ -30,6 +30,6 @@ __assert_fail: int3 push %bp mov %sp,%bp - rlcall panic + rlcall __panic int3 .endfn __assert_fail,weak diff --git a/libc/stubs/cxapurevirtual.S b/libc/stubs/cxapurevirtual.S index 680b59255..ec4b0e191 100644 --- a/libc/stubs/cxapurevirtual.S +++ b/libc/stubs/cxapurevirtual.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__ // Did you call a virtual method from a destructor? diff --git a/libc/stubs/debugbreak.S b/libc/stubs/debugbreak.S index 1d0f0104a..ffe0aae5a 100644 --- a/libc/stubs/debugbreak.S +++ b/libc/stubs/debugbreak.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" .real .source __FILE__ .code16 # ∩ .code32 ∩ .code64 diff --git a/libc/stubs/gcov.S b/libc/stubs/gcov.S index c653c414d..a934fc37a 100644 --- a/libc/stubs/gcov.S +++ b/libc/stubs/gcov.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__ // Magic words to unbreak build if GCOV flags are passed. diff --git a/libc/stubs/instrumentation.S b/libc/stubs/instrumentation.S index 18014f9b8..f7654bbfa 100644 --- a/libc/stubs/instrumentation.S +++ b/libc/stubs/instrumentation.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__ // @fileoverview Function Instrumentation No-Op Runtime diff --git a/libc/stubs/panic.S b/libc/stubs/panic.S index 883aa05af..daa19b4d6 100644 --- a/libc/stubs/panic.S +++ b/libc/stubs/panic.S @@ -16,17 +16,18 @@ │ 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" .real .source __FILE__ .code16 # ∩ .code32 ∩ .code64 // Aborts or hard blocks instruction pointer. // @mode long,legacy,real -panic: push %bp +__panic: + push %bp mov %sp,%bp .softicebp cli 1: hlt jmp 1b - .endfn panic,weak + .endfn __panic,weak diff --git a/libc/stubs/retpoline.S b/libc/stubs/retpoline.S index ecdd42bf1..3e3330b59 100644 --- a/libc/stubs/retpoline.S +++ b/libc/stubs/retpoline.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" // See -mfunction-return=thunk __x86_return_thunk: diff --git a/libc/stubs/stackchkguard.S b/libc/stubs/stackchkguard.S index 1667a19db..ef31ac6d8 100644 --- a/libc/stubs/stackchkguard.S +++ b/libc/stubs/stackchkguard.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" #include "libc/notice.inc" .source __FILE__ diff --git a/libc/stubs/typeinfo.S b/libc/stubs/typeinfo.S index f1e09b707..89124acd0 100644 --- a/libc/stubs/typeinfo.S +++ b/libc/stubs/typeinfo.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__ // __cxxabiv1::__function_type_info (?) diff --git a/libc/stubs/xnu.S b/libc/stubs/xnu.S index 68ed799af..83506016e 100644 --- a/libc/stubs/xnu.S +++ b/libc/stubs/xnu.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__ _xnu: ud2 diff --git a/libc/sysv/consts/syscon.internal.h b/libc/sysv/consts/syscon.internal.h index 3fe31d090..25ee8337f 100644 --- a/libc/sysv/consts/syscon.internal.h +++ b/libc/sysv/consts/syscon.internal.h @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .macro .syscon group:req name:req linux:req xnu:req freebsd:req openbsd:req netbsd:req windows:req yoink _init_systemfive diff --git a/libc/sysv/errfuns/e2big.S b/libc/sysv/errfuns/e2big.S index c897e2060..a68faf687 100644 --- a/libc/sysv/errfuns/e2big.S +++ b/libc/sysv/errfuns/e2big.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely e2big: .leafprologue diff --git a/libc/sysv/errfuns/eacces.S b/libc/sysv/errfuns/eacces.S index c44933cfc..4c9bdab5c 100644 --- a/libc/sysv/errfuns/eacces.S +++ b/libc/sysv/errfuns/eacces.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eacces: .leafprologue diff --git a/libc/sysv/errfuns/eaddrinuse.S b/libc/sysv/errfuns/eaddrinuse.S index b5f98231e..d6085da6c 100644 --- a/libc/sysv/errfuns/eaddrinuse.S +++ b/libc/sysv/errfuns/eaddrinuse.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eaddrinuse: diff --git a/libc/sysv/errfuns/eaddrnotavail.S b/libc/sysv/errfuns/eaddrnotavail.S index 81ff87bd2..590893053 100644 --- a/libc/sysv/errfuns/eaddrnotavail.S +++ b/libc/sysv/errfuns/eaddrnotavail.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eaddrnotavail: diff --git a/libc/sysv/errfuns/eadv.S b/libc/sysv/errfuns/eadv.S index 98f7e5c30..a29be6ad8 100644 --- a/libc/sysv/errfuns/eadv.S +++ b/libc/sysv/errfuns/eadv.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eadv: .leafprologue diff --git a/libc/sysv/errfuns/eafnosupport.S b/libc/sysv/errfuns/eafnosupport.S index 23b73cf5b..8eb3fd1e6 100644 --- a/libc/sysv/errfuns/eafnosupport.S +++ b/libc/sysv/errfuns/eafnosupport.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eafnosupport: diff --git a/libc/sysv/errfuns/eagain.S b/libc/sysv/errfuns/eagain.S index cc58aec97..28e7464c1 100644 --- a/libc/sysv/errfuns/eagain.S +++ b/libc/sysv/errfuns/eagain.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eagain: .leafprologue diff --git a/libc/sysv/errfuns/ealready.S b/libc/sysv/errfuns/ealready.S index e9a0c7c3c..34921de3d 100644 --- a/libc/sysv/errfuns/ealready.S +++ b/libc/sysv/errfuns/ealready.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ealready: diff --git a/libc/sysv/errfuns/ebade.S b/libc/sysv/errfuns/ebade.S index 6bb9f353f..d736ef2a0 100644 --- a/libc/sysv/errfuns/ebade.S +++ b/libc/sysv/errfuns/ebade.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ebade: .leafprologue diff --git a/libc/sysv/errfuns/ebadf.S b/libc/sysv/errfuns/ebadf.S index a2fffa1b7..b07b871e6 100644 --- a/libc/sysv/errfuns/ebadf.S +++ b/libc/sysv/errfuns/ebadf.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ebadf: .leafprologue diff --git a/libc/sysv/errfuns/ebadfd.S b/libc/sysv/errfuns/ebadfd.S index 0e574a88c..f81b9725e 100644 --- a/libc/sysv/errfuns/ebadfd.S +++ b/libc/sysv/errfuns/ebadfd.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ebadfd: .leafprologue diff --git a/libc/sysv/errfuns/ebadmsg.S b/libc/sysv/errfuns/ebadmsg.S index 6ba760beb..8d95e7381 100644 --- a/libc/sysv/errfuns/ebadmsg.S +++ b/libc/sysv/errfuns/ebadmsg.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ebadmsg: diff --git a/libc/sysv/errfuns/ebadr.S b/libc/sysv/errfuns/ebadr.S index 5480f5129..69cbfbbe6 100644 --- a/libc/sysv/errfuns/ebadr.S +++ b/libc/sysv/errfuns/ebadr.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ebadr: .leafprologue diff --git a/libc/sysv/errfuns/ebadrqc.S b/libc/sysv/errfuns/ebadrqc.S index 4298c9087..0a955024a 100644 --- a/libc/sysv/errfuns/ebadrqc.S +++ b/libc/sysv/errfuns/ebadrqc.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ebadrqc: diff --git a/libc/sysv/errfuns/ebadslt.S b/libc/sysv/errfuns/ebadslt.S index bba860a0c..a32b67f81 100644 --- a/libc/sysv/errfuns/ebadslt.S +++ b/libc/sysv/errfuns/ebadslt.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ebadslt: diff --git a/libc/sysv/errfuns/ebusy.S b/libc/sysv/errfuns/ebusy.S index edebc47fd..064ef7fa5 100644 --- a/libc/sysv/errfuns/ebusy.S +++ b/libc/sysv/errfuns/ebusy.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ebusy: .leafprologue diff --git a/libc/sysv/errfuns/ecanceled.S b/libc/sysv/errfuns/ecanceled.S index 6ca71ea47..cfacf15ed 100644 --- a/libc/sysv/errfuns/ecanceled.S +++ b/libc/sysv/errfuns/ecanceled.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ecanceled: diff --git a/libc/sysv/errfuns/echild.S b/libc/sysv/errfuns/echild.S index a2f10ed42..a276788e9 100644 --- a/libc/sysv/errfuns/echild.S +++ b/libc/sysv/errfuns/echild.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely echild: .leafprologue diff --git a/libc/sysv/errfuns/echrng.S b/libc/sysv/errfuns/echrng.S index 29a8a092c..ef21edf0e 100644 --- a/libc/sysv/errfuns/echrng.S +++ b/libc/sysv/errfuns/echrng.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely echrng: .leafprologue diff --git a/libc/sysv/errfuns/ecomm.S b/libc/sysv/errfuns/ecomm.S index b256f9c33..18d5f0f45 100644 --- a/libc/sysv/errfuns/ecomm.S +++ b/libc/sysv/errfuns/ecomm.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ecomm: .leafprologue diff --git a/libc/sysv/errfuns/econnaborted.S b/libc/sysv/errfuns/econnaborted.S index 687b2bda5..40bce5cf8 100644 --- a/libc/sysv/errfuns/econnaborted.S +++ b/libc/sysv/errfuns/econnaborted.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely econnaborted: diff --git a/libc/sysv/errfuns/econnrefused.S b/libc/sysv/errfuns/econnrefused.S index 9065beb39..f63ff40ae 100644 --- a/libc/sysv/errfuns/econnrefused.S +++ b/libc/sysv/errfuns/econnrefused.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely econnrefused: diff --git a/libc/sysv/errfuns/econnreset.S b/libc/sysv/errfuns/econnreset.S index 1d5f4afab..41916df81 100644 --- a/libc/sysv/errfuns/econnreset.S +++ b/libc/sysv/errfuns/econnreset.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely econnreset: diff --git a/libc/sysv/errfuns/edeadlk.S b/libc/sysv/errfuns/edeadlk.S index 2ec5d81d7..fac28d473 100644 --- a/libc/sysv/errfuns/edeadlk.S +++ b/libc/sysv/errfuns/edeadlk.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely edeadlk: diff --git a/libc/sysv/errfuns/edestaddrreq.S b/libc/sysv/errfuns/edestaddrreq.S index 400aabed6..d395ecded 100644 --- a/libc/sysv/errfuns/edestaddrreq.S +++ b/libc/sysv/errfuns/edestaddrreq.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely edestaddrreq: diff --git a/libc/sysv/errfuns/edom.S b/libc/sysv/errfuns/edom.S index 35cf7b3cd..2981c5002 100644 --- a/libc/sysv/errfuns/edom.S +++ b/libc/sysv/errfuns/edom.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely edom: .leafprologue diff --git a/libc/sysv/errfuns/edotdot.S b/libc/sysv/errfuns/edotdot.S index ef5cad2bd..8995b7b27 100644 --- a/libc/sysv/errfuns/edotdot.S +++ b/libc/sysv/errfuns/edotdot.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely edotdot: diff --git a/libc/sysv/errfuns/edquot.S b/libc/sysv/errfuns/edquot.S index 01bfce66c..f8952ead0 100644 --- a/libc/sysv/errfuns/edquot.S +++ b/libc/sysv/errfuns/edquot.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely edquot: .leafprologue diff --git a/libc/sysv/errfuns/eexist.S b/libc/sysv/errfuns/eexist.S index 6fe7e525a..63d376c65 100644 --- a/libc/sysv/errfuns/eexist.S +++ b/libc/sysv/errfuns/eexist.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eexist: .leafprologue diff --git a/libc/sysv/errfuns/efault.S b/libc/sysv/errfuns/efault.S index 6f77c7eb6..a96bb91bb 100644 --- a/libc/sysv/errfuns/efault.S +++ b/libc/sysv/errfuns/efault.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely efault: .leafprologue diff --git a/libc/sysv/errfuns/efbig.S b/libc/sysv/errfuns/efbig.S index 07cc1e719..b54c708e1 100644 --- a/libc/sysv/errfuns/efbig.S +++ b/libc/sysv/errfuns/efbig.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely efbig: .leafprologue diff --git a/libc/sysv/errfuns/ehostdown.S b/libc/sysv/errfuns/ehostdown.S index 34916f595..353efb7d3 100644 --- a/libc/sysv/errfuns/ehostdown.S +++ b/libc/sysv/errfuns/ehostdown.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ehostdown: diff --git a/libc/sysv/errfuns/ehostunreach.S b/libc/sysv/errfuns/ehostunreach.S index abebdfa11..822ebf203 100644 --- a/libc/sysv/errfuns/ehostunreach.S +++ b/libc/sysv/errfuns/ehostunreach.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ehostunreach: diff --git a/libc/sysv/errfuns/ehwpoison.S b/libc/sysv/errfuns/ehwpoison.S index c62f349ce..4a802b07f 100644 --- a/libc/sysv/errfuns/ehwpoison.S +++ b/libc/sysv/errfuns/ehwpoison.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ehwpoison: diff --git a/libc/sysv/errfuns/eidrm.S b/libc/sysv/errfuns/eidrm.S index a0012a17f..7d8559b39 100644 --- a/libc/sysv/errfuns/eidrm.S +++ b/libc/sysv/errfuns/eidrm.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eidrm: .leafprologue diff --git a/libc/sysv/errfuns/eilseq.S b/libc/sysv/errfuns/eilseq.S index 83c094f6b..ce61f2d5e 100644 --- a/libc/sysv/errfuns/eilseq.S +++ b/libc/sysv/errfuns/eilseq.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eilseq: .leafprologue diff --git a/libc/sysv/errfuns/einprogress.S b/libc/sysv/errfuns/einprogress.S index ba8565c2d..382cfdacd 100644 --- a/libc/sysv/errfuns/einprogress.S +++ b/libc/sysv/errfuns/einprogress.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely einprogress: diff --git a/libc/sysv/errfuns/eintr.S b/libc/sysv/errfuns/eintr.S index ae9586a59..cc85d0861 100644 --- a/libc/sysv/errfuns/eintr.S +++ b/libc/sysv/errfuns/eintr.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eintr: .leafprologue diff --git a/libc/sysv/errfuns/einval.S b/libc/sysv/errfuns/einval.S index 524b377f2..76c4c3cfa 100644 --- a/libc/sysv/errfuns/einval.S +++ b/libc/sysv/errfuns/einval.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely einval: .leafprologue diff --git a/libc/sysv/errfuns/eio.S b/libc/sysv/errfuns/eio.S index 7c3a77e1e..b1c6039f1 100644 --- a/libc/sysv/errfuns/eio.S +++ b/libc/sysv/errfuns/eio.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eio: .leafprologue diff --git a/libc/sysv/errfuns/eisconn.S b/libc/sysv/errfuns/eisconn.S index 237e28ea5..59ecc99fd 100644 --- a/libc/sysv/errfuns/eisconn.S +++ b/libc/sysv/errfuns/eisconn.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eisconn: diff --git a/libc/sysv/errfuns/eisdir.S b/libc/sysv/errfuns/eisdir.S index 60569871e..6b98de9c1 100644 --- a/libc/sysv/errfuns/eisdir.S +++ b/libc/sysv/errfuns/eisdir.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eisdir: .leafprologue diff --git a/libc/sysv/errfuns/eisnam.S b/libc/sysv/errfuns/eisnam.S index 770d4d1fa..228efd6b6 100644 --- a/libc/sysv/errfuns/eisnam.S +++ b/libc/sysv/errfuns/eisnam.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eisnam: .leafprologue diff --git a/libc/sysv/errfuns/ekeyexpired.S b/libc/sysv/errfuns/ekeyexpired.S index 2de69c5cc..f7c5eaf1d 100644 --- a/libc/sysv/errfuns/ekeyexpired.S +++ b/libc/sysv/errfuns/ekeyexpired.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ekeyexpired: diff --git a/libc/sysv/errfuns/ekeyrejected.S b/libc/sysv/errfuns/ekeyrejected.S index e1037488c..e2fa25a9d 100644 --- a/libc/sysv/errfuns/ekeyrejected.S +++ b/libc/sysv/errfuns/ekeyrejected.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ekeyrejected: diff --git a/libc/sysv/errfuns/ekeyrevoked.S b/libc/sysv/errfuns/ekeyrevoked.S index c22dfedb0..86a6e1dfa 100644 --- a/libc/sysv/errfuns/ekeyrevoked.S +++ b/libc/sysv/errfuns/ekeyrevoked.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely ekeyrevoked: diff --git a/libc/sysv/errfuns/el2hlt.S b/libc/sysv/errfuns/el2hlt.S index 2b5d46bdd..73e8d895e 100644 --- a/libc/sysv/errfuns/el2hlt.S +++ b/libc/sysv/errfuns/el2hlt.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely el2hlt: .leafprologue diff --git a/libc/sysv/errfuns/el2nsync.S b/libc/sysv/errfuns/el2nsync.S index f38613191..dcf62b85e 100644 --- a/libc/sysv/errfuns/el2nsync.S +++ b/libc/sysv/errfuns/el2nsync.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely el2nsync: diff --git a/libc/sysv/errfuns/el3hlt.S b/libc/sysv/errfuns/el3hlt.S index c24f2d43e..103ab8ddb 100644 --- a/libc/sysv/errfuns/el3hlt.S +++ b/libc/sysv/errfuns/el3hlt.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely el3hlt: .leafprologue diff --git a/libc/sysv/errfuns/el3rst.S b/libc/sysv/errfuns/el3rst.S index 2dd7efb27..7e51df535 100644 --- a/libc/sysv/errfuns/el3rst.S +++ b/libc/sysv/errfuns/el3rst.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely el3rst: .leafprologue diff --git a/libc/sysv/errfuns/elibacc.S b/libc/sysv/errfuns/elibacc.S index 5c3368d3c..d17542dce 100644 --- a/libc/sysv/errfuns/elibacc.S +++ b/libc/sysv/errfuns/elibacc.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely elibacc: diff --git a/libc/sysv/errfuns/elibbad.S b/libc/sysv/errfuns/elibbad.S index 2c5ac7285..8abe0bb51 100644 --- a/libc/sysv/errfuns/elibbad.S +++ b/libc/sysv/errfuns/elibbad.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely elibbad: diff --git a/libc/sysv/errfuns/elibexec.S b/libc/sysv/errfuns/elibexec.S index 996db5e0d..f28be8fdd 100644 --- a/libc/sysv/errfuns/elibexec.S +++ b/libc/sysv/errfuns/elibexec.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely elibexec: diff --git a/libc/sysv/errfuns/elibmax.S b/libc/sysv/errfuns/elibmax.S index 2ec5bd914..607093b3a 100644 --- a/libc/sysv/errfuns/elibmax.S +++ b/libc/sysv/errfuns/elibmax.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely elibmax: diff --git a/libc/sysv/errfuns/elibscn.S b/libc/sysv/errfuns/elibscn.S index b996f70e2..c1b28eeb3 100644 --- a/libc/sysv/errfuns/elibscn.S +++ b/libc/sysv/errfuns/elibscn.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely elibscn: diff --git a/libc/sysv/errfuns/elnrng.S b/libc/sysv/errfuns/elnrng.S index aa57cf5a3..b7693fb06 100644 --- a/libc/sysv/errfuns/elnrng.S +++ b/libc/sysv/errfuns/elnrng.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely elnrng: .leafprologue diff --git a/libc/sysv/errfuns/eloop.S b/libc/sysv/errfuns/eloop.S index d8708bd58..6fdc0c4fa 100644 --- a/libc/sysv/errfuns/eloop.S +++ b/libc/sysv/errfuns/eloop.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eloop: .leafprologue diff --git a/libc/sysv/errfuns/emediumtype.S b/libc/sysv/errfuns/emediumtype.S index 886b0b4ca..40db57330 100644 --- a/libc/sysv/errfuns/emediumtype.S +++ b/libc/sysv/errfuns/emediumtype.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely emediumtype: diff --git a/libc/sysv/errfuns/emfile.S b/libc/sysv/errfuns/emfile.S index 9972d4830..eff8409c3 100644 --- a/libc/sysv/errfuns/emfile.S +++ b/libc/sysv/errfuns/emfile.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely emfile: .leafprologue diff --git a/libc/sysv/errfuns/emlink.S b/libc/sysv/errfuns/emlink.S index e8cd47f3f..5b3b21d93 100644 --- a/libc/sysv/errfuns/emlink.S +++ b/libc/sysv/errfuns/emlink.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely emlink: .leafprologue diff --git a/libc/sysv/errfuns/emsgsize.S b/libc/sysv/errfuns/emsgsize.S index 00c7362d0..46231a27f 100644 --- a/libc/sysv/errfuns/emsgsize.S +++ b/libc/sysv/errfuns/emsgsize.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely emsgsize: diff --git a/libc/sysv/errfuns/emultihop.S b/libc/sysv/errfuns/emultihop.S index ae6682b54..b91426f36 100644 --- a/libc/sysv/errfuns/emultihop.S +++ b/libc/sysv/errfuns/emultihop.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely emultihop: diff --git a/libc/sysv/errfuns/enametoolong.S b/libc/sysv/errfuns/enametoolong.S index 4e5f5425f..a5829366d 100644 --- a/libc/sysv/errfuns/enametoolong.S +++ b/libc/sysv/errfuns/enametoolong.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enametoolong: diff --git a/libc/sysv/errfuns/enavail.S b/libc/sysv/errfuns/enavail.S index ac0e2c8a2..521f690c5 100644 --- a/libc/sysv/errfuns/enavail.S +++ b/libc/sysv/errfuns/enavail.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enavail: diff --git a/libc/sysv/errfuns/enetdown.S b/libc/sysv/errfuns/enetdown.S index ccf5100ef..118aa6030 100644 --- a/libc/sysv/errfuns/enetdown.S +++ b/libc/sysv/errfuns/enetdown.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enetdown: diff --git a/libc/sysv/errfuns/enetreset.S b/libc/sysv/errfuns/enetreset.S index 36a662b9d..88ec850fd 100644 --- a/libc/sysv/errfuns/enetreset.S +++ b/libc/sysv/errfuns/enetreset.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enetreset: diff --git a/libc/sysv/errfuns/enetunreach.S b/libc/sysv/errfuns/enetunreach.S index 9210508c1..a9d905e16 100644 --- a/libc/sysv/errfuns/enetunreach.S +++ b/libc/sysv/errfuns/enetunreach.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enetunreach: diff --git a/libc/sysv/errfuns/enfile.S b/libc/sysv/errfuns/enfile.S index 90115f4a7..eb2acb5f5 100644 --- a/libc/sysv/errfuns/enfile.S +++ b/libc/sysv/errfuns/enfile.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enfile: .leafprologue diff --git a/libc/sysv/errfuns/enoano.S b/libc/sysv/errfuns/enoano.S index 4d44cb3bf..f67174be0 100644 --- a/libc/sysv/errfuns/enoano.S +++ b/libc/sysv/errfuns/enoano.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enoano: .leafprologue diff --git a/libc/sysv/errfuns/enobufs.S b/libc/sysv/errfuns/enobufs.S index 69550b426..cf9fbab58 100644 --- a/libc/sysv/errfuns/enobufs.S +++ b/libc/sysv/errfuns/enobufs.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enobufs: diff --git a/libc/sysv/errfuns/enocsi.S b/libc/sysv/errfuns/enocsi.S index d883cb1b3..62b180e9b 100644 --- a/libc/sysv/errfuns/enocsi.S +++ b/libc/sysv/errfuns/enocsi.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enocsi: .leafprologue diff --git a/libc/sysv/errfuns/enodata.S b/libc/sysv/errfuns/enodata.S index 0e1bf0f4d..ce83cd690 100644 --- a/libc/sysv/errfuns/enodata.S +++ b/libc/sysv/errfuns/enodata.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enodata: diff --git a/libc/sysv/errfuns/enodev.S b/libc/sysv/errfuns/enodev.S index 8c5af55cb..31cf7ea10 100644 --- a/libc/sysv/errfuns/enodev.S +++ b/libc/sysv/errfuns/enodev.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enodev: .leafprologue diff --git a/libc/sysv/errfuns/enoent.S b/libc/sysv/errfuns/enoent.S index 5ca757308..e454d29a5 100644 --- a/libc/sysv/errfuns/enoent.S +++ b/libc/sysv/errfuns/enoent.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enoent: .leafprologue diff --git a/libc/sysv/errfuns/enoexec.S b/libc/sysv/errfuns/enoexec.S index 88fdd4fd4..f3ef662ba 100644 --- a/libc/sysv/errfuns/enoexec.S +++ b/libc/sysv/errfuns/enoexec.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enoexec: diff --git a/libc/sysv/errfuns/enokey.S b/libc/sysv/errfuns/enokey.S index 5cff9fba3..2dee4cd3c 100644 --- a/libc/sysv/errfuns/enokey.S +++ b/libc/sysv/errfuns/enokey.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enokey: .leafprologue diff --git a/libc/sysv/errfuns/enolck.S b/libc/sysv/errfuns/enolck.S index 0ec786544..fc535dc1f 100644 --- a/libc/sysv/errfuns/enolck.S +++ b/libc/sysv/errfuns/enolck.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enolck: .leafprologue diff --git a/libc/sysv/errfuns/enolink.S b/libc/sysv/errfuns/enolink.S index 99aa12cff..30d71fca4 100644 --- a/libc/sysv/errfuns/enolink.S +++ b/libc/sysv/errfuns/enolink.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enolink: diff --git a/libc/sysv/errfuns/enomedium.S b/libc/sysv/errfuns/enomedium.S index 33e54d916..6788bb69c 100644 --- a/libc/sysv/errfuns/enomedium.S +++ b/libc/sysv/errfuns/enomedium.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enomedium: diff --git a/libc/sysv/errfuns/enomem.S b/libc/sysv/errfuns/enomem.S index 3fe375087..6830592d7 100644 --- a/libc/sysv/errfuns/enomem.S +++ b/libc/sysv/errfuns/enomem.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enomem: .leafprologue diff --git a/libc/sysv/errfuns/enomsg.S b/libc/sysv/errfuns/enomsg.S index 757aea3a1..e20dbe123 100644 --- a/libc/sysv/errfuns/enomsg.S +++ b/libc/sysv/errfuns/enomsg.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enomsg: .leafprologue diff --git a/libc/sysv/errfuns/enonet.S b/libc/sysv/errfuns/enonet.S index d8082af4e..483b81c40 100644 --- a/libc/sysv/errfuns/enonet.S +++ b/libc/sysv/errfuns/enonet.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enonet: .leafprologue diff --git a/libc/sysv/errfuns/enopkg.S b/libc/sysv/errfuns/enopkg.S index 1f26a26e4..ab0a56c3e 100644 --- a/libc/sysv/errfuns/enopkg.S +++ b/libc/sysv/errfuns/enopkg.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enopkg: .leafprologue diff --git a/libc/sysv/errfuns/enoprotoopt.S b/libc/sysv/errfuns/enoprotoopt.S index d67e48117..a10c0d1a3 100644 --- a/libc/sysv/errfuns/enoprotoopt.S +++ b/libc/sysv/errfuns/enoprotoopt.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enoprotoopt: diff --git a/libc/sysv/errfuns/enospc.S b/libc/sysv/errfuns/enospc.S index 6a3452d0d..226af4802 100644 --- a/libc/sysv/errfuns/enospc.S +++ b/libc/sysv/errfuns/enospc.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enospc: .leafprologue diff --git a/libc/sysv/errfuns/enosr.S b/libc/sysv/errfuns/enosr.S index 4f94e2276..6f81fa5db 100644 --- a/libc/sysv/errfuns/enosr.S +++ b/libc/sysv/errfuns/enosr.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enosr: .leafprologue diff --git a/libc/sysv/errfuns/enostr.S b/libc/sysv/errfuns/enostr.S index 008ebf243..56d80b562 100644 --- a/libc/sysv/errfuns/enostr.S +++ b/libc/sysv/errfuns/enostr.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enostr: .leafprologue diff --git a/libc/sysv/errfuns/enosys.S b/libc/sysv/errfuns/enosys.S index 89da367e4..5b17c8dd0 100644 --- a/libc/sysv/errfuns/enosys.S +++ b/libc/sysv/errfuns/enosys.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enosys: .leafprologue diff --git a/libc/sysv/errfuns/enotblk.S b/libc/sysv/errfuns/enotblk.S index 943c87e7a..142230a34 100644 --- a/libc/sysv/errfuns/enotblk.S +++ b/libc/sysv/errfuns/enotblk.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotblk: diff --git a/libc/sysv/errfuns/enotconn.S b/libc/sysv/errfuns/enotconn.S index c1010f103..9203834fa 100644 --- a/libc/sysv/errfuns/enotconn.S +++ b/libc/sysv/errfuns/enotconn.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotconn: diff --git a/libc/sysv/errfuns/enotdir.S b/libc/sysv/errfuns/enotdir.S index e204f3926..7f81664ae 100644 --- a/libc/sysv/errfuns/enotdir.S +++ b/libc/sysv/errfuns/enotdir.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotdir: diff --git a/libc/sysv/errfuns/enotempty.S b/libc/sysv/errfuns/enotempty.S index 20ed8e516..2bbbbe454 100644 --- a/libc/sysv/errfuns/enotempty.S +++ b/libc/sysv/errfuns/enotempty.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotempty: diff --git a/libc/sysv/errfuns/enotnam.S b/libc/sysv/errfuns/enotnam.S index 23628f84f..097f1520e 100644 --- a/libc/sysv/errfuns/enotnam.S +++ b/libc/sysv/errfuns/enotnam.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotnam: diff --git a/libc/sysv/errfuns/enotrecoverable.S b/libc/sysv/errfuns/enotrecoverable.S index dcffb12e0..d50bd8ac8 100644 --- a/libc/sysv/errfuns/enotrecoverable.S +++ b/libc/sysv/errfuns/enotrecoverable.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotrecoverable: diff --git a/libc/sysv/errfuns/enotsock.S b/libc/sysv/errfuns/enotsock.S index b917618ee..cf6ce3b16 100644 --- a/libc/sysv/errfuns/enotsock.S +++ b/libc/sysv/errfuns/enotsock.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotsock: diff --git a/libc/sysv/errfuns/enotsup.S b/libc/sysv/errfuns/enotsup.S index a64b84acd..4ea31b101 100644 --- a/libc/sysv/errfuns/enotsup.S +++ b/libc/sysv/errfuns/enotsup.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotsup: diff --git a/libc/sysv/errfuns/enotty.S b/libc/sysv/errfuns/enotty.S index a53172d23..5710e3eba 100644 --- a/libc/sysv/errfuns/enotty.S +++ b/libc/sysv/errfuns/enotty.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotty: .leafprologue diff --git a/libc/sysv/errfuns/enotuniq.S b/libc/sysv/errfuns/enotuniq.S index d361c48e1..212db238a 100644 --- a/libc/sysv/errfuns/enotuniq.S +++ b/libc/sysv/errfuns/enotuniq.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enotuniq: diff --git a/libc/sysv/errfuns/enxio.S b/libc/sysv/errfuns/enxio.S index ec2a8a23e..b6a1cd05c 100644 --- a/libc/sysv/errfuns/enxio.S +++ b/libc/sysv/errfuns/enxio.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely enxio: .leafprologue diff --git a/libc/sysv/errfuns/eopnotsupp.S b/libc/sysv/errfuns/eopnotsupp.S index 0312b76c1..1cb69fbda 100644 --- a/libc/sysv/errfuns/eopnotsupp.S +++ b/libc/sysv/errfuns/eopnotsupp.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eopnotsupp: diff --git a/libc/sysv/errfuns/eoverflow.S b/libc/sysv/errfuns/eoverflow.S index 5d63b71ce..4f92fbd51 100644 --- a/libc/sysv/errfuns/eoverflow.S +++ b/libc/sysv/errfuns/eoverflow.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eoverflow: diff --git a/libc/sysv/errfuns/eownerdead.S b/libc/sysv/errfuns/eownerdead.S index 5c4845ac5..bd8841f19 100644 --- a/libc/sysv/errfuns/eownerdead.S +++ b/libc/sysv/errfuns/eownerdead.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eownerdead: diff --git a/libc/sysv/errfuns/eperm.S b/libc/sysv/errfuns/eperm.S index 9e1719ddc..dd01b6f20 100644 --- a/libc/sysv/errfuns/eperm.S +++ b/libc/sysv/errfuns/eperm.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eperm: .leafprologue diff --git a/libc/sysv/errfuns/epfnosupport.S b/libc/sysv/errfuns/epfnosupport.S index dade790f0..c3c8b53c4 100644 --- a/libc/sysv/errfuns/epfnosupport.S +++ b/libc/sysv/errfuns/epfnosupport.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely epfnosupport: diff --git a/libc/sysv/errfuns/epipe.S b/libc/sysv/errfuns/epipe.S index f0eb5a088..605075589 100644 --- a/libc/sysv/errfuns/epipe.S +++ b/libc/sysv/errfuns/epipe.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely epipe: .leafprologue diff --git a/libc/sysv/errfuns/eproto.S b/libc/sysv/errfuns/eproto.S index 65ac042cb..e92a3d627 100644 --- a/libc/sysv/errfuns/eproto.S +++ b/libc/sysv/errfuns/eproto.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eproto: .leafprologue diff --git a/libc/sysv/errfuns/eprotonosupport.S b/libc/sysv/errfuns/eprotonosupport.S index 2968aae49..72eaf04ac 100644 --- a/libc/sysv/errfuns/eprotonosupport.S +++ b/libc/sysv/errfuns/eprotonosupport.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eprotonosupport: diff --git a/libc/sysv/errfuns/eprototype.S b/libc/sysv/errfuns/eprototype.S index 78cefc6c9..a5991f155 100644 --- a/libc/sysv/errfuns/eprototype.S +++ b/libc/sysv/errfuns/eprototype.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eprototype: diff --git a/libc/sysv/errfuns/erange.S b/libc/sysv/errfuns/erange.S index fd72d11ae..2f4100027 100644 --- a/libc/sysv/errfuns/erange.S +++ b/libc/sysv/errfuns/erange.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely erange: .leafprologue diff --git a/libc/sysv/errfuns/eremchg.S b/libc/sysv/errfuns/eremchg.S index 3f681ebef..3a32d3122 100644 --- a/libc/sysv/errfuns/eremchg.S +++ b/libc/sysv/errfuns/eremchg.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eremchg: diff --git a/libc/sysv/errfuns/eremote.S b/libc/sysv/errfuns/eremote.S index ee74ad589..e59f60d58 100644 --- a/libc/sysv/errfuns/eremote.S +++ b/libc/sysv/errfuns/eremote.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eremote: diff --git a/libc/sysv/errfuns/eremoteio.S b/libc/sysv/errfuns/eremoteio.S index a57e5f308..de0bae9ab 100644 --- a/libc/sysv/errfuns/eremoteio.S +++ b/libc/sysv/errfuns/eremoteio.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eremoteio: diff --git a/libc/sysv/errfuns/erestart.S b/libc/sysv/errfuns/erestart.S index d06e1f01b..86332af1f 100644 --- a/libc/sysv/errfuns/erestart.S +++ b/libc/sysv/errfuns/erestart.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely erestart: diff --git a/libc/sysv/errfuns/erfkill.S b/libc/sysv/errfuns/erfkill.S index ae50849c2..bed98ca59 100644 --- a/libc/sysv/errfuns/erfkill.S +++ b/libc/sysv/errfuns/erfkill.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely erfkill: diff --git a/libc/sysv/errfuns/erofs.S b/libc/sysv/errfuns/erofs.S index c3e08ca66..ddedebc92 100644 --- a/libc/sysv/errfuns/erofs.S +++ b/libc/sysv/errfuns/erofs.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely erofs: .leafprologue diff --git a/libc/sysv/errfuns/eshutdown.S b/libc/sysv/errfuns/eshutdown.S index 225826f9a..2cbe5943f 100644 --- a/libc/sysv/errfuns/eshutdown.S +++ b/libc/sysv/errfuns/eshutdown.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eshutdown: diff --git a/libc/sysv/errfuns/esocktnosupport.S b/libc/sysv/errfuns/esocktnosupport.S index bedd8787c..03d7e2c8d 100644 --- a/libc/sysv/errfuns/esocktnosupport.S +++ b/libc/sysv/errfuns/esocktnosupport.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely esocktnosupport: diff --git a/libc/sysv/errfuns/espipe.S b/libc/sysv/errfuns/espipe.S index 8de24fafb..79fe0c90c 100644 --- a/libc/sysv/errfuns/espipe.S +++ b/libc/sysv/errfuns/espipe.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely espipe: .leafprologue diff --git a/libc/sysv/errfuns/esrch.S b/libc/sysv/errfuns/esrch.S index 234b1efcb..d4dd14a4f 100644 --- a/libc/sysv/errfuns/esrch.S +++ b/libc/sysv/errfuns/esrch.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely esrch: .leafprologue diff --git a/libc/sysv/errfuns/esrmnt.S b/libc/sysv/errfuns/esrmnt.S index f5b84b310..794a4e7f7 100644 --- a/libc/sysv/errfuns/esrmnt.S +++ b/libc/sysv/errfuns/esrmnt.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely esrmnt: .leafprologue diff --git a/libc/sysv/errfuns/estale.S b/libc/sysv/errfuns/estale.S index 333c02be2..b89c58594 100644 --- a/libc/sysv/errfuns/estale.S +++ b/libc/sysv/errfuns/estale.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely estale: .leafprologue diff --git a/libc/sysv/errfuns/estrpipe.S b/libc/sysv/errfuns/estrpipe.S index 7808a4131..15156b25f 100644 --- a/libc/sysv/errfuns/estrpipe.S +++ b/libc/sysv/errfuns/estrpipe.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely estrpipe: diff --git a/libc/sysv/errfuns/etime.S b/libc/sysv/errfuns/etime.S index 69025d515..4ab7872b4 100644 --- a/libc/sysv/errfuns/etime.S +++ b/libc/sysv/errfuns/etime.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely etime: .leafprologue diff --git a/libc/sysv/errfuns/etimedout.S b/libc/sysv/errfuns/etimedout.S index d15262aff..10260ecaf 100644 --- a/libc/sysv/errfuns/etimedout.S +++ b/libc/sysv/errfuns/etimedout.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely etimedout: diff --git a/libc/sysv/errfuns/etoomanyrefs.S b/libc/sysv/errfuns/etoomanyrefs.S index 676bec0fc..28fd32b54 100644 --- a/libc/sysv/errfuns/etoomanyrefs.S +++ b/libc/sysv/errfuns/etoomanyrefs.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely etoomanyrefs: diff --git a/libc/sysv/errfuns/etxtbsy.S b/libc/sysv/errfuns/etxtbsy.S index a27147162..75ce6c84b 100644 --- a/libc/sysv/errfuns/etxtbsy.S +++ b/libc/sysv/errfuns/etxtbsy.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely etxtbsy: diff --git a/libc/sysv/errfuns/euclean.S b/libc/sysv/errfuns/euclean.S index 75d572593..1f960a7e9 100644 --- a/libc/sysv/errfuns/euclean.S +++ b/libc/sysv/errfuns/euclean.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely euclean: diff --git a/libc/sysv/errfuns/eunatch.S b/libc/sysv/errfuns/eunatch.S index bea1f37ce..a88f75f72 100644 --- a/libc/sysv/errfuns/eunatch.S +++ b/libc/sysv/errfuns/eunatch.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eunatch: diff --git a/libc/sysv/errfuns/eusers.S b/libc/sysv/errfuns/eusers.S index de6b3e7be..57c71de1a 100644 --- a/libc/sysv/errfuns/eusers.S +++ b/libc/sysv/errfuns/eusers.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely eusers: .leafprologue diff --git a/libc/sysv/errfuns/exdev.S b/libc/sysv/errfuns/exdev.S index 030ff5396..b0a43ec5c 100644 --- a/libc/sysv/errfuns/exdev.S +++ b/libc/sysv/errfuns/exdev.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely exdev: .leafprologue diff --git a/libc/sysv/errfuns/exfull.S b/libc/sysv/errfuns/exfull.S index 5a0365af6..aa552dec8 100644 --- a/libc/sysv/errfuns/exfull.S +++ b/libc/sysv/errfuns/exfull.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" .text.unlikely exfull: .leafprologue diff --git a/libc/sysv/g_syscount.S b/libc/sysv/g_syscount.S index a30297ebf..65bf841a2 100644 --- a/libc/sysv/g_syscount.S +++ b/libc/sysv/g_syscount.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__ // RII System Five system call counter. diff --git a/libc/sysv/gen.sh b/libc/sysv/gen.sh index 3d24ee7e3..b450111cd 100644 --- a/libc/sysv/gen.sh +++ b/libc/sysv/gen.sh @@ -46,7 +46,7 @@ errfun() { NAME="$1" ERRNO="$2" { - printf '#include "libc/macros.h"\n.text.unlikely\n\n' + printf '#include "libc/macros.internal.h"\n.text.unlikely\n\n' printf '%s:' "$NAME" if [ "${#NAME}" -gt 6 ]; then printf '\n' diff --git a/libc/sysv/restorert.S b/libc/sysv/restorert.S index 40021fef8..2b2c76937 100644 --- a/libc/sysv/restorert.S +++ b/libc/sysv/restorert.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" .privileged .source __FILE__ diff --git a/libc/sysv/syscall.S b/libc/sysv/syscall.S index 40db1ea0a..f1136edbb 100644 --- a/libc/sysv/syscall.S +++ b/libc/sysv/syscall.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__ // Performs raw System Five system call. diff --git a/libc/sysv/systemfive.S b/libc/sysv/systemfive.S index a5345d6ff..b6b7a20ea 100644 --- a/libc/sysv/systemfive.S +++ b/libc/sysv/systemfive.S @@ -20,7 +20,7 @@ #include "libc/sysv/consts/prot.h" #include "libc/sysv/consts/nr.h" #include "libc/sysv/consts/map.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" /* ▄▄▄ ▄▄▄ ▀▓▓▒▄ diff --git a/libc/sysv/sysv.mk b/libc/sysv/sysv.mk index c5d274761..1b01db90e 100644 --- a/libc/sysv/sysv.mk +++ b/libc/sysv/sysv.mk @@ -65,7 +65,7 @@ $(LIBC_SYSV_A_OBJS): \ o/libc/sysv/consts/syscon.internal.inc: \ libc/sysv/consts/syscon.internal.h \ - libc/macros.h \ + libc/macros.internal.h \ libc/macros-cpp.internal.inc \ libc/macros.internal.inc diff --git a/libc/testlib/bench.S b/libc/testlib/bench.S index b98a8b178..ddc286dd0 100644 --- a/libc/testlib/bench.S +++ b/libc/testlib/bench.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" .yoink testlib_runallbenchmarks .source __FILE__ diff --git a/libc/testlib/benchrunner.c b/libc/testlib/benchrunner.c index 66a3abe9a..f11633a0f 100644 --- a/libc/testlib/benchrunner.c +++ b/libc/testlib/benchrunner.c @@ -54,6 +54,6 @@ void testlib_runallbenchmarks(void) { peekall(); mlockall(MCL_CURRENT); nice(-1); - g_loglevel = kLogWarn; + __log_level = kLogWarn; testlib_runtestcases(__bench_start, __bench_end, testlib_benchwarmup); } diff --git a/libc/testlib/combo.S b/libc/testlib/combo.S index 2d484b4dc..2e85aa9a5 100644 --- a/libc/testlib/combo.S +++ b/libc/testlib/combo.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__ // Decentralized section for test combo registration. diff --git a/libc/testlib/comborunner.c b/libc/testlib/comborunner.c index efaba8838..2436c5f24 100644 --- a/libc/testlib/comborunner.c +++ b/libc/testlib/comborunner.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/fmt/fmt.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/libc/testlib/ezbench.h b/libc/testlib/ezbench.h index 428b5b746..259e66c00 100644 --- a/libc/testlib/ezbench.h +++ b/libc/testlib/ezbench.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TESTLIB_EZBENCH_H_ #define COSMOPOLITAN_LIBC_TESTLIB_EZBENCH_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/testlib/bench.h" #include "libc/testlib/testlib.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) diff --git a/libc/testlib/fixture.S b/libc/testlib/fixture.S index 5b5f85ad0..143a2ee58 100644 --- a/libc/testlib/fixture.S +++ b/libc/testlib/fixture.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__ // Decentralized section for test fixture registration. diff --git a/libc/testlib/formatint.c b/libc/testlib/formatint.c index 8967de565..c3c5cda07 100644 --- a/libc/testlib/formatint.c +++ b/libc/testlib/formatint.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/fmt/fmt.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/testlib/testlib.h" diff --git a/libc/testlib/formatstr.c b/libc/testlib/formatstr.c index 7a33874f2..0757f67cb 100644 --- a/libc/testlib/formatstr.c +++ b/libc/testlib/formatstr.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" #include "libc/testlib/testlib.h" #include "libc/x/x.h" diff --git a/libc/testlib/hyperion.S b/libc/testlib/hyperion.S index a2290d7ec..a28828c66 100644 --- a/libc/testlib/hyperion.S +++ b/libc/testlib/hyperion.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__ .rodata diff --git a/libc/testlib/showerror_.c b/libc/testlib/showerror_.c index 3fce21950..9404f13f3 100644 --- a/libc/testlib/showerror_.c +++ b/libc/testlib/showerror_.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/calls/internal.h" #include "libc/errno.h" #include "libc/fmt/fmt.h" diff --git a/libc/testlib/testcase.S b/libc/testlib/testcase.S index ab3fed3b8..e300155f0 100644 --- a/libc/testlib/testcase.S +++ b/libc/testlib/testcase.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__ // Decentralized section for test testcase registration. diff --git a/libc/testlib/testmain.c b/libc/testlib/testmain.c index 75b572d3e..3220673db 100644 --- a/libc/testlib/testmain.c +++ b/libc/testlib/testmain.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/internal.h" #include "libc/log/log.h" #include "libc/nexgen32e/x86feature.h" @@ -55,7 +55,7 @@ static testonly void GetOpts(int argc, char *argv[]) { runbenchmarks_ = true; break; case 'v': - ++g_loglevel; + ++__log_level; break; case '?': case 'h': @@ -70,7 +70,7 @@ static testonly void GetOpts(int argc, char *argv[]) { * Generic test program main function. */ testonly int main(int argc, char *argv[]) { - g_loglevel = kLogInfo; + __log_level = kLogInfo; GetOpts(argc, argv); showcrashreports(); g_testlib_shoulddebugbreak = IsDebuggerPresent(false); diff --git a/libc/testlib/testrunner.c b/libc/testlib/testrunner.c index 806c367d5..74f41d78e 100644 --- a/libc/testlib/testrunner.c +++ b/libc/testlib/testrunner.c @@ -22,7 +22,7 @@ #include "libc/errno.h" #include "libc/fmt/fmt.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/process.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/libc/testlib/thrashcodecache.S b/libc/testlib/thrashcodecache.S index 6812b3062..df22785a4 100644 --- a/libc/testlib/thrashcodecache.S +++ b/libc/testlib/thrashcodecache.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__ .testonly diff --git a/libc/testlib/thunks/assert_eq.S b/libc/testlib/thunks/assert_eq.S index 31a7e1d50..a9b36c4d4 100644 --- a/libc/testlib/thunks/assert_eq.S +++ b/libc/testlib/thunks/assert_eq.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__ .text.unlikely diff --git a/libc/testlib/thunks/assert_false.S b/libc/testlib/thunks/assert_false.S index a5192dd59..76dc877de 100644 --- a/libc/testlib/thunks/assert_false.S +++ b/libc/testlib/thunks/assert_false.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__ .text.unlikely diff --git a/libc/testlib/thunks/assert_ne.S b/libc/testlib/thunks/assert_ne.S index 4d5e31ec3..9181df215 100644 --- a/libc/testlib/thunks/assert_ne.S +++ b/libc/testlib/thunks/assert_ne.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__ .text.unlikely diff --git a/libc/testlib/thunks/assert_true.S b/libc/testlib/thunks/assert_true.S index d185f4d12..0ca3685ea 100644 --- a/libc/testlib/thunks/assert_true.S +++ b/libc/testlib/thunks/assert_true.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__ .text.unlikely diff --git a/libc/testlib/thunks/expect_eq.S b/libc/testlib/thunks/expect_eq.S index 71db4e4c1..ef5c8ece0 100644 --- a/libc/testlib/thunks/expect_eq.S +++ b/libc/testlib/thunks/expect_eq.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__ .text.unlikely diff --git a/libc/testlib/thunks/expect_false.S b/libc/testlib/thunks/expect_false.S index 919acb73a..afe059894 100644 --- a/libc/testlib/thunks/expect_false.S +++ b/libc/testlib/thunks/expect_false.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__ .text.unlikely diff --git a/libc/testlib/thunks/expect_ne.S b/libc/testlib/thunks/expect_ne.S index ec932aa63..ea191ebf7 100644 --- a/libc/testlib/thunks/expect_ne.S +++ b/libc/testlib/thunks/expect_ne.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__ .text.unlikely diff --git a/libc/testlib/thunks/expect_true.S b/libc/testlib/thunks/expect_true.S index 228a47384..5366b5bec 100644 --- a/libc/testlib/thunks/expect_true.S +++ b/libc/testlib/thunks/expect_true.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__ .text.unlikely diff --git a/libc/testlib/thunks/free.S b/libc/testlib/thunks/free.S index d33a08526..9b2ae53c0 100644 --- a/libc/testlib/thunks/free.S +++ b/libc/testlib/thunks/free.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__ // Delegates to free(). diff --git a/libc/testlib/thunks/jump.S b/libc/testlib/thunks/jump.S index b2f993e7a..76bba4729 100644 --- a/libc/testlib/thunks/jump.S +++ b/libc/testlib/thunks/jump.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__ .text.unlikely diff --git a/libc/testlib/ugly.h b/libc/testlib/ugly.h index bf216daad..e8c58e59f 100644 --- a/libc/testlib/ugly.h +++ b/libc/testlib/ugly.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TESTLIB_UGLY_H_ #define COSMOPOLITAN_LIBC_TESTLIB_UGLY_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) #define __TEST_ARRAY(S) \ diff --git a/libc/time/alarm.c b/libc/time/alarm.c index db4b48c44..584f77d12 100644 --- a/libc/time/alarm.c +++ b/libc/time/alarm.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/calls/struct/itimerval.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/str/str.h" #include "libc/sysv/consts/itimer.h" diff --git a/libc/time/kmonthname.S b/libc/time/kmonthname.S index 2428b1037..e37f267df 100644 --- a/libc/time/kmonthname.S +++ b/libc/time/kmonthname.S @@ -7,7 +7,7 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/macros.h" +#include "libc/macros.internal.h" // extern const char kMonthName[12][10]; .section .rodata,"a",@progbits diff --git a/libc/time/kmonthnameshort.S b/libc/time/kmonthnameshort.S index 281f0b813..c616f15cb 100644 --- a/libc/time/kmonthnameshort.S +++ b/libc/time/kmonthnameshort.S @@ -7,7 +7,7 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/macros.h" +#include "libc/macros.internal.h" // Type #1: // - Indexable C-String Array diff --git a/libc/time/kweekdayname.S b/libc/time/kweekdayname.S index 3e6e2708c..1cfc29250 100644 --- a/libc/time/kweekdayname.S +++ b/libc/time/kweekdayname.S @@ -7,7 +7,7 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/macros.h" +#include "libc/macros.internal.h" // extern const char kWeekdayName[7][10]; .section .rodata,"a",@progbits diff --git a/libc/time/kweekdaynameshort.S b/libc/time/kweekdaynameshort.S index 81f1a12d4..a7b7677d4 100644 --- a/libc/time/kweekdaynameshort.S +++ b/libc/time/kweekdaynameshort.S @@ -7,7 +7,7 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/macros.h" +#include "libc/macros.internal.h" // Type #1: // - Indexable C-String Array diff --git a/libc/time/localtime.c b/libc/time/localtime.c index 1fa7587d5..bf3dc9463 100644 --- a/libc/time/localtime.c +++ b/libc/time/localtime.c @@ -3,7 +3,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/initializer.internal.h" #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nexgen32e.h" diff --git a/libc/time/strftime.c b/libc/time/strftime.c index d9f7933d3..77e76e146 100644 --- a/libc/time/strftime.c +++ b/libc/time/strftime.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/calls/calls.h" #include "libc/fmt/fmt.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/nexgen32e.h" #include "libc/time/struct/tm.h" #include "libc/time/time.h" diff --git a/libc/time/strptime.c b/libc/time/strptime.c index a3ff98e8a..b2789ed25 100644 --- a/libc/time/strptime.c +++ b/libc/time/strptime.c @@ -26,7 +26,7 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" #include "libc/time/struct/tm.h" #include "libc/time/time.h" diff --git a/libc/tinymath/acos.S b/libc/tinymath/acos.S index 7e98c2ed7..44ccfc2dc 100644 --- a/libc/tinymath/acos.S +++ b/libc/tinymath/acos.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" // Returns arc cosine of 𝑥. // diff --git a/libc/tinymath/acosf.S b/libc/tinymath/acosf.S index 4a351f8cf..e743d07d4 100644 --- a/libc/tinymath/acosf.S +++ b/libc/tinymath/acosf.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 arc cosine of 𝑥. diff --git a/libc/tinymath/acosl.S b/libc/tinymath/acosl.S index c83543261..0950e95c1 100644 --- a/libc/tinymath/acosl.S +++ b/libc/tinymath/acosl.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 arc cosine of 𝑥. diff --git a/libc/tinymath/asin.S b/libc/tinymath/asin.S index a360d2bda..88952dcdd 100644 --- a/libc/tinymath/asin.S +++ b/libc/tinymath/asin.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 arc sine of 𝑥. diff --git a/libc/tinymath/asinf.S b/libc/tinymath/asinf.S index d9b3a85ec..fe4a6f69e 100644 --- a/libc/tinymath/asinf.S +++ b/libc/tinymath/asinf.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 arc sine of 𝑥. diff --git a/libc/tinymath/asinl.S b/libc/tinymath/asinl.S index 8c8d05e41..e37eb1ccf 100644 --- a/libc/tinymath/asinl.S +++ b/libc/tinymath/asinl.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 arc sine of 𝑥. diff --git a/libc/tinymath/atan.S b/libc/tinymath/atan.S index c4e714ac6..6945b9bd9 100644 --- a/libc/tinymath/atan.S +++ b/libc/tinymath/atan.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 arc tangent of 𝑥. diff --git a/libc/tinymath/atan2.S b/libc/tinymath/atan2.S index 7802ca1dd..161f75913 100644 --- a/libc/tinymath/atan2.S +++ b/libc/tinymath/atan2.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 arc tangent of 𝑦/𝑥. diff --git a/libc/tinymath/atan2f.S b/libc/tinymath/atan2f.S index ff64dc7d0..0dc8fb650 100644 --- a/libc/tinymath/atan2f.S +++ b/libc/tinymath/atan2f.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 arc tangent of 𝑦/𝑥. diff --git a/libc/tinymath/atan2l.S b/libc/tinymath/atan2l.S index 009e99da0..c49e85717 100644 --- a/libc/tinymath/atan2l.S +++ b/libc/tinymath/atan2l.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 arc tangent of 𝑦/𝑥. diff --git a/libc/tinymath/atanf.S b/libc/tinymath/atanf.S index cffe1ca1c..e80e5ae3a 100644 --- a/libc/tinymath/atanf.S +++ b/libc/tinymath/atanf.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 arc tangent of 𝑥. diff --git a/libc/tinymath/atanl.S b/libc/tinymath/atanl.S index 990ae5087..a19638763 100644 --- a/libc/tinymath/atanl.S +++ b/libc/tinymath/atanl.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 arc tangent of 𝑥. diff --git a/libc/tinymath/c2rangr.S b/libc/tinymath/c2rangr.S index e23ec047c..1f779e7c9 100644 --- a/libc/tinymath/c2rangr.S +++ b/libc/tinymath/c2rangr.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ // Computes transcedental trigonometry op w/ reactive scaling. diff --git a/libc/tinymath/cabs.S b/libc/tinymath/cabs.S index d42e9d8ef..b41359a5e 100644 --- a/libc/tinymath/cabs.S +++ b/libc/tinymath/cabs.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 absolute value of complex number. diff --git a/libc/tinymath/cabsf.S b/libc/tinymath/cabsf.S index c031a169c..9489744f5 100644 --- a/libc/tinymath/cabsf.S +++ b/libc/tinymath/cabsf.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__ cabsf: push %rbp diff --git a/libc/tinymath/cabsl.S b/libc/tinymath/cabsl.S index fd0df845e..0ea2da181 100644 --- a/libc/tinymath/cabsl.S +++ b/libc/tinymath/cabsl.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__ cabsl: push %rbp diff --git a/libc/tinymath/carg.S b/libc/tinymath/carg.S index f73947863..3d0f5ecc2 100644 --- a/libc/tinymath/carg.S +++ b/libc/tinymath/carg.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__ carg: push %rbp diff --git a/libc/tinymath/cargf.S b/libc/tinymath/cargf.S index 3531b0a2c..9c86b8d45 100644 --- a/libc/tinymath/cargf.S +++ b/libc/tinymath/cargf.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__ cargf: push %rbp diff --git a/libc/tinymath/cargl.S b/libc/tinymath/cargl.S index 4828e71ed..a8fa5ec1b 100644 --- a/libc/tinymath/cargl.S +++ b/libc/tinymath/cargl.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__ cargl: push %rbp diff --git a/libc/tinymath/cbrt.S b/libc/tinymath/cbrt.S index 34b299d73..dd5695ae8 100644 --- a/libc/tinymath/cbrt.S +++ b/libc/tinymath/cbrt.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" // Returns cube root of 𝑥. // diff --git a/libc/tinymath/cbrtf.S b/libc/tinymath/cbrtf.S index 0a9b50d35..4c5b615ea 100644 --- a/libc/tinymath/cbrtf.S +++ b/libc/tinymath/cbrtf.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" // Returns cube root of 𝑥. // diff --git a/libc/tinymath/cbrtl.S b/libc/tinymath/cbrtl.S index e5aaebd31..96c4c57c7 100644 --- a/libc/tinymath/cbrtl.S +++ b/libc/tinymath/cbrtl.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" // Returns cube root of 𝑥. // diff --git a/libc/tinymath/ceil.S b/libc/tinymath/ceil.S index 45dd764b3..750b99783 100644 --- a/libc/tinymath/ceil.S +++ b/libc/tinymath/ceil.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__ ceil: .leafprologue diff --git a/libc/tinymath/ceilf.S b/libc/tinymath/ceilf.S index 793f3e092..bddf30464 100644 --- a/libc/tinymath/ceilf.S +++ b/libc/tinymath/ceilf.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__ ceilf: .leafprologue diff --git a/libc/tinymath/ceill.S b/libc/tinymath/ceill.S index a4b0b76c2..f1a12e89b 100644 --- a/libc/tinymath/ceill.S +++ b/libc/tinymath/ceill.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__ ceill: .profilable diff --git a/libc/tinymath/cimag.S b/libc/tinymath/cimag.S index 143c774af..7c4cd24b6 100644 --- a/libc/tinymath/cimag.S +++ b/libc/tinymath/cimag.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__ cimag: .leafprologue diff --git a/libc/tinymath/cimagf.S b/libc/tinymath/cimagf.S index 3244a824f..a4c962c4f 100644 --- a/libc/tinymath/cimagf.S +++ b/libc/tinymath/cimagf.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__ cimagf: push %rbp diff --git a/libc/tinymath/cimagl.S b/libc/tinymath/cimagl.S index 5afc51664..9c562c0a9 100644 --- a/libc/tinymath/cimagl.S +++ b/libc/tinymath/cimagl.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__ cimagl: push %rbp diff --git a/libc/tinymath/conj.S b/libc/tinymath/conj.S index 552dccfe1..6ae4fc03b 100644 --- a/libc/tinymath/conj.S +++ b/libc/tinymath/conj.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__ conj: .leafprologue diff --git a/libc/tinymath/conjf.S b/libc/tinymath/conjf.S index 2448d729b..7040cdced 100644 --- a/libc/tinymath/conjf.S +++ b/libc/tinymath/conjf.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__ conjf: .profilable diff --git a/libc/tinymath/conjl.S b/libc/tinymath/conjl.S index aa80b4ad3..21aedc4b9 100644 --- a/libc/tinymath/conjl.S +++ b/libc/tinymath/conjl.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__ conjl: .profilable diff --git a/libc/tinymath/copysign.S b/libc/tinymath/copysign.S index eb60dccc4..bbfed88b1 100644 --- a/libc/tinymath/copysign.S +++ b/libc/tinymath/copysign.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" // Returns 𝑥 with same sign as 𝑦. // diff --git a/libc/tinymath/copysignf.S b/libc/tinymath/copysignf.S index 0fd97c26b..58b92ee01 100644 --- a/libc/tinymath/copysignf.S +++ b/libc/tinymath/copysignf.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" // Returns 𝑥 with same sign as 𝑦. // diff --git a/libc/tinymath/copysignl.S b/libc/tinymath/copysignl.S index 79d1909bf..ff57ab1c2 100644 --- a/libc/tinymath/copysignl.S +++ b/libc/tinymath/copysignl.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Returns 𝑥 with same sign as 𝑦. // diff --git a/libc/tinymath/cos.S b/libc/tinymath/cos.S index 86ed5d4f7..79e42d961 100644 --- a/libc/tinymath/cos.S +++ b/libc/tinymath/cos.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 cosine of 𝑥. diff --git a/libc/tinymath/cosf.S b/libc/tinymath/cosf.S index 4a1513e46..2ef0679a7 100644 --- a/libc/tinymath/cosf.S +++ b/libc/tinymath/cosf.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 cosine of 𝑥. diff --git a/libc/tinymath/cosl.S b/libc/tinymath/cosl.S index ff185a9d0..e74490c54 100644 --- a/libc/tinymath/cosl.S +++ b/libc/tinymath/cosl.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 cosine of 𝑥. diff --git a/libc/tinymath/cprojf.S b/libc/tinymath/cprojf.S index ede393685..c4e7b6dfc 100644 --- a/libc/tinymath/cprojf.S +++ b/libc/tinymath/cprojf.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__ cprojf: push %rbp diff --git a/libc/tinymath/cprojl.S b/libc/tinymath/cprojl.S index d5c04e7ba..bafbfb81d 100644 --- a/libc/tinymath/cprojl.S +++ b/libc/tinymath/cprojl.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__ // Projects into Rienmann sphere. diff --git a/libc/tinymath/creal.S b/libc/tinymath/creal.S index db6f80e55..b5c91c80b 100644 --- a/libc/tinymath/creal.S +++ b/libc/tinymath/creal.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__ creal: ret diff --git a/libc/tinymath/crealf.S b/libc/tinymath/crealf.S index 89a52fb40..db1688ffc 100644 --- a/libc/tinymath/crealf.S +++ b/libc/tinymath/crealf.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__ crealf: push %rbp diff --git a/libc/tinymath/creall.S b/libc/tinymath/creall.S index 42b547596..1628cdc73 100644 --- a/libc/tinymath/creall.S +++ b/libc/tinymath/creall.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__ creall: push %rbp diff --git a/libc/tinymath/d2ld2.S b/libc/tinymath/d2ld2.S index 3121cb2da..c064587c5 100644 --- a/libc/tinymath/d2ld2.S +++ b/libc/tinymath/d2ld2.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__ // Thunks double(*fn)(double,double) -> long double fn. diff --git a/libc/tinymath/exp.S b/libc/tinymath/exp.S index 484cc2bb7..ae4ff393b 100644 --- a/libc/tinymath/exp.S +++ b/libc/tinymath/exp.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" // Returns 𝑒^x. // diff --git a/libc/tinymath/exp10.S b/libc/tinymath/exp10.S index e907e05ac..29ae89b8c 100644 --- a/libc/tinymath/exp10.S +++ b/libc/tinymath/exp10.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" // Returns 10^x. // diff --git a/libc/tinymath/exp10f.S b/libc/tinymath/exp10f.S index 756d7c205..bd32d10cd 100644 --- a/libc/tinymath/exp10f.S +++ b/libc/tinymath/exp10f.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 10^x. diff --git a/libc/tinymath/exp10l.S b/libc/tinymath/exp10l.S index e31c36c73..a78c7704a 100644 --- a/libc/tinymath/exp10l.S +++ b/libc/tinymath/exp10l.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" // Returns 10^x. // diff --git a/libc/tinymath/exp2.S b/libc/tinymath/exp2.S index 13f065e4e..03ac644b0 100644 --- a/libc/tinymath/exp2.S +++ b/libc/tinymath/exp2.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" // Returns 2^𝑥. // diff --git a/libc/tinymath/exp2f.S b/libc/tinymath/exp2f.S index fc7fc16a4..f00bf06ff 100644 --- a/libc/tinymath/exp2f.S +++ b/libc/tinymath/exp2f.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 2^𝑥. diff --git a/libc/tinymath/exp2l.S b/libc/tinymath/exp2l.S index 3f96e5493..738027225 100644 --- a/libc/tinymath/exp2l.S +++ b/libc/tinymath/exp2l.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" // Returns 2^𝑥. // diff --git a/libc/tinymath/expf.S b/libc/tinymath/expf.S index b7ae553cb..14171a0f2 100644 --- a/libc/tinymath/expf.S +++ b/libc/tinymath/expf.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 𝑒^x. diff --git a/libc/tinymath/expl.S b/libc/tinymath/expl.S index d36bed805..f22cbeccd 100644 --- a/libc/tinymath/expl.S +++ b/libc/tinymath/expl.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" // Returns 𝑒^x. // diff --git a/libc/tinymath/expm1.S b/libc/tinymath/expm1.S index 5b9e2819a..37be04e6b 100644 --- a/libc/tinymath/expm1.S +++ b/libc/tinymath/expm1.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" // Returns 𝑒^x-1. // diff --git a/libc/tinymath/expm1f.S b/libc/tinymath/expm1f.S index 8b1753b0f..92e5fe373 100644 --- a/libc/tinymath/expm1f.S +++ b/libc/tinymath/expm1f.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 𝑒^x-1. diff --git a/libc/tinymath/expm1l.S b/libc/tinymath/expm1l.S index f13020a48..d12f779d6 100644 --- a/libc/tinymath/expm1l.S +++ b/libc/tinymath/expm1l.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Returns 𝑒^x-1. // diff --git a/libc/tinymath/f2ld2.S b/libc/tinymath/f2ld2.S index b45b4adc2..1773da104 100644 --- a/libc/tinymath/f2ld2.S +++ b/libc/tinymath/f2ld2.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" // Thunks float(*fn)(float,float) -> long double fn. // diff --git a/libc/tinymath/fabs.S b/libc/tinymath/fabs.S index d0023f5f9..2c55d1aa4 100644 --- a/libc/tinymath/fabs.S +++ b/libc/tinymath/fabs.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" // Returns absolute value of 𝑥. // diff --git a/libc/tinymath/fabsf.S b/libc/tinymath/fabsf.S index 54a40e34b..6ecad6976 100644 --- a/libc/tinymath/fabsf.S +++ b/libc/tinymath/fabsf.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 absolute value of 𝑥. diff --git a/libc/tinymath/fabsl.S b/libc/tinymath/fabsl.S index 35a4c3d77..eb77c7e79 100644 --- a/libc/tinymath/fabsl.S +++ b/libc/tinymath/fabsl.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 absolute value of 𝑥. diff --git a/libc/tinymath/floor.S b/libc/tinymath/floor.S index 2b82684e7..a117c553b 100644 --- a/libc/tinymath/floor.S +++ b/libc/tinymath/floor.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__ // vroundsd $_MM_FROUND_TO_NEG_INF|_MM_FROUND_NO_EXC,%xmm0,%xmm0,%xmm0 diff --git a/libc/tinymath/floorf.S b/libc/tinymath/floorf.S index 2b251ef78..4bf4ef56a 100644 --- a/libc/tinymath/floorf.S +++ b/libc/tinymath/floorf.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__ floorf: .leafprologue diff --git a/libc/tinymath/floorl.S b/libc/tinymath/floorl.S index b31c68c21..a6d0d0d71 100644 --- a/libc/tinymath/floorl.S +++ b/libc/tinymath/floorl.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__ floorl: .profilable diff --git a/libc/tinymath/fmod.S b/libc/tinymath/fmod.S index 012265b19..5762bcbd1 100644 --- a/libc/tinymath/fmod.S +++ b/libc/tinymath/fmod.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" // fmod [sic] does (𝑥 rem 𝑦) w/ round()-style rounding. // diff --git a/libc/tinymath/fmodf.S b/libc/tinymath/fmodf.S index 4fb048cc8..68464a307 100644 --- a/libc/tinymath/fmodf.S +++ b/libc/tinymath/fmodf.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__ fmodf: ezlea fmodl,ax diff --git a/libc/tinymath/fmodl.S b/libc/tinymath/fmodl.S index 239186d87..b3d87215c 100644 --- a/libc/tinymath/fmodl.S +++ b/libc/tinymath/fmodl.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // fmod [sic] does (𝑥 rem 𝑦) w/ round()-style rounding. // diff --git a/libc/tinymath/frexp.S b/libc/tinymath/frexp.S index 53fc8a63f..e42bb1d85 100644 --- a/libc/tinymath/frexp.S +++ b/libc/tinymath/frexp.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__ frexp: .leafprologue diff --git a/libc/tinymath/ilogb.S b/libc/tinymath/ilogb.S index fff7764ec..44d3e2a77 100644 --- a/libc/tinymath/ilogb.S +++ b/libc/tinymath/ilogb.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" // Returns log₂𝑥 exponent part of double. // diff --git a/libc/tinymath/ilogbf.S b/libc/tinymath/ilogbf.S index b9138150e..26b29fb1d 100644 --- a/libc/tinymath/ilogbf.S +++ b/libc/tinymath/ilogbf.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" // Returns log₂x exponent part of float. // diff --git a/libc/tinymath/ilogbl.S b/libc/tinymath/ilogbl.S index 939f53f64..2d2763019 100644 --- a/libc/tinymath/ilogbl.S +++ b/libc/tinymath/ilogbl.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" // Returns log₂x exponent part of long double. // diff --git a/libc/tinymath/ldexp.S b/libc/tinymath/ldexp.S index 026fabd48..7fd154075 100644 --- a/libc/tinymath/ldexp.S +++ b/libc/tinymath/ldexp.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" // Returns 𝑥 × 2ʸ. // diff --git a/libc/tinymath/ldexpf.S b/libc/tinymath/ldexpf.S index b30945a1b..7014b4122 100644 --- a/libc/tinymath/ldexpf.S +++ b/libc/tinymath/ldexpf.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 𝑥 × 2ʸ. diff --git a/libc/tinymath/ldexpl.S b/libc/tinymath/ldexpl.S index 3dc4fed43..7aa6ae2f1 100644 --- a/libc/tinymath/ldexpl.S +++ b/libc/tinymath/ldexpl.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Returns 𝑥 × 2ʸ. // diff --git a/libc/tinymath/log.S b/libc/tinymath/log.S index f666cb6d9..88ff30fd3 100644 --- a/libc/tinymath/log.S +++ b/libc/tinymath/log.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" // Returns natural logarithm of 𝑥. // diff --git a/libc/tinymath/log10.S b/libc/tinymath/log10.S index 40da8088a..88e72971d 100644 --- a/libc/tinymath/log10.S +++ b/libc/tinymath/log10.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__ // Calculates log₁₀𝑥. diff --git a/libc/tinymath/log10f.S b/libc/tinymath/log10f.S index 0e7dab94d..70719015b 100644 --- a/libc/tinymath/log10f.S +++ b/libc/tinymath/log10f.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__ // Calculates log₁₀𝑥. diff --git a/libc/tinymath/log10l.S b/libc/tinymath/log10l.S index f0b3bddab..644e899f6 100644 --- a/libc/tinymath/log10l.S +++ b/libc/tinymath/log10l.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__ // Calculates log₁₀𝑥. diff --git a/libc/tinymath/log1p.S b/libc/tinymath/log1p.S index fcb45fbf9..f8f4e8866 100644 --- a/libc/tinymath/log1p.S +++ b/libc/tinymath/log1p.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" // Returns log(𝟷+𝑥). // diff --git a/libc/tinymath/log1pf.S b/libc/tinymath/log1pf.S index 96f0d2829..1d8c023a9 100644 --- a/libc/tinymath/log1pf.S +++ b/libc/tinymath/log1pf.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" // Returns log(𝟷+𝑥). // diff --git a/libc/tinymath/log1pl.S b/libc/tinymath/log1pl.S index 981138a7b..29082fc69 100644 --- a/libc/tinymath/log1pl.S +++ b/libc/tinymath/log1pl.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 log(𝟷+𝑥). diff --git a/libc/tinymath/log2.S b/libc/tinymath/log2.S index 00b9fca3d..378f0f66a 100644 --- a/libc/tinymath/log2.S +++ b/libc/tinymath/log2.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" // Calculates log₂𝑥. // diff --git a/libc/tinymath/log2f.S b/libc/tinymath/log2f.S index ed26731c9..1c9527cb2 100644 --- a/libc/tinymath/log2f.S +++ b/libc/tinymath/log2f.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__ // Calculates log₂𝑥. diff --git a/libc/tinymath/log2l.S b/libc/tinymath/log2l.S index c275a7fd4..764dc1cd2 100644 --- a/libc/tinymath/log2l.S +++ b/libc/tinymath/log2l.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" // Calculates log₂𝑥. // diff --git a/libc/tinymath/logb.S b/libc/tinymath/logb.S index 59d6f66db..9f85a250c 100644 --- a/libc/tinymath/logb.S +++ b/libc/tinymath/logb.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" // Returns log₂ₓ exponent part of double. // diff --git a/libc/tinymath/logbf.S b/libc/tinymath/logbf.S index c5100a8ba..333cb99ea 100644 --- a/libc/tinymath/logbf.S +++ b/libc/tinymath/logbf.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" // Returns log₂ₓ exponent part of float. // diff --git a/libc/tinymath/logbl.S b/libc/tinymath/logbl.S index 723211bde..9c78f30b2 100644 --- a/libc/tinymath/logbl.S +++ b/libc/tinymath/logbl.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" // Returns log₂ₓ exponent part of long double. // diff --git a/libc/tinymath/logf.S b/libc/tinymath/logf.S index bc7fd2619..a3acff19c 100644 --- a/libc/tinymath/logf.S +++ b/libc/tinymath/logf.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 natural logarithm of 𝑥. diff --git a/libc/tinymath/logl.S b/libc/tinymath/logl.S index cce5c97c6..e98ea494d 100644 --- a/libc/tinymath/logl.S +++ b/libc/tinymath/logl.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" // Returns natural logarithm of 𝑥. // diff --git a/libc/tinymath/lrint.S b/libc/tinymath/lrint.S index 655dffdc0..f2423df3e 100644 --- a/libc/tinymath/lrint.S +++ b/libc/tinymath/lrint.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__ lrint: cvtsd2siq %xmm0,%rax diff --git a/libc/tinymath/lrintf.S b/libc/tinymath/lrintf.S index 248bcf482..ac7e9e5f8 100644 --- a/libc/tinymath/lrintf.S +++ b/libc/tinymath/lrintf.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__ lrintf: cvtss2siq %xmm0,%rax diff --git a/libc/tinymath/lrintl.S b/libc/tinymath/lrintl.S index f39b2f1b3..e874c7496 100644 --- a/libc/tinymath/lrintl.S +++ b/libc/tinymath/lrintl.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__ lrintl: push %rbp diff --git a/libc/tinymath/lround.S b/libc/tinymath/lround.S index dcf33059d..866685bb8 100644 --- a/libc/tinymath/lround.S +++ b/libc/tinymath/lround.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__ // Rounds to nearest integer, away from zero. diff --git a/libc/tinymath/lroundf.S b/libc/tinymath/lroundf.S index ea03131e4..5e9dd3824 100644 --- a/libc/tinymath/lroundf.S +++ b/libc/tinymath/lroundf.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__ // Rounds to nearest integer, away from zero. diff --git a/libc/tinymath/lroundl.S b/libc/tinymath/lroundl.S index ff5dd4b9e..c8dac6f1a 100644 --- a/libc/tinymath/lroundl.S +++ b/libc/tinymath/lroundl.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ lroundl: diff --git a/libc/tinymath/nearbyint.S b/libc/tinymath/nearbyint.S index 8f468bb3c..e79ef582c 100644 --- a/libc/tinymath/nearbyint.S +++ b/libc/tinymath/nearbyint.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__ nearbyint: diff --git a/libc/tinymath/nearbyintf.S b/libc/tinymath/nearbyintf.S index 6b47b5147..b56d9964a 100644 --- a/libc/tinymath/nearbyintf.S +++ b/libc/tinymath/nearbyintf.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__ nearbyintf: diff --git a/libc/tinymath/nearbyintl.S b/libc/tinymath/nearbyintl.S index 70df2522e..9c9307ddb 100644 --- a/libc/tinymath/nearbyintl.S +++ b/libc/tinymath/nearbyintl.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__ nearbyintl: diff --git a/libc/tinymath/pow.S b/libc/tinymath/pow.S index 091e9faa7..a4158f41e 100644 --- a/libc/tinymath/pow.S +++ b/libc/tinymath/pow.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 𝑥^𝑦. diff --git a/libc/tinymath/powf.S b/libc/tinymath/powf.S index a9f6e29ac..d2e03491e 100644 --- a/libc/tinymath/powf.S +++ b/libc/tinymath/powf.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" // Returns 𝑥^𝑦. // diff --git a/libc/tinymath/powi.S b/libc/tinymath/powi.S index a563ed333..ffed06786 100644 --- a/libc/tinymath/powi.S +++ b/libc/tinymath/powi.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" // Returns 𝑥^𝑦. // diff --git a/libc/tinymath/powif.S b/libc/tinymath/powif.S index 8bb9a0400..aa3b3c053 100644 --- a/libc/tinymath/powif.S +++ b/libc/tinymath/powif.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" // Returns 𝑥^𝑦. // diff --git a/libc/tinymath/powil.S b/libc/tinymath/powil.S index ce3a25a83..a48753065 100644 --- a/libc/tinymath/powil.S +++ b/libc/tinymath/powil.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" // Returns 𝑥^𝑦. // diff --git a/libc/tinymath/powl.S b/libc/tinymath/powl.S index f9445e713..c6246b07e 100644 --- a/libc/tinymath/powl.S +++ b/libc/tinymath/powl.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" // Returns 𝑥^𝑦. // diff --git a/libc/tinymath/remainder.S b/libc/tinymath/remainder.S index ce08dd95f..3558e291a 100644 --- a/libc/tinymath/remainder.S +++ b/libc/tinymath/remainder.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__ // remainder(𝑥,𝑦) means (𝑥 rem 𝑦) w/ rint()-style rounding. diff --git a/libc/tinymath/remainderf.S b/libc/tinymath/remainderf.S index 6883424f7..7427c6aea 100644 --- a/libc/tinymath/remainderf.S +++ b/libc/tinymath/remainderf.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__ remainderf: diff --git a/libc/tinymath/remainderl.S b/libc/tinymath/remainderl.S index a98f987f5..bd14ae998 100644 --- a/libc/tinymath/remainderl.S +++ b/libc/tinymath/remainderl.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ remainderl: diff --git a/libc/tinymath/rint.S b/libc/tinymath/rint.S index fd4ca0a92..07e5a4a3b 100644 --- a/libc/tinymath/rint.S +++ b/libc/tinymath/rint.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" #include "libc/bits/smmintrin.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ // Rounds to nearest integer. diff --git a/libc/tinymath/rintf.S b/libc/tinymath/rintf.S index f50c2a3e6..858e358c2 100644 --- a/libc/tinymath/rintf.S +++ b/libc/tinymath/rintf.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__ rintf: .leafprologue diff --git a/libc/tinymath/rintl.S b/libc/tinymath/rintl.S index b7f54869f..adc97bad7 100644 --- a/libc/tinymath/rintl.S +++ b/libc/tinymath/rintl.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__ // Rounds to nearest integer. diff --git a/libc/tinymath/round.S b/libc/tinymath/round.S index 1f502e2a6..e47e79de6 100644 --- a/libc/tinymath/round.S +++ b/libc/tinymath/round.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" #include "libc/bits/smmintrin.internal.h" #include "libc/nexgen32e/x86feature.h" .source __FILE__ diff --git a/libc/tinymath/roundf.S b/libc/tinymath/roundf.S index 1c1a26564..b873d920b 100644 --- a/libc/tinymath/roundf.S +++ b/libc/tinymath/roundf.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" #include "libc/bits/smmintrin.internal.h" #include "libc/nexgen32e/x86feature.h" .source __FILE__ diff --git a/libc/tinymath/roundl.S b/libc/tinymath/roundl.S index d22894cdb..db45f9994 100644 --- a/libc/tinymath/roundl.S +++ b/libc/tinymath/roundl.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" // Rounds to nearest integer, away from zero. // diff --git a/libc/tinymath/scalb.S b/libc/tinymath/scalb.S index e0125003d..53333b6d7 100644 --- a/libc/tinymath/scalb.S +++ b/libc/tinymath/scalb.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 𝑥 × 2ʸ. diff --git a/libc/tinymath/scalbf.S b/libc/tinymath/scalbf.S index 951c6df23..b7acc2c48 100644 --- a/libc/tinymath/scalbf.S +++ b/libc/tinymath/scalbf.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 𝑥 × 2ʸ. diff --git a/libc/tinymath/scalbl.S b/libc/tinymath/scalbl.S index 692e9ea6f..a0ae41ae5 100644 --- a/libc/tinymath/scalbl.S +++ b/libc/tinymath/scalbl.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 𝑥 × 2ʸ. diff --git a/libc/tinymath/signbit.S b/libc/tinymath/signbit.S index 266b46787..a588c7ef6 100644 --- a/libc/tinymath/signbit.S +++ b/libc/tinymath/signbit.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__ signbit: diff --git a/libc/tinymath/signbitf.S b/libc/tinymath/signbitf.S index 5796af2c6..d9c96da57 100644 --- a/libc/tinymath/signbitf.S +++ b/libc/tinymath/signbitf.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__ signbitf: diff --git a/libc/tinymath/signbitl.S b/libc/tinymath/signbitl.S index 86178d33f..737f4d2c2 100644 --- a/libc/tinymath/signbitl.S +++ b/libc/tinymath/signbitl.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__ signbitl: diff --git a/libc/tinymath/significand.S b/libc/tinymath/significand.S index 55997b564..f49868c1a 100644 --- a/libc/tinymath/significand.S +++ b/libc/tinymath/significand.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__ significand: diff --git a/libc/tinymath/significandf.S b/libc/tinymath/significandf.S index a36b0be95..d539f557e 100644 --- a/libc/tinymath/significandf.S +++ b/libc/tinymath/significandf.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__ significandf: diff --git a/libc/tinymath/significandl.S b/libc/tinymath/significandl.S index 2c4c04834..a022ffaa2 100644 --- a/libc/tinymath/significandl.S +++ b/libc/tinymath/significandl.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__ significandl: diff --git a/libc/tinymath/sin.S b/libc/tinymath/sin.S index 1e4ab0cb5..3a46f190f 100644 --- a/libc/tinymath/sin.S +++ b/libc/tinymath/sin.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 sine of 𝑥. diff --git a/libc/tinymath/sincos.S b/libc/tinymath/sincos.S index 6704acd4f..38a3203ec 100644 --- a/libc/tinymath/sincos.S +++ b/libc/tinymath/sincos.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 sine and cosine of 𝑥. diff --git a/libc/tinymath/sincosf.S b/libc/tinymath/sincosf.S index 8e73f091c..41cf7838f 100644 --- a/libc/tinymath/sincosf.S +++ b/libc/tinymath/sincosf.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 sine and cosine of 𝑥. diff --git a/libc/tinymath/sincosl.S b/libc/tinymath/sincosl.S index 09097fea3..2f0d491ec 100644 --- a/libc/tinymath/sincosl.S +++ b/libc/tinymath/sincosl.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ // Returns sine and cosine of 𝑥. diff --git a/libc/tinymath/sinf.S b/libc/tinymath/sinf.S index b292e045f..6f5051f6b 100644 --- a/libc/tinymath/sinf.S +++ b/libc/tinymath/sinf.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 sine of 𝑥. diff --git a/libc/tinymath/sinl.S b/libc/tinymath/sinl.S index 4aebcb9b7..843abcefd 100644 --- a/libc/tinymath/sinl.S +++ b/libc/tinymath/sinl.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" // Returns sine of 𝑥. // diff --git a/libc/tinymath/sqrt.S b/libc/tinymath/sqrt.S index 1f7915167..fd5427f15 100644 --- a/libc/tinymath/sqrt.S +++ b/libc/tinymath/sqrt.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" // Returns square root of 𝑥. // diff --git a/libc/tinymath/sqrtf.S b/libc/tinymath/sqrtf.S index 6247e71fb..36947b018 100644 --- a/libc/tinymath/sqrtf.S +++ b/libc/tinymath/sqrtf.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" // Returns square root of 𝑥. // diff --git a/libc/tinymath/sqrtl.S b/libc/tinymath/sqrtl.S index 2a10debcb..b8584b323 100644 --- a/libc/tinymath/sqrtl.S +++ b/libc/tinymath/sqrtl.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 square root of 𝑥. diff --git a/libc/tinymath/tan.S b/libc/tinymath/tan.S index 2fd8309a4..3df3bc76c 100644 --- a/libc/tinymath/tan.S +++ b/libc/tinymath/tan.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 tangent of 𝑥. diff --git a/libc/tinymath/tanf.S b/libc/tinymath/tanf.S index 052ed2a5d..348e42b4a 100644 --- a/libc/tinymath/tanf.S +++ b/libc/tinymath/tanf.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 tangent of 𝑥. diff --git a/libc/tinymath/tanl.S b/libc/tinymath/tanl.S index e7808a9ab..40d707fdd 100644 --- a/libc/tinymath/tanl.S +++ b/libc/tinymath/tanl.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .source __FILE__ // Returns tangent of 𝑥. diff --git a/libc/tinymath/trunc.S b/libc/tinymath/trunc.S index 1d1c5e88c..4cee5bb58 100644 --- a/libc/tinymath/trunc.S +++ b/libc/tinymath/trunc.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__ // Rounds to integer, toward zero. diff --git a/libc/tinymath/truncf.S b/libc/tinymath/truncf.S index ee4a9bfad..7cc1510ad 100644 --- a/libc/tinymath/truncf.S +++ b/libc/tinymath/truncf.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__ truncf: .leafprologue diff --git a/libc/tinymath/truncl.S b/libc/tinymath/truncl.S index 8f6c6cc5b..f8af463cf 100644 --- a/libc/tinymath/truncl.S +++ b/libc/tinymath/truncl.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__ truncl: .profilable diff --git a/libc/unicode/kcombiningchars.S b/libc/unicode/kcombiningchars.S index 111b497da..6909e9f43 100644 --- a/libc/unicode/kcombiningchars.S +++ b/libc/unicode/kcombiningchars.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/sysv/consts/nr.h" #include "libc/sysv/consts/madv.h" diff --git a/libc/unicode/setlocale.c b/libc/unicode/setlocale.c index 14303ef79..2a61d163c 100644 --- a/libc/unicode/setlocale.c +++ b/libc/unicode/setlocale.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/unicode/locale.h" /** diff --git a/libc/unicode/strnwidth.c b/libc/unicode/strnwidth.c index 31cb356a8..431b93787 100644 --- a/libc/unicode/strnwidth.c +++ b/libc/unicode/strnwidth.c @@ -19,7 +19,7 @@ #include "libc/intrin/pcmpgtb.h" #include "libc/intrin/pmovmskb.h" #include "libc/intrin/psubb.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/bsf.h" #include "libc/str/str.h" #include "libc/str/thompike.h" diff --git a/libc/unicode/strnwidth16.c b/libc/unicode/strnwidth16.c index b2f7f2eeb..d5df7d97e 100644 --- a/libc/unicode/strnwidth16.c +++ b/libc/unicode/strnwidth16.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/oldutf16.internal.h" #include "libc/str/str.h" #include "libc/unicode/unicode.h" diff --git a/libc/unicode/strwidth16.c b/libc/unicode/strwidth16.c index 71a38dc12..85fca5832 100644 --- a/libc/unicode/strwidth16.c +++ b/libc/unicode/strwidth16.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/limits.h" #include "libc/unicode/unicode.h" diff --git a/libc/x/filecmp.c b/libc/x/filecmp.c index be7e89430..39077015b 100644 --- a/libc/x/filecmp.c +++ b/libc/x/filecmp.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/errno.h" #include "libc/str/str.h" diff --git a/libc/x/replaceuser.c b/libc/x/replaceuser.c index 4b18d8fe8..44ca2b208 100644 --- a/libc/x/replaceuser.c +++ b/libc/x/replaceuser.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/calls/calls.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/libc/x/xjoinpaths.c b/libc/x/xjoinpaths.c index dbb68bd67..d16a18a02 100644 --- a/libc/x/xjoinpaths.c +++ b/libc/x/xjoinpaths.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" #include "libc/x/x.h" diff --git a/libc/zip.h b/libc/zip.h index 7aa91532f..c7d5ae971 100644 --- a/libc/zip.h +++ b/libc/zip.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_ZIP_H_ #define COSMOPOLITAN_LIBC_ZIP_H_ #include "libc/bits/bits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" /** diff --git a/libc/zipos/get.c b/libc/zipos/get.c index d0b713094..b9ae10473 100644 --- a/libc/zipos/get.c +++ b/libc/zipos/get.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/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/limits.h" diff --git a/libc/zipos/open.c b/libc/zipos/open.c index 44ebd2fd0..3847a5c9b 100644 --- a/libc/zipos/open.c +++ b/libc/zipos/open.c @@ -24,7 +24,7 @@ #include "libc/calls/struct/stat.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" #include "libc/runtime/runtime.h" diff --git a/libc/zipos/read.c b/libc/zipos/read.c index d54b4c60e..6db49ee92 100644 --- a/libc/zipos/read.c +++ b/libc/zipos/read.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" #include "libc/str/str.h" diff --git a/libc/zipos/stat-impl.c b/libc/zipos/stat-impl.c index bcba7291d..170eb1b52 100644 --- a/libc/zipos/stat-impl.c +++ b/libc/zipos/stat-impl.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/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/str/str.h" diff --git a/libc/zipos/zipos.S b/libc/zipos/zipos.S index fab9caa8f..44259a173 100644 --- a/libc/zipos/zipos.S +++ b/libc/zipos/zipos.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" // static_yoink this symbol for open(zip:...) support. zip_uri_support = 0 diff --git a/net/http/negotiatehttprequest.c b/net/http/negotiatehttprequest.c index fa58546d5..ea26e0cea 100644 --- a/net/http/negotiatehttprequest.c +++ b/net/http/negotiatehttprequest.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/sock/sock.h" #include "libc/str/str.h" diff --git a/net/http/uricspn-avx.S b/net/http/uricspn-avx.S index de6dad478..e03f71a9f 100644 --- a/net/http/uricspn-avx.S +++ b/net/http/uricspn-avx.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" // Verifies buffer contains only URI characters. // diff --git a/net/http/urislice2cstr.c b/net/http/urislice2cstr.c index a3d6e9830..0633af2d9 100644 --- a/net/http/urislice2cstr.c +++ b/net/http/urislice2cstr.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" #include "net/http/uri.h" diff --git a/test/dsp/core/float2short_test.c b/test/dsp/core/float2short_test.c index d0c259c63..0d229565a 100644 --- a/test/dsp/core/float2short_test.c +++ b/test/dsp/core/float2short_test.c @@ -19,7 +19,7 @@ #include "dsp/core/core.h" #include "dsp/mpeg/mpeg.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/rand/rand.h" #include "libc/runtime/buffer.h" #include "libc/testlib/ezbench.h" diff --git a/test/dsp/core/getintegercoefficients_test.c b/test/dsp/core/getintegercoefficients_test.c index 708884555..d06496def 100644 --- a/test/dsp/core/getintegercoefficients_test.c +++ b/test/dsp/core/getintegercoefficients_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/core/core.h" #include "dsp/core/q.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/gc.h" #include "libc/str/str.h" #include "libc/testlib/ezbench.h" diff --git a/test/dsp/core/scalevolume_test.c b/test/dsp/core/scalevolume_test.c index e308dd361..5edeafb0a 100644 --- a/test/dsp/core/scalevolume_test.c +++ b/test/dsp/core/scalevolume_test.c @@ -20,7 +20,7 @@ #include "dsp/mpeg/mpeg.h" #include "libc/limits.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/x86feature.h" #include "libc/rand/rand.h" #include "libc/runtime/buffer.h" diff --git a/test/dsp/scale/scale_test.c b/test/dsp/scale/scale_test.c index 0ba91e37d..7394e7a3a 100644 --- a/test/dsp/scale/scale_test.c +++ b/test/dsp/scale/scale_test.c @@ -22,7 +22,7 @@ #include "dsp/core/half.h" #include "dsp/scale/scale.h" #include "libc/fmt/bing.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/test/dsp/tty/windex_test.c b/test/dsp/tty/windex_test.c index bdfb49e52..89562a53a 100644 --- a/test/dsp/tty/windex_test.c +++ b/test/dsp/tty/windex_test.c @@ -20,7 +20,7 @@ #include "libc/assert.h" #include "libc/bits/bits.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/x86feature.h" #include "libc/runtime/gc.h" diff --git a/test/libc/alg/bisectcarleft_test.c b/test/libc/alg/bisectcarleft_test.c index 6344530d5..1068dd08c 100644 --- a/test/libc/alg/bisectcarleft_test.c +++ b/test/libc/alg/bisectcarleft_test.c @@ -19,7 +19,7 @@ #include "libc/alg/alg.h" #include "libc/alg/bisectcarleft.internal.h" #include "libc/bits/bits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/alg/djbsort_test.c b/test/libc/alg/djbsort_test.c index ed86fc739..6e866f268 100644 --- a/test/libc/alg/djbsort_test.c +++ b/test/libc/alg/djbsort_test.c @@ -19,7 +19,7 @@ #include "libc/alg/alg.h" #include "libc/limits.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nexgen32e.h" #include "libc/nexgen32e/x86feature.h" diff --git a/test/libc/alg/qsort_test.c b/test/libc/alg/qsort_test.c index b7d6bdfe1..ac7c5fb22 100644 --- a/test/libc/alg/qsort_test.c +++ b/test/libc/alg/qsort_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" #include "libc/bits/bits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/alg/reverse_test.c b/test/libc/alg/reverse_test.c index d10b4e0d0..6803d8db7 100644 --- a/test/libc/alg/reverse_test.c +++ b/test/libc/alg/reverse_test.c @@ -16,9 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/alg/reverse.h" +#include "libc/alg/reverse.internal.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/testlib/testlib.h" TEST(reverse, test) { diff --git a/test/libc/alg/tarjan_test.c b/test/libc/alg/tarjan_test.c index 9eadc0b86..924c638db 100644 --- a/test/libc/alg/tarjan_test.c +++ b/test/libc/alg/tarjan_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/testlib/testlib.h" STATIC_YOINK("realloc"); @@ -98,7 +98,7 @@ TEST(tarjan, testHeaders) { [LIBC_INTEGRAL] = "libc/integral.h", [LIBC_KEYWORDS] = "libc/keywords.h", [LIBC_DCE] = "libc/dce.h", - [LIBC_MACROS] = "libc/macros.h", + [LIBC_MACROS] = "libc/macros.internal.h", [LIBC_MACROS_CPP] = "libc/macros-cpp.inc", }; int edges[][2] = { @@ -117,7 +117,7 @@ TEST(tarjan, testHeaders) { EXPECT_STREQ("libc/integral.h", vertices[sorted[1]]); EXPECT_STREQ("libc/keywords.h", vertices[sorted[2]]); EXPECT_STREQ("libc/macros-cpp.inc", vertices[sorted[3]]); - EXPECT_STREQ("libc/macros.h", vertices[sorted[4]]); + EXPECT_STREQ("libc/macros.internal.h", vertices[sorted[4]]); EXPECT_STREQ("libc/bits/bits.h", vertices[sorted[5]]); EXPECT_STREQ("libc/str/str.h", vertices[sorted[6]]); } diff --git a/test/libc/bits/integralarithmetic_test.c b/test/libc/bits/integralarithmetic_test.c index 62902d1a4..017b2b28e 100644 --- a/test/libc/bits/integralarithmetic_test.c +++ b/test/libc/bits/integralarithmetic_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/testlib/testlib.h" #define ROR(w, k) (CheckUnsigned(w) >> (k) | (w) << (sizeof(w) * 8 - (k))) diff --git a/test/libc/bits/rounddown2pow_test.c b/test/libc/bits/rounddown2pow_test.c index e1e5c2435..0d2b8d276 100644 --- a/test/libc/bits/rounddown2pow_test.c +++ b/test/libc/bits/rounddown2pow_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/nexgen32e/bsr.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/bits/roundup2pow_test.c b/test/libc/bits/roundup2pow_test.c index bfbdaed59..dad3c7293 100644 --- a/test/libc/bits/roundup2pow_test.c +++ b/test/libc/bits/roundup2pow_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/nexgen32e/bsr.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/bits/unsignedsubtract_test.c b/test/libc/bits/unsignedsubtract_test.c deleted file mode 100644 index 18ff4596d..000000000 --- a/test/libc/bits/unsignedsubtract_test.c +++ /dev/null @@ -1,30 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/safemacros.h" -#include "libc/testlib/testlib.h" - -TEST(unsignedsubtract, testMacro) { - EXPECT_EQ(5ul, unsignedsubtract(7ul, 2ul)); - EXPECT_EQ(18ul, unsignedsubtract(2ul, 0xfffffffffffffff0ul)); -} - -TEST(unsignedsubtract, testLinked) { - EXPECT_EQ(5ul, (unsignedsubtract)(7ul, 2ul)); - EXPECT_EQ(18ul, (unsignedsubtract)(2ul, 0xfffffffffffffff0ul)); -} diff --git a/test/libc/calls/commandv_test.c b/test/libc/calls/commandv_test.c index 329f8c6cc..eee748d56 100644 --- a/test/libc/calls/commandv_test.c +++ b/test/libc/calls/commandv_test.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/calls/calls.h" #include "libc/calls/struct/dirent.h" #include "libc/calls/struct/stat.h" diff --git a/test/libc/calls/fcntl_test.c b/test/libc/calls/fcntl_test.c index 22fa325da..be6293caf 100644 --- a/test/libc/calls/fcntl_test.c +++ b/test/libc/calls/fcntl_test.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/fmt/fmt.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/f.h" #include "libc/sysv/consts/o.h" diff --git a/test/libc/calls/fork_test.c b/test/libc/calls/fork_test.c index 470e5b31b..d70f93207 100644 --- a/test/libc/calls/fork_test.c +++ b/test/libc/calls/fork_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/msync.h" diff --git a/test/libc/calls/getcwd_test.c b/test/libc/calls/getcwd_test.c index 2d14c8410..41350712d 100644 --- a/test/libc/calls/getcwd_test.c +++ b/test/libc/calls/getcwd_test.c @@ -21,7 +21,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/fmt.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/gc.h" #include "libc/testlib/testlib.h" #include "libc/x/x.h" diff --git a/test/libc/fmt/palandprintf_test.c b/test/libc/fmt/palandprintf_test.c index 25db155e6..b7baeae17 100644 --- a/test/libc/fmt/palandprintf_test.c +++ b/test/libc/fmt/palandprintf_test.c @@ -25,7 +25,7 @@ │ THE SOFTWARE. │ └─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/pushpop.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/errno.h" #include "libc/fmt/fmt.h" #include "libc/fmt/itoa.h" diff --git a/test/libc/fmt/sprintf_s_test.c b/test/libc/fmt/sprintf_s_test.c index ca515240e..e8cafe6fd 100644 --- a/test/libc/fmt/sprintf_s_test.c +++ b/test/libc/fmt/sprintf_s_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/fmt/fmt.h" #include "libc/runtime/gc.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/intrin/pmulhrsw_test.c b/test/libc/intrin/pmulhrsw_test.c index db8ee3af5..2ddda913e 100644 --- a/test/libc/intrin/pmulhrsw_test.c +++ b/test/libc/intrin/pmulhrsw_test.c @@ -19,7 +19,7 @@ #include "dsp/core/q.h" #include "libc/intrin/pmulhrsw.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" #include "libc/testlib/testlib.h" #include "tool/viz/lib/formatstringtable-testlib.h" diff --git a/test/libc/mem/malloc_test.c b/test/libc/mem/malloc_test.c index 8ca662f0e..39384cec1 100644 --- a/test/libc/mem/malloc_test.c +++ b/test/libc/mem/malloc_test.c @@ -17,10 +17,10 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/rand/rand.h" #include "libc/runtime/memtrack.h" diff --git a/test/libc/nexgen32e/crc32_test.c b/test/libc/nexgen32e/crc32_test.c index 5e2f3f067..1c30338d4 100644 --- a/test/libc/nexgen32e/crc32_test.c +++ b/test/libc/nexgen32e/crc32_test.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/nexgen32e/crc32.h" #include "libc/nexgen32e/x86feature.h" #include "libc/str/str.h" diff --git a/test/libc/nexgen32e/lz4decode_test.c b/test/libc/nexgen32e/lz4decode_test.c index 0caf6ff55..9d78ecadd 100644 --- a/test/libc/nexgen32e/lz4decode_test.c +++ b/test/libc/nexgen32e/lz4decode_test.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/calls/calls.h" #include "libc/log/check.h" #include "libc/mem/mem.h" diff --git a/test/libc/nexgen32e/memmove_test.c b/test/libc/nexgen32e/memmove_test.c index 74072f4c8..8f564e68f 100644 --- a/test/libc/nexgen32e/memmove_test.c +++ b/test/libc/nexgen32e/memmove_test.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/mem/mem.h" #include "libc/rand/rand.h" #include "libc/str/str.h" diff --git a/test/libc/runtime/carsort_test.c b/test/libc/runtime/carsort_test.c index fd0960642..45577e75c 100644 --- a/test/libc/runtime/carsort_test.c +++ b/test/libc/runtime/carsort_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/rand/rand.h" #include "libc/runtime/carsort.h" #include "libc/str/str.h" diff --git a/test/libc/runtime/grow_test.c b/test/libc/runtime/grow_test.c index 8f613369d..dd118e0f0 100644 --- a/test/libc/runtime/grow_test.c +++ b/test/libc/runtime/grow_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/pushpop.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/test/libc/runtime/mmap_test.c b/test/libc/runtime/mmap_test.c index 445de77a6..b0d86e081 100644 --- a/test/libc/runtime/mmap_test.c +++ b/test/libc/runtime/mmap_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/xchg.h" +#include "libc/bits/xchg.internal.h" #include "libc/calls/calls.h" #include "libc/fmt/fmt.h" #include "libc/log/log.h" diff --git a/test/libc/sock/inet_pton_test.c b/test/libc/sock/inet_pton_test.c index 8229b5fde..1963fb149 100644 --- a/test/libc/sock/inet_pton_test.c +++ b/test/libc/sock/inet_pton_test.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/sock/sock.h" #include "libc/sysv/consts/af.h" #include "libc/sysv/consts/inaddr.h" diff --git a/test/libc/sock/poll_test.c b/test/libc/sock/poll_test.c index 7d85df013..09095ae38 100644 --- a/test/libc/sock/poll_test.c +++ b/test/libc/sock/poll_test.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/bits/bits.h" #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/gc.h" #include "libc/sock/sock.h" #include "libc/stdio/stdio.h" diff --git a/test/libc/str/sigset_test.c b/test/libc/str/sigset_test.c index d5c78d663..7cb0d58ed 100644 --- a/test/libc/str/sigset_test.c +++ b/test/libc/str/sigset_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/sigbits.h" #include "libc/str/str.h" diff --git a/test/libc/str/strcmp_test.c b/test/libc/str/strcmp_test.c index 693ebd37a..d51b85662 100644 --- a/test/libc/str/strcmp_test.c +++ b/test/libc/str/strcmp_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/cachesize.h" #include "libc/nexgen32e/x86feature.h" diff --git a/test/libc/str/strlen_test.c b/test/libc/str/strlen_test.c index 30eb33307..db32b8bb1 100644 --- a/test/libc/str/strlen_test.c +++ b/test/libc/str/strlen_test.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/mem/mem.h" #include "libc/nexgen32e/bsr.h" #include "libc/nexgen32e/tinystrlen.internal.h" diff --git a/test/libc/str/undeflate_test.c b/test/libc/str/undeflate_test.c index 9f26d593a..fd7664b0f 100644 --- a/test/libc/str/undeflate_test.c +++ b/test/libc/str/undeflate_test.c @@ -20,7 +20,7 @@ #include "libc/calls/struct/stat.h" #include "libc/errno.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" #include "libc/runtime/gc.h" @@ -93,6 +93,7 @@ TEST(undeflate, testEmbeddedCompressedZipFile_theHardWay) { ASSERT_GE(ZIP_CDIR_RECORDS(cd), 1); for (i = 0, cf = map + ZIP_CDIR_OFFSET(cd); i < ZIP_CDIR_RECORDS(cd); ++i, cf += ZIP_CFILE_HDRSIZE(cf)) { + fprintf(stderr, "%.*s\n", ZIP_CFILE_NAMESIZE(cf), ZIP_CFILE_NAME(cf)); if (strncmp("libc/testlib/hyperion.txt", ZIP_CFILE_NAME(cf), ZIP_CFILE_NAMESIZE(cf)) == 0) { lf = map + ZIP_CFILE_OFFSET(cf); diff --git a/test/libc/time/clock_gettime_test.c b/test/libc/time/clock_gettime_test.c index 07de62b7f..5cf33e94c 100644 --- a/test/libc/time/clock_gettime_test.c +++ b/test/libc/time/clock_gettime_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/timespec.h" #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/gc.h" #include "libc/stdio/stdio.h" #include "libc/sysv/consts/clock.h" diff --git a/test/libc/xed/x86ild_lib.c b/test/libc/xed/x86ild_lib.c index 88c87f085..57ebbc306 100644 --- a/test/libc/xed/x86ild_lib.c +++ b/test/libc/xed/x86ild_lib.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/bing.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/gc.h" #include "libc/str/str.h" #include "libc/testlib/testlib.h" diff --git a/test/net/http/uriparse_test.c b/test/net/http/uriparse_test.c index 4b7f3b90f..833c799fb 100644 --- a/test/net/http/uriparse_test.c +++ b/test/net/http/uriparse_test.c @@ -20,7 +20,7 @@ #include "libc/bits/initializer.internal.h" #include "libc/errno.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/runtime/gc.h" #include "libc/stdio/stdio.h" diff --git a/test/tool/build/lib/asmdown_test.c b/test/tool/build/lib/asmdown_test.c index fe457a7f0..eee69258b 100644 --- a/test/tool/build/lib/asmdown_test.c +++ b/test/tool/build/lib/asmdown_test.c @@ -23,7 +23,7 @@ TEST(ParseAsmdown, test) { struct Asmdown *ad; const char *s = "\ -#include \"libc/macros.h\"\n\ +#include \"libc/macros.internal.h\"\n\ .source __FILE__\n\ \n\ / Returns absolute value of double.\n\ @@ -86,7 +86,7 @@ tinymath_acos:\n\ TEST(ParseAsmdown, testAlias) { struct Asmdown *ad; const char *s = "\ -#include \"libc/macros.h\"\n\ +#include \"libc/macros.internal.h\"\n\ .source __FILE__\n\ \n\ / Returns arc cosine of 𝑥.\n\ @@ -136,7 +136,7 @@ tinymath_acos:\n\ TEST(ParseAsmdown, testClangIsEvil) { struct Asmdown *ad; const char *s = "\ -#include \"libc/macros.h\"\n\ +#include \"libc/macros.internal.h\"\n\ .source __FILE__\n\ \n\ // Returns arc cosine of 𝑥.\n\ diff --git a/test/tool/build/lib/bitscan_test.c b/test/tool/build/lib/bitscan_test.c index 650c4fed7..d2e8a19b6 100644 --- a/test/tool/build/lib/bitscan_test.c +++ b/test/tool/build/lib/bitscan_test.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/testlib/testlib.h" #include "test/tool/build/lib/numbers.h" #include "tool/build/lib/bitscan.h" diff --git a/test/tool/build/lib/bsu_test.c b/test/tool/build/lib/bsu_test.c index 6c9b0b4ad..8a7593bf3 100644 --- a/test/tool/build/lib/bsu_test.c +++ b/test/tool/build/lib/bsu_test.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/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/testlib/testlib.h" diff --git a/test/tool/build/lib/optest.c b/test/tool/build/lib/optest.c index 85a0decfe..35a4c0c7b 100644 --- a/test/tool/build/lib/optest.c +++ b/test/tool/build/lib/optest.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "test/tool/build/lib/numbers.h" diff --git a/test/tool/viz/lib/fun_test.c b/test/tool/viz/lib/fun_test.c index d38ecc73f..e97b3ac85 100644 --- a/test/tool/viz/lib/fun_test.c +++ b/test/tool/viz/lib/fun_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/rand/rand.h" #include "libc/runtime/gc.h" #include "libc/str/str.h" diff --git a/test/tool/viz/lib/ycbcr2rgb2_test.c b/test/tool/viz/lib/ycbcr2rgb2_test.c index 9625be253..ac63a5b33 100644 --- a/test/tool/viz/lib/ycbcr2rgb2_test.c +++ b/test/tool/viz/lib/ycbcr2rgb2_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/mpeg/mpeg.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/rand/rand.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/third_party/chibicc/as.c b/third_party/chibicc/as.c index c154db24f..ce33af3b4 100644 --- a/third_party/chibicc/as.c +++ b/third_party/chibicc/as.c @@ -22,7 +22,7 @@ #include "libc/fmt/conv.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bsr.h" #include "libc/runtime/runtime.h" diff --git a/third_party/chibicc/chibicc.h b/third_party/chibicc/chibicc.h index 2d51e3c5d..aef946e12 100644 --- a/third_party/chibicc/chibicc.h +++ b/third_party/chibicc/chibicc.h @@ -12,7 +12,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bsf.h" #include "libc/nexgen32e/bsr.h" diff --git a/third_party/chibicc/test/vla_test.c b/third_party/chibicc/test/vla_test.c index 870e04775..b5010645d 100644 --- a/third_party/chibicc/test/vla_test.c +++ b/third_party/chibicc/test/vla_test.c @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "third_party/chibicc/test/test.h" int index1d(int xn, int p[xn], int x) { diff --git a/third_party/compiler_rt/comprt.S b/third_party/compiler_rt/comprt.S index 215364d8a..8591b108f 100644 --- a/third_party/compiler_rt/comprt.S +++ b/third_party/compiler_rt/comprt.S @@ -1,4 +1,4 @@ -#include "libc/macros.h" +#include "libc/macros.internal.h" // Nop ref this to force pull the license into linkage. .section .yoink diff --git a/third_party/dlmalloc/dlmalloc.c b/third_party/dlmalloc/dlmalloc.c index 978b701bf..4bf1b9810 100644 --- a/third_party/dlmalloc/dlmalloc.c +++ b/third_party/dlmalloc/dlmalloc.c @@ -1,5 +1,5 @@ #include "libc/bits/initializer.internal.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/bits/weaken.h" #include "libc/calls/internal.h" #include "libc/calls/struct/sysinfo.h" @@ -7,7 +7,7 @@ #include "libc/fmt/conv.h" #include "libc/intrin/asan.internal.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nt/systeminfo.h" #include "libc/runtime/runtime.h" diff --git a/third_party/dlmalloc/initdlmalloc.S b/third_party/dlmalloc/initdlmalloc.S index 248ed8f45..5ef5a91f1 100644 --- a/third_party/dlmalloc/initdlmalloc.S +++ b/third_party/dlmalloc/initdlmalloc.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__ // Sneak ahead ctor list b/c runtime weakly links malloc. diff --git a/third_party/duktape/dukhexdectab.S b/third_party/duktape/dukhexdectab.S index 88f904647..ec9f6035e 100644 --- a/third_party/duktape/dukhexdectab.S +++ b/third_party/duktape/dukhexdectab.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" .initbss 300,_init_duk_hex_dectab duk_hex_dectab: diff --git a/third_party/getopt/initgetopt.S b/third_party/getopt/initgetopt.S index 5ba920cca..457c31ee5 100644 --- a/third_party/getopt/initgetopt.S +++ b/third_party/getopt/initgetopt.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__ .init.start 201,_init_getopt diff --git a/third_party/regex/regerror.c b/third_party/regex/regerror.c index e8a5bc887..b9762b1c1 100644 --- a/third_party/regex/regerror.c +++ b/third_party/regex/regerror.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/fmt/fmt.h" #include "libc/str/str.h" #include "third_party/regex/regex.h" diff --git a/third_party/stb/idct-sse.S b/third_party/stb/idct-sse.S index 0dc095836..0ab2c1a1b 100644 --- a/third_party/stb/idct-sse.S +++ b/third_party/stb/idct-sse.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 inverse discrete cosine transform. // diff --git a/third_party/stb/stb_image.c b/third_party/stb/stb_image.c index de10cfa00..e80805b10 100644 --- a/third_party/stb/stb_image.c +++ b/third_party/stb/stb_image.c @@ -23,7 +23,7 @@ #include "libc/limits.h" #include "libc/log/gdb.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/x86feature.h" diff --git a/third_party/stb/stb_image_resize.c b/third_party/stb/stb_image_resize.c index 6d30d49fb..233accf72 100644 --- a/third_party/stb/stb_image_resize.c +++ b/third_party/stb/stb_image_resize.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/third_party/stb/stb_image_write.c b/third_party/stb/stb_image_write.c index 8bc167ae0..771ce6143 100644 --- a/third_party/stb/stb_image_write.c +++ b/third_party/stb/stb_image_write.c @@ -123,7 +123,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/fmt.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nexgen32e.h" diff --git a/third_party/stb/ycbcr-sse2.S b/third_party/stb/ycbcr-sse2.S index 1415ee80d..9c0e495aa 100644 --- a/third_party/stb/ycbcr-sse2.S +++ b/third_party/stb/ycbcr-sse2.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" .align 16 stbi__YCbCr_to_RGB_row$sse2: diff --git a/third_party/stb/ycbcr.c b/third_party/stb/ycbcr.c index 6d9cfaeb5..a2053fda4 100644 --- a/third_party/stb/ycbcr.c +++ b/third_party/stb/ycbcr.c @@ -19,7 +19,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" #include "third_party/stb/internal.h" diff --git a/third_party/xed/x86ild.greg.c b/third_party/xed/x86ild.greg.c index be3fada18..921794845 100644 --- a/third_party/xed/x86ild.greg.c +++ b/third_party/xed/x86ild.greg.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/bits/bits.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/bsr.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/third_party/xed/x86tab.S b/third_party/xed/x86tab.S index 74fd0d89b..2abb847ff 100644 --- a/third_party/xed/x86tab.S +++ b/third_party/xed/x86tab.S @@ -16,7 +16,7 @@ │ See the License for the specific language governing permissions and │ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.h" +#include "libc/macros.internal.h" // Phash tables for instruction length decoding. // @see build/rle.py for more context here diff --git a/third_party/zlib/adler32.c b/third_party/zlib/adler32.c index 7cac2d3f4..228cd2681 100644 --- a/third_party/zlib/adler32.c +++ b/third_party/zlib/adler32.c @@ -9,7 +9,7 @@ #include "libc/dce.h" #include "libc/nexgen32e/x86feature.h" #include "third_party/zlib/internal.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ zlib (zlib License)\\n\ diff --git a/third_party/zlib/chunkcopy.h b/third_party/zlib/chunkcopy.internal.h similarity index 99% rename from third_party/zlib/chunkcopy.h rename to third_party/zlib/chunkcopy.internal.h index cc12ba0f4..1439fe6a7 100644 --- a/third_party/zlib/chunkcopy.h +++ b/third_party/zlib/chunkcopy.internal.h @@ -1,7 +1,7 @@ #ifndef THIRD_PARTY_ZLIB_CHUNKCOPY_H #define THIRD_PARTY_ZLIB_CHUNKCOPY_H #include "libc/bits/emmintrin.internal.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ Chromium (BSD-3 License)\\n\ diff --git a/third_party/zlib/crc32.c b/third_party/zlib/crc32.c index 11a123137..42e2b67bf 100644 --- a/third_party/zlib/crc32.c +++ b/third_party/zlib/crc32.c @@ -9,9 +9,9 @@ #include "libc/dce.h" #include "libc/nexgen32e/x86feature.h" #include "libc/str/str.h" -#include "third_party/zlib/deflate.h" +#include "third_party/zlib/deflate.internal.h" #include "third_party/zlib/internal.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ zlib (zlib License)\\n\ diff --git a/third_party/zlib/crc32concat.c b/third_party/zlib/crc32concat.c index 32a4979b1..e5594f424 100644 --- a/third_party/zlib/crc32concat.c +++ b/third_party/zlib/crc32concat.c @@ -6,9 +6,9 @@ │ Use of this source code is governed by the BSD-style licenses that can │ │ be found in the third_party/zlib/LICENSE file. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "third_party/zlib/deflate.h" +#include "third_party/zlib/deflate.internal.h" #include "third_party/zlib/internal.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ zlib (zlib License)\\n\ diff --git a/third_party/zlib/crcfold.c b/third_party/zlib/crcfold.c index a022a6119..6dde29627 100644 --- a/third_party/zlib/crcfold.c +++ b/third_party/zlib/crcfold.c @@ -11,7 +11,7 @@ #include "libc/bits/wmmintrin.internal.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" -#include "third_party/zlib/deflate.h" +#include "third_party/zlib/deflate.internal.h" #include "third_party/zlib/internal.h" #ifndef __llvm__ diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c index 0370b3682..59dc2d6bc 100644 --- a/third_party/zlib/deflate.c +++ b/third_party/zlib/deflate.c @@ -7,13 +7,13 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/dce.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/x86feature.h" #include "libc/str/str.h" -#include "third_party/zlib/deflate.h" +#include "third_party/zlib/deflate.internal.h" #include "third_party/zlib/internal.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ inflate 1.2.11 (zlib License)\\n\ diff --git a/third_party/zlib/deflate.h b/third_party/zlib/deflate.internal.h similarity index 96% rename from third_party/zlib/deflate.h rename to third_party/zlib/deflate.internal.h index 452f8c488..1b17ffd5d 100644 --- a/third_party/zlib/deflate.h +++ b/third_party/zlib/deflate.internal.h @@ -1,6 +1,6 @@ #ifndef DEFLATE_H #define DEFLATE_H -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" /* define NO_GZIP when compiling if you want to disable gzip header and trailer creation by deflate(). NO_GZIP would be used to avoid linking @@ -40,12 +40,12 @@ #ifdef GZIP #define GZIP_STATE 57 /* gzip header -> BUSY_STATE | EXTRA_STATE */ #endif -#define EXTRA_STATE 69 /* gzip extra block -> NAME_STATE */ -#define NAME_STATE 73 /* gzip file name -> COMMENT_STATE */ -#define COMMENT_STATE 91 /* gzip comment -> HCRC_STATE */ -#define HCRC_STATE 103 /* gzip header CRC -> BUSY_STATE */ -#define BUSY_STATE 113 /* deflate -> FINISH_STATE */ -#define FINISH_STATE 666 /* stream complete */ +#define EXTRA_STATE 69 /* gzip extra block -> NAME_STATE */ +#define NAME_STATE 73 /* gzip file name -> COMMENT_STATE */ +#define COMMENT_STATE 91 /* gzip comment -> HCRC_STATE */ +#define HCRC_STATE 103 /* gzip header CRC -> BUSY_STATE */ +#define BUSY_STATE 113 /* deflate -> FINISH_STATE */ +#define FINISH_STATE 666 /* stream complete */ #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ @@ -64,8 +64,8 @@ typedef struct ct_data_s { #define Freq fc.freq #define Code fc.code -#define Dad dl.dad -#define Len dl.len +#define Dad dl.dad +#define Len dl.len typedef struct static_tree_desc_s static_tree_desc; diff --git a/third_party/zlib/deflateinit.S b/third_party/zlib/deflateinit.S index 149244275..4035a92bb 100644 --- a/third_party/zlib/deflateinit.S +++ b/third_party/zlib/deflateinit.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/zlib/zlib.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" deflateInit: mov $Z_DEFLATED,%edx diff --git a/third_party/zlib/deflatesse.c b/third_party/zlib/deflatesse.c index 72d6e41f5..1b870ffe4 100644 --- a/third_party/zlib/deflatesse.c +++ b/third_party/zlib/deflatesse.c @@ -7,9 +7,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/emmintrin.internal.h" #include "libc/str/str.h" -#include "third_party/zlib/deflate.h" +#include "third_party/zlib/deflate.internal.h" #include "third_party/zlib/internal.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ zlib » sse2 fill window (zlib License)\\n\ diff --git a/third_party/zlib/infback.c b/third_party/zlib/infback.c index 42274587f..34ffa8e58 100644 --- a/third_party/zlib/infback.c +++ b/third_party/zlib/infback.c @@ -6,11 +6,11 @@ │ be found in the third_party/zlib/LICENSE file. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -#include "third_party/zlib/inffast.h" -#include "third_party/zlib/inflate.h" -#include "third_party/zlib/inftrees.h" +#include "third_party/zlib/inffast.internal.h" +#include "third_party/zlib/inflate.internal.h" +#include "third_party/zlib/inftrees.internal.h" #include "third_party/zlib/internal.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ zlib (zlib License)\\n\ diff --git a/third_party/zlib/inffast.c b/third_party/zlib/inffast.c index 71e62f058..177a39a0b 100644 --- a/third_party/zlib/inffast.c +++ b/third_party/zlib/inffast.c @@ -5,10 +5,10 @@ │ Use of this source code is governed by the BSD-style licenses that can │ │ be found in the third_party/zlib/LICENSE file. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "third_party/zlib/inffast.h" -#include "third_party/zlib/inflate.h" -#include "third_party/zlib/inftrees.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/inffast.internal.h" +#include "third_party/zlib/inflate.internal.h" +#include "third_party/zlib/inftrees.internal.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ zlib (zlib License)\\n\ diff --git a/third_party/zlib/inffast.h b/third_party/zlib/inffast.internal.h similarity index 95% rename from third_party/zlib/inffast.h rename to third_party/zlib/inffast.internal.h index 5b8456d94..8fd191bfb 100644 --- a/third_party/zlib/inffast.h +++ b/third_party/zlib/inffast.internal.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_ZLIB_INFFAST_H_ #define COSMOPOLITAN_THIRD_PARTY_ZLIB_INFFAST_H_ -#include "third_party/zlib/inffast.h" +#include "third_party/zlib/inffast.internal.h" #include "third_party/zlib/zlib.h" /* INFLATE_FAST_MIN_INPUT: the minimum number of input bytes needed so that diff --git a/third_party/zlib/inffastchunk.c b/third_party/zlib/inffastchunk.c index cce9be3fc..58363b8d9 100644 --- a/third_party/zlib/inffastchunk.c +++ b/third_party/zlib/inffastchunk.c @@ -6,12 +6,12 @@ │ be found in the third_party/zlib/LICENSE file. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "third_party/zlib/chunkcopy.h" -#include "third_party/zlib/inffast.h" -#include "third_party/zlib/inflate.h" -#include "third_party/zlib/inftrees.h" +#include "third_party/zlib/chunkcopy.internal.h" +#include "third_party/zlib/inffast.internal.h" +#include "third_party/zlib/inflate.internal.h" +#include "third_party/zlib/inftrees.internal.h" #include "third_party/zlib/zlib.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ zlib (zlib License)\\n\ diff --git a/third_party/zlib/inffixed.c b/third_party/zlib/inffixed.c index 12df5d1ce..54b19fb4a 100644 --- a/third_party/zlib/inffixed.c +++ b/third_party/zlib/inffixed.c @@ -1,11 +1,11 @@ -#include "third_party/zlib/inftrees.h" +#include "third_party/zlib/inftrees.internal.h" /** * @fileoverview tables for decoding fixed codes * @note generated by makefixed() */ -const struct zcode kZlibLenfix[512] = { +hidden const struct zcode kZlibLenfix[512] = { {96, 7, 0}, {0, 8, 80}, {0, 8, 16}, {20, 8, 115}, {18, 7, 31}, {0, 8, 112}, {0, 8, 48}, {0, 9, 192}, {16, 7, 10}, {0, 8, 96}, {0, 8, 32}, {0, 9, 160}, {0, 8, 0}, {0, 8, 128}, {0, 8, 64}, @@ -111,7 +111,7 @@ const struct zcode kZlibLenfix[512] = { {0, 8, 79}, {0, 9, 255}, }; -const struct zcode kZlibDistfix[32] = { +hidden const struct zcode kZlibDistfix[32] = { {16, 5, 1}, {23, 5, 257}, {19, 5, 17}, {27, 5, 4097}, {17, 5, 5}, {25, 5, 1025}, {21, 5, 65}, {29, 5, 16385}, {16, 5, 3}, {24, 5, 513}, {20, 5, 33}, {28, 5, 8193}, {18, 5, 9}, {26, 5, 2049}, {22, 5, 129}, diff --git a/third_party/zlib/inflate.c b/third_party/zlib/inflate.c index 3c8800120..c7fbae980 100644 --- a/third_party/zlib/inflate.c +++ b/third_party/zlib/inflate.c @@ -6,12 +6,12 @@ │ be found in the third_party/zlib/LICENSE file. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -#include "third_party/zlib/chunkcopy.h" -#include "third_party/zlib/inffast.h" -#include "third_party/zlib/inflate.h" -#include "third_party/zlib/inftrees.h" +#include "third_party/zlib/chunkcopy.internal.h" +#include "third_party/zlib/inffast.internal.h" +#include "third_party/zlib/inflate.internal.h" +#include "third_party/zlib/inftrees.internal.h" #include "third_party/zlib/internal.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ zlib (zlib License)\\n\ diff --git a/third_party/zlib/inflate.h b/third_party/zlib/inflate.internal.h similarity index 99% rename from third_party/zlib/inflate.h rename to third_party/zlib/inflate.internal.h index 6a68de873..9a1ed86ae 100644 --- a/third_party/zlib/inflate.h +++ b/third_party/zlib/inflate.internal.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_ZLIB_INFLATE_H_ #define COSMOPOLITAN_THIRD_PARTY_ZLIB_INFLATE_H_ -#include "third_party/zlib/inftrees.h" +#include "third_party/zlib/inftrees.internal.h" #include "third_party/zlib/zlib.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ diff --git a/third_party/zlib/inflateinit.S b/third_party/zlib/inflateinit.S index a6cac3e75..520698ed8 100644 --- a/third_party/zlib/inflateinit.S +++ b/third_party/zlib/inflateinit.S @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "third_party/zlib/zutil.h" -#include "libc/macros.h" +#include "third_party/zlib/zutil.internal.h" +#include "libc/macros.internal.h" inflateInit: mov $DEF_WBITS,%esi diff --git a/third_party/zlib/inftrees.c b/third_party/zlib/inftrees.c index b839d900a..25fb853ea 100644 --- a/third_party/zlib/inftrees.c +++ b/third_party/zlib/inftrees.c @@ -5,8 +5,8 @@ │ Use of this source code is governed by the BSD-style licenses that can │ │ be found in the third_party/zlib/LICENSE file. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "third_party/zlib/inftrees.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/inftrees.internal.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ inflate 1.2.11 (zlib License)\\n\ diff --git a/third_party/zlib/inftrees.h b/third_party/zlib/inftrees.internal.h similarity index 100% rename from third_party/zlib/inftrees.h rename to third_party/zlib/inftrees.internal.h diff --git a/third_party/zlib/internal.h b/third_party/zlib/internal.h index c5efe6409..3888cfc08 100644 --- a/third_party/zlib/internal.h +++ b/third_party/zlib/internal.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_ZLIB_INTERNAL_H_ #define COSMOPOLITAN_THIRD_PARTY_ZLIB_INTERNAL_H_ -#include "third_party/zlib/deflate.h" +#include "third_party/zlib/deflate.internal.h" #define Z_CRC32_SSE42_MINIMUM_LENGTH 64 #define Z_CRC32_SSE42_CHUNKSIZE_MASK 15 diff --git a/third_party/zlib/kdistcode.S b/third_party/zlib/kdistcode.S index 820ac36d9..16508dfa8 100644 --- a/third_party/zlib/kdistcode.S +++ b/third_party/zlib/kdistcode.S @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "third_party/zlib/deflate.h" -#include "libc/macros.h" +#include "third_party/zlib/deflate.internal.h" +#include "libc/macros.internal.h" .initbss 300,_init_kZlibDistCode kZlibDistCode: diff --git a/third_party/zlib/klengthcode.S b/third_party/zlib/klengthcode.S index 7173b9d1f..436e23833 100644 --- a/third_party/zlib/klengthcode.S +++ b/third_party/zlib/klengthcode.S @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "third_party/zlib/zutil.h" -#include "libc/macros.h" +#include "third_party/zlib/zutil.internal.h" +#include "libc/macros.internal.h" .initbss 300,_init_kZlibLengthCode kZlibLengthCode: diff --git a/third_party/zlib/kstaticdtree.c b/third_party/zlib/kstaticdtree.c index 40cac3a85..390d9ef76 100644 --- a/third_party/zlib/kstaticdtree.c +++ b/third_party/zlib/kstaticdtree.c @@ -1,6 +1,6 @@ #include "third_party/zlib/internal.h" -const ct_data kZlibStaticDtree[D_CODES] = { +hidden const ct_data kZlibStaticDtree[D_CODES] = { {{0}, {5}}, {{16}, {5}}, {{8}, {5}}, {{24}, {5}}, {{4}, {5}}, {{20}, {5}}, {{12}, {5}}, {{28}, {5}}, {{2}, {5}}, {{18}, {5}}, {{10}, {5}}, {{26}, {5}}, {{6}, {5}}, {{22}, {5}}, {{14}, {5}}, diff --git a/third_party/zlib/kstaticltree.c b/third_party/zlib/kstaticltree.c index 675eac031..f5f6ec104 100644 --- a/third_party/zlib/kstaticltree.c +++ b/third_party/zlib/kstaticltree.c @@ -1,6 +1,6 @@ #include "third_party/zlib/internal.h" -const ct_data kZlibStaticLtree[L_CODES + 2] = { +hidden const ct_data kZlibStaticLtree[L_CODES + 2] = { {{12}, {8}}, {{140}, {8}}, {{76}, {8}}, {{204}, {8}}, {{44}, {8}}, {{172}, {8}}, {{108}, {8}}, {{236}, {8}}, {{28}, {8}}, {{156}, {8}}, {{92}, {8}}, {{220}, {8}}, {{60}, {8}}, {{188}, {8}}, {{124}, {8}}, diff --git a/third_party/zlib/treeconst.c b/third_party/zlib/treeconst.c index 37fa4100e..001205a33 100644 --- a/third_party/zlib/treeconst.c +++ b/third_party/zlib/treeconst.c @@ -1,12 +1,12 @@ /* header created automatically with -DGEN_TREES_H */ #include "third_party/zlib/internal.h" -const int kZlibBaseLength[LENGTH_CODES] = { +hidden const int kZlibBaseLength[LENGTH_CODES] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 0, }; -const int kZlibBaseDist[D_CODES] = { +hidden const int kZlibBaseDist[D_CODES] = { 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576, diff --git a/third_party/zlib/trees.c b/third_party/zlib/trees.c index 48ab9f05e..b1ce64568 100644 --- a/third_party/zlib/trees.c +++ b/third_party/zlib/trees.c @@ -7,7 +7,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "third_party/zlib/deflate.h" +#include "third_party/zlib/deflate.internal.h" #include "third_party/zlib/internal.h" asm(".ident\t\"\\n\\n\ @@ -822,7 +822,9 @@ void _tr_stored_block(struct DeflateState *s, charf *buf, uint64_t stored_len, /** * Flushes bits in bit buffer to pending output (leaves at most 7 bits) */ -void _tr_flush_bits(struct DeflateState *s) { bi_flush(s); } +void _tr_flush_bits(struct DeflateState *s) { + bi_flush(s); +} /** * Sends one empty static block to give enough lookahead for inflate. diff --git a/third_party/zlib/zalloc.c b/third_party/zlib/zalloc.c index ab6c5b10e..e791f50e7 100644 --- a/third_party/zlib/zalloc.c +++ b/third_party/zlib/zalloc.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/mem/mem.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" void *zcalloc(void *opaque, unsigned items, unsigned size) { return weaken(malloc)(items * size); diff --git a/third_party/zlib/zutil.c b/third_party/zlib/zutil.c index ea02e1be4..43b8407e6 100644 --- a/third_party/zlib/zutil.c +++ b/third_party/zlib/zutil.c @@ -6,7 +6,7 @@ │ be found in the third_party/zlib/LICENSE file. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/mem/mem.h" -#include "third_party/zlib/zutil.h" +#include "third_party/zlib/zutil.internal.h" asm(".ident\t\"\\n\\n\ zlib (zlib License)\\n\ @@ -26,7 +26,9 @@ const char *const z_errmsg[10] = { (const char *)"", }; -const char *zlibVersion() { return ZLIB_VERSION; } +const char *zlibVersion() { + return ZLIB_VERSION; +} uLong zlibCompileFlags() { uLong flags; @@ -125,4 +127,6 @@ void z_error(char *m) { * Exported to allow conversion of error code to string for compress() * and uncompress() */ -const char *zError(int err) { return ERR_MSG(err); } +const char *zError(int err) { + return ERR_MSG(err); +} diff --git a/third_party/zlib/zutil.h b/third_party/zlib/zutil.internal.h similarity index 96% rename from third_party/zlib/zutil.h rename to third_party/zlib/zutil.internal.h index 02ac9fa2a..388fbf3d4 100644 --- a/third_party/zlib/zutil.h +++ b/third_party/zlib/zutil.internal.h @@ -12,7 +12,7 @@ /* The three kinds of block type */ #define STORED_BLOCK 0 #define STATIC_TREES 1 -#define DYN_TREES 2 +#define DYN_TREES 2 /* The minimum and maximum match lengths */ #define MIN_MATCH 3 @@ -32,7 +32,7 @@ COSMOPOLITAN_C_START_ define "local" for the non-static meaning of "static", for readability (compile with -Dlocal if your debugger can't find static symbols) */ -extern const char *const z_errmsg[10]; /* indexed by 2-zlib_error */ +extern const char *const z_errmsg[10] hidden; /* indexed by 2-zlib_error */ /* (size given to avoid silly warnings with Visual C++) */ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT - (err)] diff --git a/tool/build/ar.c b/tool/build/ar.c index 1ab48e1f8..487d6ef8a 100644 --- a/tool/build/ar.c +++ b/tool/build/ar.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/arraylist2.internal.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/iovec.h" #include "libc/calls/struct/stat.h" @@ -27,7 +27,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" #include "libc/stdio/stdio.h" diff --git a/tool/build/blinkenlights.c b/tool/build/blinkenlights.c index 1a1b95157..ccc3ad85d 100644 --- a/tool/build/blinkenlights.c +++ b/tool/build/blinkenlights.c @@ -21,7 +21,7 @@ #include "libc/alg/arraylist2.internal.h" #include "libc/assert.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/ioctl.h" #include "libc/calls/struct/iovec.h" @@ -40,7 +40,7 @@ #include "libc/log/check.h" #include "libc/log/color.internal.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/runtime/gc.h" @@ -2773,7 +2773,7 @@ static void GetOpts(int argc, char *argv[]) { memset(&g_high, 0, sizeof(g_high)); break; case 'v': - ++g_loglevel; + ++__log_level; break; case 'L': strcpy(logpath, optarg); @@ -2790,8 +2790,8 @@ static void GetOpts(int argc, char *argv[]) { PrintUsage(EX_USAGE, stderr); } } - g_logfile = fopen(logpath, "a"); - setvbuf(g_logfile, xmalloc(PAGESIZE), _IOLBF, PAGESIZE); + __log_file = fopen(logpath, "a"); + setvbuf(__log_file, xmalloc(PAGESIZE), _IOLBF, PAGESIZE); } static int OpenDevTty(void) { diff --git a/tool/build/calculator.c b/tool/build/calculator.c index 2a314ece3..8e87d82c3 100644 --- a/tool/build/calculator.c +++ b/tool/build/calculator.c @@ -20,7 +20,7 @@ #include "libc/limits.h" #include "libc/log/color.internal.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/rand/rand.h" diff --git a/tool/build/compile.c b/tool/build/compile.c index 0ea18f0ab..c5079ee64 100644 --- a/tool/build/compile.c +++ b/tool/build/compile.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/calls/calls.h" #include "libc/calls/copyfile.h" #include "libc/calls/sigbits.h" diff --git a/tool/build/dis.c b/tool/build/dis.c index 9bd17419b..401792e4c 100644 --- a/tool/build/dis.c +++ b/tool/build/dis.c @@ -25,7 +25,7 @@ #include "libc/elf/struct/sym.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/struct/importobjectheader.internal.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/tool/build/emucrt/emucrt.S b/tool/build/emucrt/emucrt.S index 98b1a8e67..6c8142688 100644 --- a/tool/build/emucrt/emucrt.S +++ b/tool/build/emucrt/emucrt.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" .section .start,"ax",@progbits emucrt: bofram 9f diff --git a/tool/build/helpop.c b/tool/build/helpop.c index 8c4f34052..5d4194523 100644 --- a/tool/build/helpop.c +++ b/tool/build/helpop.c @@ -16,9 +16,9 @@ │ 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/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/tool/build/lib/buffer.c b/tool/build/lib/buffer.c index 1202b2c41..631af8413 100644 --- a/tool/build/lib/buffer.c +++ b/tool/build/lib/buffer.c @@ -20,7 +20,7 @@ #include "libc/calls/calls.h" #include "libc/errno.h" #include "libc/fmt/fmt.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/fmt.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/tool/build/lib/cga.c b/tool/build/lib/cga.c index d22465def..74b1b914c 100644 --- a/tool/build/lib/cga.c +++ b/tool/build/lib/cga.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/itoa.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" #include "tool/build/lib/buffer.h" #include "tool/build/lib/cga.h" diff --git a/tool/build/lib/cvt.c b/tool/build/lib/cvt.c index 1c2968a2a..7a85bb262 100644 --- a/tool/build/lib/cvt.c +++ b/tool/build/lib/cvt.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/math.h" #include "tool/build/lib/cvt.h" #include "tool/build/lib/endian.h" diff --git a/tool/build/lib/demangle.c b/tool/build/lib/demangle.c index 89422226e..5206651e3 100644 --- a/tool/build/lib/demangle.c +++ b/tool/build/lib/demangle.c @@ -17,10 +17,10 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/iovec.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" #include "libc/str/str.h" diff --git a/tool/build/lib/dis.c b/tool/build/lib/dis.c index aaca950ec..315d82d96 100644 --- a/tool/build/lib/dis.c +++ b/tool/build/lib/dis.c @@ -18,13 +18,13 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" #include "libc/alg/arraylist2.internal.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/fmt/bing.internal.h" #include "libc/fmt/fmt.h" #include "libc/fmt/itoa.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/tool/build/lib/disarg.c b/tool/build/lib/disarg.c index c957e9607..76a576c07 100644 --- a/tool/build/lib/disarg.c +++ b/tool/build/lib/disarg.c @@ -21,7 +21,7 @@ #include "libc/fmt/itoa.h" #include "libc/limits.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" #include "tool/build/lib/demangle.h" #include "tool/build/lib/dis.h" diff --git a/tool/build/lib/diself.c b/tool/build/lib/diself.c index 6231d6c24..2fa5f9d0e 100644 --- a/tool/build/lib/diself.c +++ b/tool/build/lib/diself.c @@ -21,7 +21,7 @@ #include "libc/elf/struct/sym.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "tool/build/lib/dis.h" diff --git a/tool/build/lib/elfwriter.c b/tool/build/lib/elfwriter.c index 74521170e..9910f5610 100644 --- a/tool/build/lib/elfwriter.c +++ b/tool/build/lib/elfwriter.c @@ -20,7 +20,7 @@ #include "libc/assert.h" #include "libc/calls/calls.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/fmt.h" #include "libc/mem/mem.h" #include "libc/runtime/gc.h" diff --git a/tool/build/lib/errnos.S b/tool/build/lib/errnos.S index 7ed4edacb..e55c7d251 100644 --- a/tool/build/lib/errnos.S +++ b/tool/build/lib/errnos.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" .macro .errno local:req linux:req .globl \local diff --git a/tool/build/lib/instruction.c b/tool/build/lib/instruction.c index 59f09594a..038d12d25 100644 --- a/tool/build/lib/instruction.c +++ b/tool/build/lib/instruction.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/nexgen32e/bsf.h" #include "libc/str/str.h" #include "third_party/xed/x86.h" diff --git a/tool/build/lib/interner.c b/tool/build/lib/interner.c index 0f68d55e7..820c24d98 100644 --- a/tool/build/lib/interner.c +++ b/tool/build/lib/interner.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/arraylist.internal.h" #include "libc/alg/arraylist2.internal.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" #include "libc/str/str.h" diff --git a/tool/build/lib/iovs.h b/tool/build/lib/iovs.h index 09089a84d..06da78903 100644 --- a/tool/build/lib/iovs.h +++ b/tool/build/lib/iovs.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_IOVS_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_IOVS_H_ #include "libc/calls/struct/iovec.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ diff --git a/tool/build/lib/loader.c b/tool/build/lib/loader.c index e1d5ddce7..1e424d300 100644 --- a/tool/build/lib/loader.c +++ b/tool/build/lib/loader.c @@ -23,7 +23,7 @@ #include "libc/elf/struct/phdr.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/vendor.internal.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/tool/build/lib/machine.c b/tool/build/lib/machine.c index b88f35d45..c6478ce4b 100644 --- a/tool/build/lib/machine.c +++ b/tool/build/lib/machine.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/rand/rand.h" #include "libc/runtime/runtime.h" #include "tool/build/lib/abp.h" diff --git a/tool/build/lib/mda.c b/tool/build/lib/mda.c index c466aab6f..52b9ab678 100644 --- a/tool/build/lib/mda.c +++ b/tool/build/lib/mda.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" #include "tool/build/lib/buffer.h" #include "tool/build/lib/mda.h" diff --git a/tool/build/lib/memory.c b/tool/build/lib/memory.c index 7e4d20bf0..e8a8cc680 100644 --- a/tool/build/lib/memory.c +++ b/tool/build/lib/memory.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "libc/x/x.h" diff --git a/tool/build/lib/message.c b/tool/build/lib/message.c index d32a9e771..299e1ed3d 100644 --- a/tool/build/lib/message.c +++ b/tool/build/lib/message.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/tool/build/lib/panel.c b/tool/build/lib/panel.c index ca6b18281..a0ee65279 100644 --- a/tool/build/lib/panel.c +++ b/tool/build/lib/panel.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/fmt/conv.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/tool/build/lib/persist.c b/tool/build/lib/persist.c index 942a1f32d..59c565baa 100644 --- a/tool/build/lib/persist.c +++ b/tool/build/lib/persist.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/calls/struct/iovec.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/bsr.h" #include "libc/runtime/gc.h" #include "libc/sock/sock.h" diff --git a/tool/build/lib/pml4tfmt.c b/tool/build/lib/pml4tfmt.c index 5cd57bafd..a4324f75d 100644 --- a/tool/build/lib/pml4tfmt.c +++ b/tool/build/lib/pml4tfmt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/x/x.h" #include "tool/build/lib/buffer.h" diff --git a/tool/build/lib/pty.c b/tool/build/lib/pty.c index 833df35b8..99cf8b731 100644 --- a/tool/build/lib/pty.c +++ b/tool/build/lib/pty.c @@ -19,12 +19,12 @@ #include "libc/alg/arraylist2.internal.h" #include "libc/assert.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bsr.h" #include "libc/runtime/runtime.h" diff --git a/tool/build/lib/reset.c b/tool/build/lib/reset.c index 26f14e148..f5bd60c9f 100644 --- a/tool/build/lib/reset.c +++ b/tool/build/lib/reset.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/tool/build/lib/sse.c b/tool/build/lib/sse.c index 4b37992ca..f75f17246 100644 --- a/tool/build/lib/sse.c +++ b/tool/build/lib/sse.c @@ -92,7 +92,7 @@ #include "libc/intrin/punpcklqdq.h" #include "libc/intrin/punpcklwd.h" #include "libc/intrin/pxor.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "tool/build/lib/case.h" #include "tool/build/lib/machine.h" #include "tool/build/lib/memory.h" diff --git a/tool/build/lib/ssefloat.c b/tool/build/lib/ssefloat.c index 030f957d6..22935f222 100644 --- a/tool/build/lib/ssefloat.c +++ b/tool/build/lib/ssefloat.c @@ -24,7 +24,7 @@ #include "libc/intrin/shufpd.h" #include "libc/intrin/shufps.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/str/str.h" #include "tool/build/lib/endian.h" diff --git a/tool/build/lib/stack.c b/tool/build/lib/stack.c index d8057f618..0ebe775dc 100644 --- a/tool/build/lib/stack.c +++ b/tool/build/lib/stack.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "tool/build/lib/address.h" #include "tool/build/lib/endian.h" #include "tool/build/lib/memory.h" diff --git a/tool/build/lib/string.c b/tool/build/lib/string.c index 8c883c4a6..336388084 100644 --- a/tool/build/lib/string.c +++ b/tool/build/lib/string.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" #include "tool/build/lib/address.h" diff --git a/tool/build/lib/syscall.c b/tool/build/lib/syscall.c index bb6d9d1a2..554dab97c 100644 --- a/tool/build/lib/syscall.c +++ b/tool/build/lib/syscall.c @@ -33,7 +33,7 @@ #include "libc/fmt/fmt.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/vendor.internal.h" #include "libc/runtime/gc.h" diff --git a/tool/build/lz4toasm.c b/tool/build/lz4toasm.c index 78747bf08..5f9489a8d 100644 --- a/tool/build/lz4toasm.c +++ b/tool/build/lz4toasm.c @@ -21,7 +21,7 @@ #include "libc/fmt/conv.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/kompressor.h" #include "libc/nexgen32e/lz4.h" diff --git a/tool/build/mkdeps.c b/tool/build/mkdeps.c index 41384bf54..0ebffa579 100644 --- a/tool/build/mkdeps.c +++ b/tool/build/mkdeps.c @@ -22,14 +22,14 @@ #include "libc/alg/bisectcarleft.internal.h" #include "libc/assert.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/errno.h" #include "libc/fmt/fmt.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/crc32.h" #include "libc/runtime/ezmap.internal.h" #include "libc/runtime/gc.h" diff --git a/tool/build/package.c b/tool/build/package.c index 9d9671aa9..26fe5de9b 100644 --- a/tool/build/package.c +++ b/tool/build/package.c @@ -22,7 +22,7 @@ #include "libc/alg/bisectcarleft.internal.h" #include "libc/assert.h" #include "libc/bits/bswap.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/elf/def.h" @@ -32,7 +32,7 @@ #include "libc/fmt/conv.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bsr.h" #include "libc/nexgen32e/kompressor.h" @@ -227,7 +227,7 @@ void GetOpts(struct Package *pkg, struct Packages *deps, int argc, while ((opt = getopt(argc, argv, "vho:d:")) != -1) { switch (opt) { case 'v': - g_loglevel = kLogDebug; + __log_level = kLogDebug; break; case 'o': pkg->path = concat(&pkg->strings, optarg, strlen(optarg) + 1); diff --git a/tool/build/refactor.c b/tool/build/refactor.c index 0c83034e3..f08e7cde4 100644 --- a/tool/build/refactor.c +++ b/tool/build/refactor.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" #include "libc/assert.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/dirent.h" #include "libc/calls/struct/stat.h" diff --git a/tool/build/runit.c b/tool/build/runit.c index 0e43bc039..5964840b1 100644 --- a/tool/build/runit.c +++ b/tool/build/runit.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/sigbits.h" #include "libc/calls/struct/flock.h" @@ -465,7 +465,7 @@ int RunRemoteTestsInParallel(char *hosts[], int count) { int main(int argc, char *argv[]) { showcrashreports(); - /* g_loglevel = kLogDebug; */ + /* __log_level = kLogDebug; */ if (argc > 1 && (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0)) { ShowUsage(stdout, 0); diff --git a/tool/build/runitd.c b/tool/build/runitd.c index 0af4789bb..1ee3e27fa 100644 --- a/tool/build/runitd.c +++ b/tool/build/runitd.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/sigbits.h" #include "libc/calls/struct/sigaction.h" @@ -28,7 +28,7 @@ #include "libc/fmt/fmt.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nt/runtime.h" #include "libc/paths.h" #include "libc/runtime/gc.h" @@ -435,7 +435,7 @@ void Daemonize(void) { int main(int argc, char *argv[]) { showcrashreports(); - /* g_loglevel = kLogDebug; */ + /* __log_level = kLogDebug; */ GetOpts(argc, argv); CHECK_NE(-1, (g_devnullfd = open("/dev/null", O_RDWR))); defer(close_s, &g_devnullfd); diff --git a/tool/build/x86combos.c b/tool/build/x86combos.c index 2d2b7dd2e..a21459407 100644 --- a/tool/build/x86combos.c +++ b/tool/build/x86combos.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" #include "libc/sysv/consts/o.h" diff --git a/tool/build/zipobj.c b/tool/build/zipobj.c index f80c4e6fd..76c842ec2 100644 --- a/tool/build/zipobj.c +++ b/tool/build/zipobj.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/arraylist.internal.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/calls/struct/timespec.h" @@ -27,7 +27,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/alloca.h" #include "libc/nexgen32e/crc32.h" #include "libc/nt/enum/fileflagandattributes.h" diff --git a/tool/decode/elf.c b/tool/decode/elf.c index 2d7a09bab..1948ae7d9 100644 --- a/tool/decode/elf.c +++ b/tool/decode/elf.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/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/elf/elf.h" @@ -26,7 +26,7 @@ #include "libc/fmt/conv.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" #include "libc/sysv/consts/map.h" diff --git a/tool/decode/lib/asmcodegen.c b/tool/decode/lib/asmcodegen.c index a2a425237..04798cf34 100644 --- a/tool/decode/lib/asmcodegen.c +++ b/tool/decode/lib/asmcodegen.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/fmt/fmt.h" #include "libc/mem/mem.h" #include "libc/runtime/gc.h" diff --git a/tool/decode/lib/bitabuilder.c b/tool/decode/lib/bitabuilder.c index b2d7523c0..c803b870f 100644 --- a/tool/decode/lib/bitabuilder.c +++ b/tool/decode/lib/bitabuilder.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/bits/bits.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/tool/decode/lib/pollnames.S b/tool/decode/lib/pollnames.S index f6bdd716a..04468259c 100644 --- a/tool/decode/lib/pollnames.S +++ b/tool/decode/lib/pollnames.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "ape/relocations.h" #include "ape/relocations.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" .Lrows = 0 # w/ 2 cols diff --git a/tool/decode/macho.c b/tool/decode/macho.c index 419c31185..a587a374d 100644 --- a/tool/decode/macho.c +++ b/tool/decode/macho.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/fmt/conv.h" diff --git a/tool/decode/mkcombos.c b/tool/decode/mkcombos.c index d4bdd0c9a..750929d24 100644 --- a/tool/decode/mkcombos.c +++ b/tool/decode/mkcombos.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/calls/calls.h" #include "libc/fmt/conv.h" #include "libc/log/check.h" diff --git a/tool/decode/mkwides.c b/tool/decode/mkwides.c index 52ffa4813..062bbe3b8 100644 --- a/tool/decode/mkwides.c +++ b/tool/decode/mkwides.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/fmt/fmt.h" #include "libc/log/check.h" #include "libc/mem/mem.h" diff --git a/tool/decode/pe2.c b/tool/decode/pe2.c index fe1e9c08c..d932329d6 100644 --- a/tool/decode/pe2.c +++ b/tool/decode/pe2.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/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/fmt/conv.h" diff --git a/tool/decode/x86opinfo.c b/tool/decode/x86opinfo.c index 0fc23d94a..97f289c4d 100644 --- a/tool/decode/x86opinfo.c +++ b/tool/decode/x86opinfo.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/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/tool/decode/zip.c b/tool/decode/zip.c index 011076b65..58f7b79a1 100644 --- a/tool/decode/zip.c +++ b/tool/decode/zip.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/fmt/conv.h" diff --git a/tool/hash/crctab.c b/tool/hash/crctab.c index 65612d796..4b9fdffde 100644 --- a/tool/hash/crctab.c +++ b/tool/hash/crctab.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/fmt/conv.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/crc32.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/tool/net/echoserver.c b/tool/net/echoserver.c index 81e1342f5..8184d260a 100644 --- a/tool/net/echoserver.c +++ b/tool/net/echoserver.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/arraylist.internal.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/iovec.h" #include "libc/errno.h" diff --git a/tool/net/redbean.c b/tool/net/redbean.c index 376e1fddb..4419f8554 100644 --- a/tool/net/redbean.c +++ b/tool/net/redbean.c @@ -19,7 +19,7 @@ #include "libc/alg/arraylist2.internal.h" #include "libc/bits/bits.h" #include "libc/bits/bswap.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/iovec.h" #include "libc/calls/struct/itimerval.h" @@ -30,7 +30,7 @@ #include "libc/fmt/itoa.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" @@ -374,7 +374,7 @@ void GetOpts(int argc, char *argv[]) { while ((opt = getopt(argc, argv, "zhduvml:p:w:r:c:L:P:U:G:B:")) != -1) { switch (opt) { case 'v': - g_loglevel++; + __log_level++; break; case 'd': daemonize = true; diff --git a/tool/viz/basicidea.c b/tool/viz/basicidea.c index a6a4f0cc9..c5e5e17b7 100644 --- a/tool/viz/basicidea.c +++ b/tool/viz/basicidea.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/core/core.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/ioctl.h" #include "libc/calls/struct/winsize.h" @@ -25,7 +25,7 @@ #include "libc/fmt/fmt.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/runtime/gc.h" diff --git a/tool/viz/deathstar.c b/tool/viz/deathstar.c index 344052a22..9f56c8916 100644 --- a/tool/viz/deathstar.c +++ b/tool/viz/deathstar.c @@ -1,11 +1,11 @@ #include "dsp/tty/tty.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/termios.h" #include "libc/log/check.h" #include "libc/log/color.internal.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/tool/viz/derasterize.c b/tool/viz/derasterize.c index af52d5943..26784aeb1 100644 --- a/tool/viz/derasterize.c +++ b/tool/viz/derasterize.c @@ -27,7 +27,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/x86feature.h" diff --git a/tool/viz/double2int.c b/tool/viz/double2int.c index 0ede5642d..c7a7fd927 100644 --- a/tool/viz/double2int.c +++ b/tool/viz/double2int.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/gc.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/tool/viz/fold.c b/tool/viz/fold.c index b07c305d1..233475520 100644 --- a/tool/viz/fold.c +++ b/tool/viz/fold.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/errno.h" #include "libc/fmt/conv.h" #include "libc/runtime/runtime.h" diff --git a/tool/viz/generatematrix.c b/tool/viz/generatematrix.c index 407cfdb88..fff8eaf1f 100644 --- a/tool/viz/generatematrix.c +++ b/tool/viz/generatematrix.c @@ -16,13 +16,13 @@ │ 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/fmt/conv.h" #include "libc/fmt/fmt.h" #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/rand/lcg.internal.h" diff --git a/tool/viz/int2float.c b/tool/viz/int2float.c index 392b447c6..222b135d2 100644 --- a/tool/viz/int2float.c +++ b/tool/viz/int2float.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" #include "libc/limits.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/gc.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/tool/viz/lib/bilinearscale.c b/tool/viz/lib/bilinearscale.c index ad536492c..57f9787a3 100644 --- a/tool/viz/lib/bilinearscale.c +++ b/tool/viz/lib/bilinearscale.c @@ -19,7 +19,7 @@ #include "dsp/core/twixt8.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bsr.h" diff --git a/tool/viz/lib/dither.c b/tool/viz/lib/dither.c index a7fb182e3..db1f0c8e4 100644 --- a/tool/viz/lib/dither.c +++ b/tool/viz/lib/dither.c @@ -21,7 +21,7 @@ #include "libc/bits/morton.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/runtime/gc.h" diff --git a/tool/viz/lib/doublechrominance.S b/tool/viz/lib/doublechrominance.S index f871eacce..e62aed0b6 100644 --- a/tool/viz/lib/doublechrominance.S +++ b/tool/viz/lib/doublechrominance.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" // Duplicates chrominance samples horizontally, e.g. // diff --git a/tool/viz/lib/formatstringtable-assembly.c b/tool/viz/lib/formatstringtable-assembly.c index 3946c12fb..7942137cc 100644 --- a/tool/viz/lib/formatstringtable-assembly.c +++ b/tool/viz/lib/formatstringtable-assembly.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/fmt/itoa.h" #include "libc/runtime/gc.h" #include "libc/str/str.h" diff --git a/tool/viz/lib/formatstringtable-code.c b/tool/viz/lib/formatstringtable-code.c index cfaea7062..1fbfe724e 100644 --- a/tool/viz/lib/formatstringtable-code.c +++ b/tool/viz/lib/formatstringtable-code.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/fmt/itoa.h" #include "tool/viz/lib/formatstringtable.h" diff --git a/tool/viz/lib/formatstringtable-testlib.h b/tool/viz/lib/formatstringtable-testlib.h index 8fccae854..389efc131 100644 --- a/tool/viz/lib/formatstringtable-testlib.h +++ b/tool/viz/lib/formatstringtable-testlib.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_FORMATSTRINGTABLE_TESTLIB_H_ #define COSMOPOLITAN_TOOL_VIZ_LIB_FORMATSTRINGTABLE_TESTLIB_H_ -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" #include "libc/testlib/testlib.h" #include "tool/viz/lib/formatstringtable.h" diff --git a/tool/viz/lib/formatstringtable.c b/tool/viz/lib/formatstringtable.c index c08c430fd..96f1f2ac1 100644 --- a/tool/viz/lib/formatstringtable.c +++ b/tool/viz/lib/formatstringtable.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/unicode/unicode.h" #include "tool/viz/lib/formatstringtable.h" diff --git a/tool/viz/lib/gaussian.c b/tool/viz/lib/gaussian.c index 010381d82..46568a792 100644 --- a/tool/viz/lib/gaussian.c +++ b/tool/viz/lib/gaussian.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/xmmintrin.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/tool/viz/lib/getxtermcodes.c b/tool/viz/lib/getxtermcodes.c index 6e6d1679c..2214ce773 100644 --- a/tool/viz/lib/getxtermcodes.c +++ b/tool/viz/lib/getxtermcodes.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/quant.h" #include "libc/bits/xmmintrin.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "tool/viz/lib/graphic.h" void getxtermcodes(struct TtyRgb *p, const struct Graphic *g) { diff --git a/tool/viz/lib/perlin3.c b/tool/viz/lib/perlin3.c index 09ad73468..18bf13d64 100644 --- a/tool/viz/lib/perlin3.c +++ b/tool/viz/lib/perlin3.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/bits/initializer.internal.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "tool/viz/lib/graphic.h" diff --git a/tool/viz/lib/sharpen.c b/tool/viz/lib/sharpen.c index 82b1d1a95..fc020a617 100644 --- a/tool/viz/lib/sharpen.c +++ b/tool/viz/lib/sharpen.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/core/ks8.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/tool/viz/lib/sobel.c b/tool/viz/lib/sobel.c index 8608614c9..a7cdaeb5c 100644 --- a/tool/viz/lib/sobel.c +++ b/tool/viz/lib/sobel.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nexgen32e.h" diff --git a/tool/viz/lib/stringbuilder.c b/tool/viz/lib/stringbuilder.c index 4b8baffe9..e4edb3fe2 100644 --- a/tool/viz/lib/stringbuilder.c +++ b/tool/viz/lib/stringbuilder.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "libc/x/x.h" diff --git a/tool/viz/lib/thunks/expect_matrixeq.S b/tool/viz/lib/thunks/expect_matrixeq.S index d8aeca6a5..1ea6332c2 100644 --- a/tool/viz/lib/thunks/expect_matrixeq.S +++ b/tool/viz/lib/thunks/expect_matrixeq.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" .text.unlikely testlib_showerror_expect_matrixeq: diff --git a/tool/viz/lib/unsharp.c b/tool/viz/lib/unsharp.c index 743989fc3..56cfbe3ae 100644 --- a/tool/viz/lib/unsharp.c +++ b/tool/viz/lib/unsharp.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/mem/mem.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/tool/viz/lib/writetoframebuffer.c b/tool/viz/lib/writetoframebuffer.c index 1792f65ab..930582059 100644 --- a/tool/viz/lib/writetoframebuffer.c +++ b/tool/viz/lib/writetoframebuffer.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 "tool/viz/lib/graphic.h" void WriteToFrameBuffer(size_t dyn, size_t dxn, unsigned char dst[dyn][dxn][4], diff --git a/tool/viz/lib/ycbcr2rgb3.c b/tool/viz/lib/ycbcr2rgb3.c index 126d1ef34..fbe987d93 100644 --- a/tool/viz/lib/ycbcr2rgb3.c +++ b/tool/viz/lib/ycbcr2rgb3.c @@ -32,7 +32,7 @@ #include "libc/intrin/pmulhrsw.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/gc.internal.h" diff --git a/tool/viz/life.c b/tool/viz/life.c index 755e240eb..672516b48 100644 --- a/tool/viz/life.c +++ b/tool/viz/life.c @@ -20,8 +20,8 @@ #include "dsp/scale/scale.h" #include "libc/bits/bits.h" #include "libc/bits/popcnt.h" -#include "libc/bits/safemacros.h" -#include "libc/bits/xchg.h" +#include "libc/bits/safemacros.internal.h" +#include "libc/bits/xchg.internal.h" #include "libc/calls/calls.h" #include "libc/calls/ioctl.h" #include "libc/calls/struct/stat.h" @@ -34,7 +34,7 @@ #include "libc/fmt/itoa.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nt2sysv.h" #include "libc/nt/comdlg.h" diff --git a/tool/viz/magikarp.c b/tool/viz/magikarp.c index df34240c2..196d4f2eb 100644 --- a/tool/viz/magikarp.c +++ b/tool/viz/magikarp.c @@ -26,7 +26,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bsr.h" diff --git a/tool/viz/memzoom.c b/tool/viz/memzoom.c index a4a84a17f..f70fad40b 100644 --- a/tool/viz/memzoom.c +++ b/tool/viz/memzoom.c @@ -20,7 +20,7 @@ #include "libc/bits/bits.h" #include "libc/bits/hilbert.h" #include "libc/bits/morton.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/ioctl.h" #include "libc/calls/struct/sigaction.h" @@ -33,7 +33,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/nexgen32e/bsf.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" diff --git a/tool/viz/printansi.c b/tool/viz/printansi.c index 1d5f38f27..f66ac2d38 100644 --- a/tool/viz/printansi.c +++ b/tool/viz/printansi.c @@ -23,7 +23,7 @@ #include "dsp/tty/tty.h" #include "libc/assert.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/ioctl.h" #include "libc/calls/struct/stat.h" @@ -33,7 +33,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/rand/rand.h" @@ -159,7 +159,7 @@ static void GetOpts(int *argc, char *argv[]) { g_flags.blocks = kTtyBlocksUnicode; break; case 'v': - ++g_loglevel; + ++__log_level; break; case '?': PrintUsage(EXIT_SUCCESS, stdout); diff --git a/tool/viz/printimage.c b/tool/viz/printimage.c index 6c543e9a5..132fb7a18 100644 --- a/tool/viz/printimage.c +++ b/tool/viz/printimage.c @@ -23,7 +23,7 @@ #include "dsp/tty/tty.h" #include "libc/assert.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/ioctl.h" #include "libc/calls/struct/stat.h" @@ -33,7 +33,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/rand/rand.h" @@ -165,7 +165,7 @@ static void GetOpts(int *argc, char *argv[]) { g_flags.blocks = kTtyBlocksUnicode; break; case 'v': - ++g_loglevel; + ++__log_level; break; case '?': PrintUsage(EXIT_SUCCESS, stdout); diff --git a/tool/viz/printpeb.c b/tool/viz/printpeb.c index 1d55913d6..8c6151d02 100644 --- a/tool/viz/printpeb.c +++ b/tool/viz/printpeb.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/calls/calls.h" #include "libc/calls/internal.h" #include "libc/dce.h" diff --git a/tool/viz/printvideo.c b/tool/viz/printvideo.c index 31537533d..df6aba501 100644 --- a/tool/viz/printvideo.c +++ b/tool/viz/printvideo.c @@ -27,8 +27,8 @@ #include "libc/alg/arraylist.internal.h" #include "libc/assert.h" #include "libc/bits/bits.h" -#include "libc/bits/safemacros.h" -#include "libc/bits/xchg.h" +#include "libc/bits/safemacros.internal.h" +#include "libc/bits/xchg.internal.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/ioctl.h" @@ -49,7 +49,7 @@ #include "libc/fmt/itoa.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bench.h" @@ -491,9 +491,9 @@ static bool TrySpeaker(const char *prog, char *const *args) { CHECK_NE(-1, pipe2(pipefds, O_CLOEXEC)); if (!(playpid_ = fork())) { dup2(pipefds[0], 0); - dup2(fileno(g_logfile), 1); - dup2(fileno(g_logfile), 2); - close(fileno(g_logfile)); + dup2(fileno(__log_file), 1); + dup2(fileno(__log_file), 2); + close(fileno(__log_file)); execv(prog, args); abort(); } @@ -1314,7 +1314,7 @@ static void GetOpts(int argc, char *argv[]) { yes_ = true; break; case 'v': - ++g_loglevel; + ++__log_level; break; case 'L': snprintf(logpath_, sizeof(logpath_), "%s", optarg); @@ -1492,7 +1492,7 @@ int main(int argc, char *argv[]) { xsigaction(SIGPIPE, OnSigPipe, 0, 0, NULL); if (ttyraw(kTtyLfToCrLf) != -1) ttymode_ = true; __cxa_atexit(OnExit, NULL, NULL); - g_logfile = fopen(logpath_, "a"); + __log_file = fopen(logpath_, "a"); if (ischardev(infd_) && ischardev(outfd_)) { /* CHECK_NE(-1, fcntl(infd_, F_SETFL, O_NONBLOCK)); */ } else if (infd_ != outfd_) { diff --git a/tool/viz/tabalign.c b/tool/viz/tabalign.c index d2b54cd60..6c0e4fddd 100644 --- a/tool/viz/tabalign.c +++ b/tool/viz/tabalign.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/arraylist.internal.h" -#include "libc/bits/safemacros.h" +#include "libc/bits/safemacros.internal.h" #include "libc/fmt/conv.h" #include "libc/limits.h" #include "libc/log/check.h" diff --git a/tool/viz/tailf.c b/tool/viz/tailf.c index a65fa8cf7..b8d004518 100644 --- a/tool/viz/tailf.c +++ b/tool/viz/tailf.c @@ -16,10 +16,10 @@ │ 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/calls/calls.h" #include "libc/calls/struct/stat.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/tool/viz/upscalefloat.c b/tool/viz/upscalefloat.c index f3533ba6e..6bdd087f3 100644 --- a/tool/viz/upscalefloat.c +++ b/tool/viz/upscalefloat.c @@ -21,7 +21,7 @@ #include "libc/calls/struct/stat.h" #include "libc/limits.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/tool/viz/upscaleint.c b/tool/viz/upscaleint.c index bbcf8b9ca..c757b0704 100644 --- a/tool/viz/upscaleint.c +++ b/tool/viz/upscaleint.c @@ -21,7 +21,7 @@ #include "libc/calls/struct/stat.h" #include "libc/limits.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/tool/viz/xterm256effective.c b/tool/viz/xterm256effective.c index d18915cf5..f0b223b02 100644 --- a/tool/viz/xterm256effective.c +++ b/tool/viz/xterm256effective.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/quant.h" #include "libc/bits/bits.h" -#include "libc/bits/xchg.h" +#include "libc/bits/xchg.internal.h" #include "libc/fmt/fmt.h" #include "libc/math.h" #include "libc/runtime/runtime.h" diff --git a/tool/viz/xterm256effective2.c b/tool/viz/xterm256effective2.c index 06ccdcd5c..9bc23fe4c 100644 --- a/tool/viz/xterm256effective2.c +++ b/tool/viz/xterm256effective2.c @@ -19,7 +19,7 @@ #include "dsp/tty/quant.h" #include "libc/fmt/fmt.h" #include "libc/log/check.h" -#include "libc/macros.h" +#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h"