From 31194165d2afca36c2315a6e7ca2f0797dde09e3 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Sun, 4 Aug 2024 12:52:25 -0700 Subject: [PATCH] Remove .internal from more header filenames --- ape/ape.S | 2 +- ape/launch.S | 2 +- ape/loader-macho.S | 4 ++-- ape/macros.internal.h | 2 +- ape/start.S | 2 +- ape/systemcall.S | 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/q.h | 2 +- dsp/core/sad16x8n.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/mpsadbw.S | 2 +- dsp/tty/rgb2ansi.c | 2 +- dsp/tty/rgb2ttyi2f.c | 2 +- dsp/tty/rgb2xterm24.c | 2 +- dsp/tty/rgb2xterm24f.c | 2 +- dsp/tty/ttyraster.c | 2 +- dsp/tty/ttyraw.c | 2 +- dsp/tty/windex-avx2.S | 2 +- dsp/tty/windex-sse4.S | 2 +- examples/date.c | 2 +- examples/nc.c | 2 +- examples/nesemu1.cc | 4 ++-- examples/package/lib/myasm.S | 2 +- examples/script.c | 2 +- libc/calls/CPU_AND.c | 2 +- libc/calls/CPU_COUNT.c | 2 +- libc/calls/CPU_OR.c | 2 +- libc/calls/CPU_XOR.c | 2 +- libc/calls/chdir-nt.c | 2 +- libc/calls/clock_gettime-xnu.c | 2 +- libc/calls/copy.c | 2 +- libc/calls/fcntl-nt.c | 2 +- libc/calls/fstat-nt.c | 2 +- libc/calls/fstatfs-nt.c | 2 +- libc/calls/getcontext.S | 2 +- libc/calls/getdomainname.c | 2 +- libc/calls/getdtablesize.c | 2 +- libc/calls/gethostname-nt.c | 2 +- libc/calls/getloadavg-nt.c | 2 +- libc/calls/getntsyspath.S | 2 +- libc/calls/getprogramexecutablename.greg.c | 2 +- libc/calls/getrandom.c | 2 +- libc/calls/getuid-nt.c | 2 +- libc/calls/getuid.c | 2 +- libc/calls/internal.h | 2 +- libc/calls/ioctl.c | 2 +- libc/calls/kntsystemdirectory.S | 2 +- libc/calls/kntwindowsdirectory.S | 2 +- libc/calls/metalfile.c | 2 +- libc/calls/metalfile_init.S | 2 +- libc/calls/mkntpath.c | 2 +- libc/calls/mkntpathat.c | 2 +- libc/calls/netbsdtramp.S | 2 +- libc/calls/ntspawn.c | 2 +- libc/calls/open-nt.c | 2 +- libc/calls/openat-metal.c | 2 +- libc/calls/parsepromises.c | 2 +- libc/calls/pledge-linux.c | 2 +- libc/calls/poll-nt.c | 2 +- libc/calls/pread.c | 2 +- libc/calls/program_executable_name_init.S | 2 +- libc/calls/pwrite.c | 2 +- libc/calls/read-nt.c | 2 +- libc/calls/readv-metal.c | 2 +- libc/calls/releasefd.c | 2 +- libc/calls/restore.S | 2 +- libc/calls/rusage_add.c | 2 +- libc/calls/select-nt.c | 2 +- libc/calls/setrlimit.c | 2 +- libc/calls/sigaction.c | 2 +- libc/calls/sigaltstack.c | 2 +- libc/calls/sigcrashsig.c | 2 +- libc/calls/sigenter-freebsd.c | 2 +- libc/calls/sigenter-netbsd.c | 2 +- libc/calls/sigenter-openbsd.c | 2 +- libc/calls/swapcontext.S | 2 +- libc/calls/sysinfo.c | 2 +- libc/calls/tailcontext.S | 2 +- libc/calls/tmpdir.c | 2 +- libc/calls/uname.c | 2 +- libc/calls/unveil.c | 2 +- libc/calls/winexec.c | 2 +- libc/crt/crt.S | 2 +- libc/dlopen/foreign_tramp.S | 2 +- libc/{dos.internal.h => dos.h} | 0 libc/fmt/bing.c | 2 +- libc/fmt/itoa64radix16.greg.c | 2 +- libc/fmt/unbing.c | 2 +- libc/fmt/unzleb64.c | 2 +- libc/fmt/wcstol.c | 2 +- libc/fmt/wcstoul.c | 2 +- libc/{imag.internal.h => imag.h} | 0 libc/intrin/aarch64/asmdefs.h | 2 +- libc/intrin/cxaatexit.c | 2 +- libc/intrin/describecapability.c | 2 +- libc/intrin/describecontrolkeystate.c | 2 +- libc/intrin/describednotify.c | 2 +- libc/intrin/describegidlist.c | 2 +- libc/intrin/describeiovec.c | 2 +- libc/intrin/describeiovnt.c | 2 +- libc/intrin/describemapflags.c | 2 +- libc/intrin/describemremapflags.c | 2 +- libc/intrin/describemsyncflags.c | 2 +- libc/intrin/describentconsolemodeinputflags.c | 2 +- libc/intrin/describentconsolemodeoutputflags.c | 2 +- libc/intrin/describentfileaccessflags.c | 2 +- libc/intrin/describentfileflagattr.c | 2 +- libc/intrin/describentfilemapflags.c | 2 +- libc/intrin/describentfileshareflags.c | 2 +- libc/intrin/describentfiletypeflags.c | 2 +- libc/intrin/describentlockfileflags.c | 2 +- libc/intrin/describentmovfileinpflags.c | 2 +- libc/intrin/describentoverlapped.c | 2 +- libc/intrin/describentpageflags.c | 2 +- libc/intrin/describentpipemodeflags.c | 2 +- libc/intrin/describentpipeopenflags.c | 2 +- libc/intrin/describentprocaccessflags.c | 2 +- libc/intrin/describentstartflags.c | 2 +- libc/intrin/describentsymlinkflags.c | 2 +- libc/intrin/describeopenflags.c | 2 +- libc/intrin/describepersonalityflags.c | 2 +- libc/intrin/describepollfds.c | 2 +- libc/intrin/describepollflags.c | 2 +- libc/intrin/describeprotflags.c | 2 +- libc/intrin/describeschedpolicy.c | 2 +- libc/intrin/describesigaction.c | 2 +- libc/intrin/describesigaltstackflags.c | 2 +- libc/intrin/describetermios.c | 2 +- libc/intrin/describethreadcreationflags.c | 2 +- libc/intrin/describevirtualkeycode.c | 2 +- libc/intrin/describewinsize.c | 2 +- libc/intrin/directmap-metal.c | 2 +- libc/intrin/dsohandle.S | 2 +- libc/intrin/fds_init.S | 2 +- libc/intrin/fenv.S | 2 +- libc/intrin/formathex64.c | 2 +- libc/intrin/futex.S | 2 +- libc/intrin/gcov.S | 2 +- libc/intrin/getcpuidbrand.S | 2 +- libc/intrin/getmainstack.c | 2 +- libc/intrin/getminsigstksz.c | 2 +- libc/intrin/interrupts.S | 2 +- libc/intrin/kclocknames.S | 2 +- libc/intrin/kdos2errno.S | 2 +- libc/intrin/kerrnodocs.S | 2 +- libc/intrin/kerrnonames.S | 2 +- libc/intrin/kfcntlcmds.S | 2 +- libc/intrin/kipoptnames.S | 2 +- libc/intrin/kmonthname.S | 2 +- libc/intrin/kmonthnameshort.S | 2 +- libc/intrin/kopenflags.S | 2 +- libc/intrin/kpollnames.S | 2 +- libc/intrin/kprintf.greg.c | 2 +- libc/intrin/krlimitnames.S | 2 +- libc/intrin/ksignalnames.S | 2 +- libc/intrin/ksockoptnames.S | 2 +- libc/intrin/ktcpoptnames.S | 2 +- libc/intrin/kweekdayname.S | 2 +- libc/intrin/kweekdaynameshort.S | 2 +- libc/intrin/leaky.S | 2 +- libc/intrin/maps_init.S | 2 +- libc/intrin/mman.greg.c | 2 +- libc/intrin/msync.c | 2 +- libc/intrin/packsswb.c | 2 +- libc/intrin/packuswb.c | 2 +- libc/intrin/pagesize_init.S | 2 +- libc/intrin/palignr.c | 2 +- libc/intrin/palignrs.S | 2 +- libc/intrin/pmaddubsw.c | 2 +- libc/intrin/printmaps.c | 2 +- libc/intrin/pthread_atfork_actual.c | 2 +- libc/intrin/pushpop.h | 2 +- libc/intrin/reservefd.c | 2 +- libc/intrin/safemacros.h | 2 +- libc/intrin/sizefmt.c | 2 +- libc/intrin/stackcall.S | 2 +- libc/intrin/stackchkguard.S | 2 +- libc/intrin/strerror.c | 2 +- libc/intrin/sys_sched_yield.S | 2 +- libc/intrin/sys_set_tls.S | 2 +- libc/intrin/typeinfo.S | 2 +- libc/irq/acpi-fadt-init.S | 2 +- libc/irq/acpi-madt-init.S | 2 +- libc/irq/acpi-xsdt-init.S | 2 +- libc/irq/acpi-xsdt.c | 2 +- libc/{iso646.internal.h => iso646.h} | 0 libc/isystem/complex.h | 2 +- libc/isystem/iso646.h | 2 +- libc/isystem/stdalign.h | 2 +- libc/isystem/tgmath.h | 2 +- libc/log/backtrace3.c | 2 +- libc/log/check.h | 2 +- libc/log/countbranch.h | 2 +- libc/log/countbranch_data.S | 2 +- libc/log/countbranch_report.c | 2 +- libc/log/countexpr.h | 2 +- libc/log/countexpr_data.S | 2 +- libc/log/countexpr_report.c | 2 +- libc/log/libfatal.internal.h | 2 +- libc/log/oncrash_amd64.c | 2 +- libc/log/oncrash_arm64.c | 2 +- libc/log/printwindowsmemory.c | 2 +- libc/log/showcrashreportsearly.S | 2 +- libc/log/watch-hook.S | 2 +- libc/{mach.internal.h => mach.h} | 0 libc/{macho.internal.h => macho.h} | 0 libc/{macros.internal.h => macros.h} | 0 libc/mem/aligned_alloc.c | 2 +- libc/mem/mergesort.c | 2 +- libc/mem/posix_memalign.c | 2 +- libc/mem/putenv.c | 2 +- libc/mem/qsort.c | 2 +- libc/mem/tinymalloc.inc | 2 +- libc/nexgen32e/argc.S | 2 +- libc/nexgen32e/argv.S | 2 +- libc/nexgen32e/auxv.S | 2 +- libc/nexgen32e/checkstackalign.S | 2 +- libc/nexgen32e/djbsort-avx2.S | 2 +- libc/nexgen32e/environ.S | 2 +- libc/nexgen32e/gc.S | 2 +- libc/nexgen32e/gclongjmp.S | 2 +- libc/nexgen32e/identity.S | 2 +- libc/nexgen32e/kbase36.c | 4 ++-- libc/nexgen32e/kcp437.S | 4 ++-- libc/nexgen32e/kcpuids.S | 2 +- libc/nexgen32e/khalfcache3.S | 2 +- libc/nexgen32e/ksha256.S | 2 +- libc/nexgen32e/ksha512.S | 2 +- libc/nexgen32e/ktensindex.S | 2 +- libc/nexgen32e/ktolower.c | 4 ++-- libc/nexgen32e/ktoupper.c | 4 ++-- libc/nexgen32e/longjmp.S | 2 +- libc/nexgen32e/mcount.S | 2 +- libc/nexgen32e/mul4x4adx.S | 2 +- libc/nexgen32e/mul6x6adx.S | 2 +- libc/nexgen32e/mul8x8adx.S | 2 +- libc/nexgen32e/nt2sysv.S | 2 +- libc/nexgen32e/program_invocation_name.S | 2 +- libc/nexgen32e/rldecode.S | 2 +- libc/nexgen32e/setjmp.S | 2 +- libc/nexgen32e/sha1.S | 2 +- libc/nexgen32e/sha1ni.S | 2 +- libc/nexgen32e/sha256.S | 2 +- libc/nexgen32e/sha256ni.S | 2 +- libc/nexgen32e/sha512.S | 2 +- libc/nexgen32e/xmm.S | 2 +- libc/nexgen32e/zip.S | 4 ++-- libc/nt/ntdllimport.S | 2 +- libc/nt/ntdllimport.h | 2 +- libc/proc/cocmd.c | 2 +- libc/proc/fork-nt.c | 2 +- libc/proc/nice.c | 2 +- libc/proc/posix_spawnattr_getrlimit.c | 2 +- libc/proc/posix_spawnattr_setrlimit.c | 2 +- libc/proc/vfork.S | 2 +- libc/runtime/at_quick_exit.c | 2 +- libc/runtime/clone-linux.S | 2 +- libc/runtime/clone-openbsd.S | 2 +- libc/runtime/clone-xnu.S | 2 +- libc/runtime/clone.c | 4 ++-- libc/runtime/cosmo.S | 2 +- libc/runtime/cosmo2.c | 2 +- libc/runtime/efimain.greg.c | 2 +- libc/runtime/efipostboot.S | 2 +- libc/runtime/enable_tls.c | 4 ++-- libc/runtime/findcombinary.c | 2 +- libc/runtime/fpreset.S | 2 +- libc/runtime/ftrace-hook.S | 2 +- libc/runtime/ftracer.c | 2 +- libc/runtime/getargmax.c | 2 +- libc/runtime/getinterpreterexecutablename.c | 2 +- libc/runtime/getlogin.c | 2 +- libc/runtime/getlogin_r.c | 2 +- libc/runtime/getresourcelimit.c | 2 +- libc/runtime/getsymboltable.c | 4 ++-- libc/runtime/grow.c | 2 +- libc/runtime/hook.greg.c | 2 +- libc/runtime/inflate.c | 2 +- libc/runtime/init.S | 8 ++++---- libc/runtime/isstackoverflow.c | 2 +- libc/runtime/opensymboltable.greg.c | 2 +- libc/runtime/progname.S | 2 +- libc/runtime/sigsetjmp.S | 2 +- libc/runtime/sysconf.c | 2 +- libc/runtime/valist.c | 2 +- libc/runtime/winmain.greg.c | 2 +- libc/runtime/zipos-access.c | 2 +- libc/runtime/zipos-find.c | 4 ++-- libc/runtime/zipos-get.c | 4 ++-- libc/runtime/zipos-inode.c | 2 +- libc/runtime/zipos-mmap.c | 2 +- libc/runtime/zipos-open.c | 2 +- libc/runtime/zipos-read.c | 2 +- libc/runtime/zipos-stat-impl.c | 2 +- libc/runtime/zipos.S | 2 +- libc/sock/epoll.c | 2 +- libc/sock/gethostips.c | 2 +- libc/sock/inet_pton.c | 2 +- libc/sock/iovec2nt.c | 2 +- libc/sock/send.c | 2 +- libc/sock/sendto.c | 2 +- libc/sock/sockaddr.c | 2 +- libc/sock/sockaddr2linux.c | 2 +- libc/sock/sockdebug.c | 2 +- libc/sock/sys_sendfile_freebsd.S | 2 +- libc/sock/sys_sendfile_xnu.S | 2 +- libc/{stdalign.internal.h => stdalign.h} | 6 +++--- libc/stdio/appendd.c | 2 +- libc/stdio/appendr.c | 2 +- libc/stdio/appendw.c | 2 +- libc/stdio/dirstream.c | 4 ++-- libc/stdio/dumphexc.c | 2 +- libc/stdio/fgets_unlocked.c | 2 +- libc/stdio/fmt.c | 4 ++-- libc/stdio/fread_unlocked.c | 2 +- libc/stdio/fseek_unlocked.c | 2 +- libc/stdio/fwrite_unlocked.c | 2 +- libc/stdio/kvappendf.c | 2 +- libc/stdio/mt19937.c | 2 +- libc/stdio/printargs.c | 2 +- libc/stdio/vappendf.c | 2 +- libc/stdio/vcscanf.c | 2 +- libc/stdio/vdprintf.c | 2 +- libc/stdio/vsnprintf.c | 2 +- libc/str/blake2.c | 2 +- libc/str/compareslices.c | 2 +- libc/str/compareslicescase.c | 2 +- libc/str/dosdatetimetounix.c | 2 +- libc/str/getzipcdircomment.c | 2 +- libc/str/getzipcdircommentsize.c | 2 +- libc/str/getzipcdiroffset.c | 2 +- libc/str/getzipcdirrecords.c | 2 +- libc/str/getzipcdirsize.c | 2 +- libc/str/getzipcfilecompressedsize.c | 2 +- libc/str/getzipcfilemode.c | 2 +- libc/str/getzipcfileoffset.c | 2 +- libc/str/getzipcfiletimestamps.c | 2 +- libc/str/getzipcfileuncompressedsize.c | 2 +- libc/str/getzipeocd.c | 2 +- libc/str/getziplfilecompressedsize.c | 2 +- libc/str/getziplfileuncompressedsize.c | 2 +- libc/str/iswctype.c | 2 +- libc/str/iszipeocd32.c | 2 +- libc/str/iszipeocd64.c | 2 +- libc/str/khextoint.c | 4 ++-- libc/str/kx86processormodels.c | 2 +- libc/str/memcasecmp.c | 2 +- libc/str/startswithi.c | 2 +- libc/str/stpncpy.c | 2 +- libc/str/strcasecmp.c | 2 +- libc/str/strcasestr.c | 2 +- libc/str/strncasecmp.c | 2 +- libc/str/strncpy.c | 2 +- libc/str/strnwidth.c | 2 +- libc/str/strtol.c | 2 +- libc/str/strtoul.c | 2 +- libc/str/{tab.internal.h => tab.h} | 6 +++--- libc/str/towlower.c | 2 +- libc/str/towupper.c | 2 +- libc/str/wctype.c | 2 +- libc/str/wcwidth_osx.c | 2 +- libc/sysv/consts/syscon.internal.h | 2 +- libc/sysv/errfun.S | 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/gen.sh | 2 +- libc/sysv/hostos.S | 2 +- libc/sysv/macros.internal.h | 2 +- libc/sysv/restorert.S | 2 +- libc/sysv/syscall2.S | 2 +- libc/sysv/syscall3.S | 2 +- libc/sysv/syscall4.S | 2 +- libc/sysv/syscon.S | 2 +- libc/sysv/syscount.S | 2 +- libc/sysv/syslib.S | 2 +- libc/sysv/systemfive.S | 2 +- libc/testlib/bench.S | 2 +- libc/testlib/binequals.c | 2 +- libc/testlib/blake2b256_tests.S | 2 +- libc/testlib/blocktronics.S | 2 +- libc/testlib/ezbench.h | 2 +- libc/testlib/fixture.S | 2 +- libc/testlib/hexequals.c | 2 +- libc/testlib/hyperion.S | 2 +- libc/testlib/moby.S | 2 +- libc/testlib/polluteregisters.S | 2 +- libc/testlib/subprocess.h | 2 +- libc/testlib/testcase.S | 2 +- libc/testlib/testmain.c | 2 +- libc/testlib/testrunner.c | 2 +- libc/testlib/viewables.S | 2 +- libc/thread/makecontext.c | 2 +- libc/thread/mktls.c | 2 +- libc/thread/pthread_create.c | 2 +- libc/thread/pthread_detach.c | 2 +- libc/thread/pthread_getattr_np.c | 2 +- libc/thread/pthread_getname_np.c | 2 +- libc/vga/rlinit-init-vga.S | 2 +- libc/vga/rlinit-vesa.S | 2 +- libc/vga/tty-graph.c | 2 +- libc/vga/tty-graph.inc | 2 +- libc/vga/tty-klog.greg.c | 2 +- libc/x/syslog.c | 2 +- libc/{zip.internal.h => zip.h} | 0 net/finger/fingersyn.c | 2 +- net/http/base32.c | 2 +- net/http/decodebase64.c | 2 +- net/http/encodeurl.c | 2 +- net/http/findcontenttype.c | 4 ++-- net/http/formathttpdatetime.c | 2 +- net/http/gethttpheader.inc | 2 +- net/http/gethttpreason.c | 2 +- net/http/ismimetype.c | 2 +- net/http/isnocompressext.c | 4 ++-- net/http/parsehttpmessage.c | 3 ++- net/http/parsehttpmethod.c | 2 +- net/http/parsehttprange.c | 2 +- net/http/parseurl.c | 2 +- net/http/unchunk.c | 4 ++-- net/https/describesslverifyfailure.c | 2 +- net/turfwar/turfwar.c | 4 ++-- test/dsp/core/alaw_test.c | 2 +- test/dsp/core/getintegercoefficients_test.c | 2 +- test/dsp/core/mulaw_test.c | 2 +- test/dsp/core/scalevolume_test.c | 2 +- test/dsp/scale/scale_test.c | 2 +- test/libc/calls/cachestat_test.c | 2 +- test/libc/calls/fchmodat_test.c | 2 +- test/libc/calls/fcntl_test.c | 2 +- test/libc/calls/getcwd_test.c | 2 +- test/libc/calls/getgroups_test.c | 2 +- test/libc/calls/getrandom_test.c | 4 ++-- test/libc/calls/lock_ofd_test.c | 2 +- test/libc/calls/lock_test.c | 2 +- test/libc/calls/open_test.c | 2 +- test/libc/calls/pledge_test.c | 2 +- test/libc/calls/reservefd_test.c | 2 +- test/libc/calls/writev_test.c | 2 +- test/libc/fmt/formatint64thousands_test.c | 2 +- test/libc/intrin/demangle_test.c | 2 +- test/libc/intrin/describeflags_test.c | 2 +- test/libc/intrin/kprintf_test.c | 2 +- test/libc/intrin/lockipc_test.c | 2 +- test/libc/intrin/magicu_test.c | 2 +- test/libc/intrin/memmove_test.c | 2 +- test/libc/intrin/pthread_mutex_lock_test.c | 2 +- test/libc/intrin/rand64_test.c | 2 +- test/libc/intrin/strcmp_test.c | 2 +- test/libc/intrin/strlen_test.c | 2 +- test/libc/intrin/tree_test.c | 2 +- test/libc/log/backtrace.c | 2 +- test/libc/mem/djbsort_test.c | 2 +- test/libc/mem/malloc_test.c | 2 +- test/libc/mem/qsort_test.c | 2 +- test/libc/nexgen32e/kbase36_test.c | 2 +- test/libc/nexgen32e/kcp437_test.c | 2 +- test/libc/nexgen32e/memmove_test.c | 2 +- test/libc/proc/fork_test.c | 2 +- test/libc/stdio/dtoa_test.c | 2 +- test/libc/stdio/getentropy_test.c | 4 ++-- test/libc/stdio/mt19937_test.c | 2 +- test/libc/stdio/zipdir_test.c | 2 +- test/libc/str/blake2_test.c | 2 +- test/libc/str/hexpcpy_test.c | 2 +- test/libc/str/strcasestr_test.c | 2 +- test/libc/thread/pthread_create_test.c | 2 +- test/libc/tinymath/fdot_test.cc | 2 +- test/libc/tinymath/fsum_test.cc | 2 +- test/libc/tinymath/powl_test.c | 2 +- test/libc/tinymath/strtod_test.c | 2 +- test/libc/tinymath/tanh_test.c | 2 +- test/libc/xed/x86ild_lib.c | 2 +- test/net/https/mbedtls_test.c | 2 +- test/tool/net/sqlite_test.c | 2 +- test/tool/plinko/plinko_test.c | 2 +- test/tool/viz/lib/fun_test.c | 2 +- test/tool/viz/lib/ycbcr2rgb2_test.c | 2 +- third_party/chibicc/as.c | 4 ++-- third_party/chibicc/chibicc.h | 2 +- third_party/chibicc/test/vla_test.c | 2 +- third_party/chibicc/tokenize.c | 2 +- third_party/compiler_rt/comprt.S | 2 +- third_party/dlmalloc/dlmalloc.c | 2 +- third_party/dlmalloc/threaded.inc | 2 +- third_party/gdtoa/misc.c | 2 +- third_party/linenoise/linenoise.c | 4 ++-- third_party/lua/lrepl.c | 2 +- third_party/lua/luacallwithtrace.c | 2 +- third_party/lua/lunix.c | 2 +- third_party/maxmind/getmetroname.c | 2 +- third_party/mbedtls/bigmul.c | 2 +- third_party/mbedtls/bignum.c | 2 +- third_party/mbedtls/bigshift.c | 2 +- third_party/mbedtls/fastdiv.h | 2 +- third_party/mbedtls/formatclientciphers.c | 2 +- third_party/mbedtls/sha1.c | 2 +- third_party/mbedtls/sha256.c | 2 +- third_party/mbedtls/sha512.c | 2 +- third_party/mbedtls/sha512t.c | 2 +- third_party/mbedtls/ssl_srv.c | 2 +- third_party/mbedtls/test/test.inc | 2 +- third_party/musl/strptime.c | 2 +- third_party/nsync/common.c | 4 ++-- third_party/nsync/compat.S | 2 +- third_party/python/Include/pyctype.h | 2 +- third_party/python/Modules/_hashmbedtls.c | 2 +- third_party/python/Modules/tlsmodule.c | 2 +- third_party/python/Modules/tokenbucket.c | 2 +- third_party/python/Python/cosmomodule.c | 2 +- third_party/python/Python/import.c | 2 +- third_party/python/Python/random.c | 2 +- third_party/python/pyobj.c | 4 ++-- third_party/python/runpythonmodule.c | 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/stb_truetype.c | 2 +- third_party/tree/tree.h | 2 +- third_party/tz/difftime.c | 2 +- third_party/xed/x86ild.greg.c | 2 +- third_party/xxhash/xxhash.h | 2 +- third_party/zstd/lib/common/compiler.h | 2 +- third_party/zstd/lib/common/xxhash.h | 2 +- tool/build/apelink.c | 10 +++++----- tool/build/ar.c | 2 +- tool/build/assimilate.c | 4 ++-- tool/build/bigmul.c | 2 +- tool/build/compile.c | 2 +- tool/build/elf2pe.c | 2 +- tool/build/fixupobj.c | 6 +++--- tool/build/helpop.c | 2 +- tool/build/killall.c | 2 +- tool/build/lib/buffer.c | 2 +- tool/build/lib/elfwriter.c | 2 +- tool/build/lib/elfwriter_zip.c | 4 ++-- tool/build/lib/eztls.c | 2 +- tool/build/lib/getargs.c | 2 +- tool/build/lz4toasm.c | 6 +++--- tool/build/mkdeps.c | 4 ++-- tool/build/objbincopy.c | 4 ++-- tool/build/package.c | 2 +- tool/build/pledge.c | 2 +- tool/build/runitd.c | 2 +- tool/build/sha256sum.c | 2 +- tool/build/zipcopy.c | 2 +- tool/build/zipobj.c | 2 +- tool/curl/curl.c | 2 +- tool/decode/elf.c | 2 +- tool/decode/lib/bitabuilder.c | 2 +- tool/decode/lib/disassemblehex.c | 2 +- tool/decode/lib/machoidnames.c | 2 +- tool/decode/lib/zipnames.c | 2 +- tool/decode/macho.c | 6 +++--- tool/decode/unhex.c | 2 +- tool/decode/x86opinfo.c | 4 ++-- tool/decode/zip.c | 2 +- tool/net/getadaptersaddresses.c | 2 +- tool/net/lfuncs.c | 4 ++-- tool/net/ljson.c | 2 +- tool/net/lre.c | 2 +- tool/net/redbean.c | 6 +++--- tool/net/winbench.c | 2 +- tool/plinko/lib/gc.c | 2 +- tool/plinko/lib/histo.h | 2 +- tool/plinko/lib/iswide.c | 2 +- tool/plinko/lib/plinko.c | 2 +- tool/viz/bin2asm.c | 2 +- tool/viz/bing.c | 2 +- tool/viz/derasterize.c | 2 +- tool/viz/dumphexc.c | 2 +- tool/viz/fontspace.c | 2 +- tool/viz/getglyph.c | 2 +- tool/viz/lib/bilinearscale.c | 2 +- tool/viz/lib/dither.c | 2 +- tool/viz/lib/doublechrominance.S | 2 +- tool/viz/lib/formatstringtable-testlib.h | 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/unsharp.c | 2 +- tool/viz/lib/writetoframebuffer.c | 2 +- tool/viz/lib/ycbcr2rgb3.c | 2 +- tool/viz/life.c | 2 +- tool/viz/memzoom.c | 4 ++-- tool/viz/printansi.c | 2 +- tool/viz/printvideo.c | 2 +- tool/viz/rlimit.c | 2 +- tool/viz/tailf.c | 2 +- tool/viz/unbing.c | 2 +- tool/viz/virtualquery.c | 2 +- 734 files changed, 779 insertions(+), 778 deletions(-) rename libc/{dos.internal.h => dos.h} (100%) rename libc/{imag.internal.h => imag.h} (100%) rename libc/{iso646.internal.h => iso646.h} (100%) rename libc/{mach.internal.h => mach.h} (100%) rename libc/{macho.internal.h => macho.h} (100%) rename libc/{macros.internal.h => macros.h} (100%) rename libc/{stdalign.internal.h => stdalign.h} (52%) rename libc/str/{tab.internal.h => tab.h} (77%) rename libc/{zip.internal.h => zip.h} (100%) diff --git a/ape/ape.S b/ape/ape.S index 2ec05e9631c..f274e31f6e9 100644 --- a/ape/ape.S +++ b/ape/ape.S @@ -37,7 +37,7 @@ #include "libc/calls/metalfile.internal.h" #include "libc/dce.h" #include "libc/elf/def.h" -#include "libc/macho.internal.h" +#include "libc/macho.h" #include "libc/nexgen32e/uart.internal.h" #include "libc/nt/pedef.internal.h" #include "libc/runtime/pc.internal.h" diff --git a/ape/launch.S b/ape/launch.S index ae2cb58a13d..f710fdec758 100644 --- a/ape/launch.S +++ b/ape/launch.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Calls _start() function of loaded program. // diff --git a/ape/loader-macho.S b/ape/loader-macho.S index bcecf9dacdc..e484f0686d8 100644 --- a/ape/loader-macho.S +++ b/ape/loader-macho.S @@ -16,10 +16,10 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macho.internal.h" +#include "libc/macho.h" #include "libc/sysv/consts/prot.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" // Apple Mach-O Executable Headers // Fixups are applied by objbincopy diff --git a/ape/macros.internal.h b/ape/macros.internal.h index ad354e4749f..dcfdc75a0d3 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.internal.h" +#include "libc/macros.h" #ifdef __ASSEMBLER__ /* clang-format off */ diff --git a/ape/start.S b/ape/start.S index c148966e17d..e497fc8526d 100644 --- a/ape/start.S +++ b/ape/start.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "ape/ape.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #ifdef __aarch64__ diff --git a/ape/systemcall.S b/ape/systemcall.S index c98632fd5e0..91daedc95f9 100644 --- a/ape/systemcall.S +++ b/ape/systemcall.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Invokes system call. // diff --git a/dsp/core/c161.h b/dsp/core/c161.h index 40753eefacf..ddadcaa7f01 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.internal.h" +#include "libc/macros.h" #define EXTRA_SHARP 2 diff --git a/dsp/core/c161s.h b/dsp/core/c161s.h index 325278ee2cc..cd701872732 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.internal.h" +#include "libc/macros.h" __funline signed char C161S(signed char al, signed char bl, signed char cl) { short ax, bx, cx; diff --git a/dsp/core/double2byte.c b/dsp/core/double2byte.c index 1ac894e9b0d..95bcad14c41 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.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/mem.h" diff --git a/dsp/core/float2short.c b/dsp/core/float2short.c index 2c35fb17e04..5efbcb4eebd 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.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/str/str.h" diff --git a/dsp/core/getintegercoefficients.c b/dsp/core/getintegercoefficients.c index b8b377d3d82..fc8cd77bbb5 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.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/str/str.h" diff --git a/dsp/core/getintegercoefficients8.c b/dsp/core/getintegercoefficients8.c index 1ba9e50813b..defafc0585f 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.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/str/str.h" diff --git a/dsp/core/half.h b/dsp/core/half.h index 0955ddfbad6..0165ad76b3a 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.internal.h" +#include "libc/macros.h" /** * Divides integer in half w/ rounding. diff --git a/dsp/core/ks8.h b/dsp/core/ks8.h index 100b3deccba..4a0c81f727c 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.internal.h" +#include "libc/macros.h" /** * Performs 16-bit scaled rounded madd w/ eight coefficients or fewer. diff --git a/dsp/core/kss8.h b/dsp/core/kss8.h index 54bff129cb4..c86ae1a85f6 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.internal.h" +#include "libc/macros.h" /** * Performs 16-bit scaled rounded saturated madd w/ eight coefficients or fewer. diff --git a/dsp/core/q.h b/dsp/core/q.h index 3d122bf49e0..c23fa5f304a 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.internal.h" +#include "libc/macros.h" #include "libc/math.h" /** diff --git a/dsp/core/sad16x8n.c b/dsp/core/sad16x8n.c index 8028361644e..c8e6f4fff68 100644 --- a/dsp/core/sad16x8n.c +++ b/dsp/core/sad16x8n.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/core/core.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "third_party/aarch64/arm_neon.internal.h" #include "third_party/intel/emmintrin.internal.h" diff --git a/dsp/mpeg/clamp4int256-core.S b/dsp/mpeg/clamp4int256-core.S index 3cd6797b185..db3b97c2e03 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.internal.h" +#include "libc/macros.h" clamp4int256$core: .leafprologue diff --git a/dsp/mpeg/mpeg1.c b/dsp/mpeg/mpeg1.c index 5b9eb0b82f0..457dad4bce2 100644 --- a/dsp/mpeg/mpeg1.c +++ b/dsp/mpeg/mpeg1.c @@ -35,7 +35,7 @@ #include "libc/calls/struct/timespec.h" #include "libc/fmt/conv.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.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 7472d82f3cc..35971f17f17 100644 --- a/dsp/mpeg/slowrgb.c +++ b/dsp/mpeg/slowrgb.c @@ -28,7 +28,7 @@ │ SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/mpeg/mpeg.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" __static_yoink("pl_mpeg_notice"); /** diff --git a/dsp/scale/gyarados.c b/dsp/scale/gyarados.c index 61beace016d..adbf5d5d592 100644 --- a/dsp/scale/gyarados.c +++ b/dsp/scale/gyarados.c @@ -25,7 +25,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/dsp/scale/magikarp.c b/dsp/scale/magikarp.c index ca5d3cf8c09..f1f84b2edb5 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.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/x86feature.h" #include "libc/str/str.h" #include "libc/x/x.h" diff --git a/dsp/tty/mpsadbw.S b/dsp/tty/mpsadbw.S index 833824ea474..165e17eddb9 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.internal.h" +#include "libc/macros.h" // TODO(jart): write me diff --git a/dsp/tty/rgb2ansi.c b/dsp/tty/rgb2ansi.c index baece9e8ad0..4ae5c54fa92 100644 --- a/dsp/tty/rgb2ansi.c +++ b/dsp/tty/rgb2ansi.c @@ -21,7 +21,7 @@ #include "libc/assert.h" #include "libc/limits.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/str/str.h" diff --git a/dsp/tty/rgb2ttyi2f.c b/dsp/tty/rgb2ttyi2f.c index e323c57f274..55472a40a20 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.internal.h" +#include "libc/macros.h" struct TtyRgb rgb2ttyi2f_(int r, int g, int b) { return rgb2ttyf((ttyrgb_m128){r, g, b} / 255); diff --git a/dsp/tty/rgb2xterm24.c b/dsp/tty/rgb2xterm24.c index afbb6e9f53a..166412a3271 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.internal.h" +#include "libc/macros.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/rgb2xterm24f.c b/dsp/tty/rgb2xterm24f.c index 5a3b595946d..6cad0f3cc39 100644 --- a/dsp/tty/rgb2xterm24f.c +++ b/dsp/tty/rgb2xterm24f.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/quant.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "third_party/intel/xmmintrin.internal.h" diff --git a/dsp/tty/ttyraster.c b/dsp/tty/ttyraster.c index a4e5e98fd12..3bdb5ae9786 100644 --- a/dsp/tty/ttyraster.c +++ b/dsp/tty/ttyraster.c @@ -26,7 +26,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.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 333c641f004..bfb03f84fa7 100644 --- a/dsp/tty/ttyraw.c +++ b/dsp/tty/ttyraw.c @@ -24,7 +24,7 @@ #include "libc/calls/termios.h" #include "libc/calls/ucontext.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/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 4ebf2931edd..f106fab2904 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.internal.h" +#include "libc/macros.h" // Returns index of minimum uint16 in array. // diff --git a/dsp/tty/windex-sse4.S b/dsp/tty/windex-sse4.S index 0347cb76396..40ef0d85695 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.internal.h" +#include "libc/macros.h" // Returns index of minimum positive int16 in array. // diff --git a/examples/date.c b/examples/date.c index fbee50f5d20..7bfeaca5d47 100644 --- a/examples/date.c +++ b/examples/date.c @@ -10,7 +10,7 @@ #include "libc/calls/calls.h" #include "libc/calls/struct/timespec.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/timezoneid.h" #include "libc/nt/struct/timezoneinformation.h" #include "libc/nt/time.h" diff --git a/examples/nc.c b/examples/nc.c index 3e29a51d29b..34483cf0123 100644 --- a/examples/nc.c +++ b/examples/nc.c @@ -10,7 +10,7 @@ #include "libc/calls/calls.h" #include "libc/fmt/conv.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" #include "libc/sock/struct/linger.h" diff --git a/examples/nesemu1.cc b/examples/nesemu1.cc index a7799bff057..2dd2f794916 100644 --- a/examples/nesemu1.cc +++ b/examples/nesemu1.cc @@ -23,7 +23,7 @@ #include "libc/inttypes.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/arraylist2.internal.h" #include "libc/mem/mem.h" @@ -47,7 +47,7 @@ #include "libc/time.h" #include "libc/x/xasprintf.h" #include "libc/x/xsigaction.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "third_party/getopt/getopt.internal.h" #include "third_party/libcxx/vector" #include "tool/viz/lib/knobs.h" diff --git a/examples/package/lib/myasm.S b/examples/package/lib/myasm.S index acb21b98e4d..f0e0cad662e 100644 --- a/examples/package/lib/myasm.S +++ b/examples/package/lib/myasm.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Example assembly function. // diff --git a/examples/script.c b/examples/script.c index e6559e62689..12ad64a263b 100644 --- a/examples/script.c +++ b/examples/script.c @@ -41,7 +41,7 @@ #include "libc/fmt/conv.h" #include "libc/intrin/bswap.h" #include "libc/log/bsd.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/paths.h" #include "libc/runtime/runtime.h" diff --git a/libc/calls/CPU_AND.c b/libc/calls/CPU_AND.c index b90a0d1e4fe..bfe7ef2cc76 100644 --- a/libc/calls/CPU_AND.c +++ b/libc/calls/CPU_AND.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/cpuset.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" void CPU_AND(cpu_set_t *d, cpu_set_t *x, cpu_set_t *y) { int i; diff --git a/libc/calls/CPU_COUNT.c b/libc/calls/CPU_COUNT.c index 0e2348cb73f..792cbfc7dca 100644 --- a/libc/calls/CPU_COUNT.c +++ b/libc/calls/CPU_COUNT.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/cpuset.h" #include "libc/intrin/popcnt.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" int CPU_COUNT(cpu_set_t *set) { int i, c; diff --git a/libc/calls/CPU_OR.c b/libc/calls/CPU_OR.c index 8218b915802..11fcaf20e82 100644 --- a/libc/calls/CPU_OR.c +++ b/libc/calls/CPU_OR.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/cpuset.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" void CPU_OR(cpu_set_t *d, cpu_set_t *x, cpu_set_t *y) { int i; diff --git a/libc/calls/CPU_XOR.c b/libc/calls/CPU_XOR.c index db5ced87ac1..08277e43ff7 100644 --- a/libc/calls/CPU_XOR.c +++ b/libc/calls/CPU_XOR.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/cpuset.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" void CPU_XOR(cpu_set_t *d, cpu_set_t *x, cpu_set_t *y) { int i; diff --git a/libc/calls/chdir-nt.c b/libc/calls/chdir-nt.c index ebc052c5aaa..2c1b40eedd1 100644 --- a/libc/calls/chdir-nt.c +++ b/libc/calls/chdir-nt.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/syscall_support-nt.internal.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/errors.h" #include "libc/nt/files.h" #include "libc/nt/process.h" diff --git a/libc/calls/clock_gettime-xnu.c b/libc/calls/clock_gettime-xnu.c index e9548884e62..f7a6f5e4123 100644 --- a/libc/calls/clock_gettime-xnu.c +++ b/libc/calls/clock_gettime-xnu.c @@ -21,7 +21,7 @@ #include "libc/calls/struct/timeval.h" #include "libc/calls/struct/timeval.internal.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/clock.h" #ifdef __x86_64__ diff --git a/libc/calls/copy.c b/libc/calls/copy.c index 8be9d5c362d..9140d40e9cf 100644 --- a/libc/calls/copy.c +++ b/libc/calls/copy.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" /** diff --git a/libc/calls/fcntl-nt.c b/libc/calls/fcntl-nt.c index f18945ce824..a10b585f3e0 100644 --- a/libc/calls/fcntl-nt.c +++ b/libc/calls/fcntl-nt.c @@ -31,7 +31,7 @@ #include "libc/intrin/weaken.h" #include "libc/limits.h" #include "libc/log/backtrace.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/leaks.h" #include "libc/mem/mem.h" #include "libc/nt/createfile.h" diff --git a/libc/calls/fstat-nt.c b/libc/calls/fstat-nt.c index 3c6b8c1cd01..a15c42bb271 100644 --- a/libc/calls/fstat-nt.c +++ b/libc/calls/fstat-nt.c @@ -27,7 +27,7 @@ #include "libc/intrin/atomic.h" #include "libc/intrin/bsr.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alloca.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/enum/fileinfobyhandleclass.h" diff --git a/libc/calls/fstatfs-nt.c b/libc/calls/fstatfs-nt.c index 06c0ce515db..f7d0229bc81 100644 --- a/libc/calls/fstatfs-nt.c +++ b/libc/calls/fstatfs-nt.c @@ -23,7 +23,7 @@ #include "libc/calls/struct/statfs.internal.h" #include "libc/calls/syscall_support-nt.internal.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/fsinformationclass.h" #include "libc/nt/enum/status.h" #include "libc/nt/files.h" diff --git a/libc/calls/getcontext.S b/libc/calls/getcontext.S index bf3400f4310..a05f5c83cc0 100644 --- a/libc/calls/getcontext.S +++ b/libc/calls/getcontext.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Gets machine state. // diff --git a/libc/calls/getdomainname.c b/libc/calls/getdomainname.c index 9cfb722f64d..988cbdd2eb5 100644 --- a/libc/calls/getdomainname.c +++ b/libc/calls/getdomainname.c @@ -20,7 +20,7 @@ #include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/computernameformat.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/getdtablesize.c b/libc/calls/getdtablesize.c index fdfd06ac51e..cc5a7460e2c 100644 --- a/libc/calls/getdtablesize.c +++ b/libc/calls/getdtablesize.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/rlimit.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/rlimit.h" diff --git a/libc/calls/gethostname-nt.c b/libc/calls/gethostname-nt.c index e1c9e1f0b04..a39b0d013f7 100644 --- a/libc/calls/gethostname-nt.c +++ b/libc/calls/gethostname-nt.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/syscall_support-nt.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/computernameformat.h" #include "libc/nt/systeminfo.h" #include "libc/str/str.h" diff --git a/libc/calls/getloadavg-nt.c b/libc/calls/getloadavg-nt.c index 4e8d6d847bc..08d733536c9 100644 --- a/libc/calls/getloadavg-nt.c +++ b/libc/calls/getloadavg-nt.c @@ -21,7 +21,7 @@ #include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/fmt/conv.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/accounting.h" #include "libc/runtime/runtime.h" #include "libc/thread/thread.h" diff --git a/libc/calls/getntsyspath.S b/libc/calls/getntsyspath.S index 62bd818f0b1..b8f2b65cd68 100644 --- a/libc/calls/getntsyspath.S +++ b/libc/calls/getntsyspath.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" // Obtains WIN32 magic path, e.g. GetTempPathA. // diff --git a/libc/calls/getprogramexecutablename.greg.c b/libc/calls/getprogramexecutablename.greg.c index 12f02933cb3..8e6e9e1c75f 100644 --- a/libc/calls/getprogramexecutablename.greg.c +++ b/libc/calls/getprogramexecutablename.greg.c @@ -27,7 +27,7 @@ #include "libc/intrin/getenv.h" #include "libc/intrin/strace.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/runtime.h" #include "libc/runtime/runtime.h" #include "libc/serialize.h" diff --git a/libc/calls/getrandom.c b/libc/calls/getrandom.c index 957c7bc1890..2b16815d42f 100644 --- a/libc/calls/getrandom.c +++ b/libc/calls/getrandom.c @@ -32,7 +32,7 @@ #include "libc/intrin/asmflag.h" #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/kcpuids.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/nexgen32e/vendor.internal.h" diff --git a/libc/calls/getuid-nt.c b/libc/calls/getuid-nt.c index 7f191db4e06..c6acd2a911a 100644 --- a/libc/calls/getuid-nt.c +++ b/libc/calls/getuid-nt.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/intrin/atomic.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/accounting.h" #include "libc/str/str.h" diff --git a/libc/calls/getuid.c b/libc/calls/getuid.c index 483be9c1557..3be6e82457e 100644 --- a/libc/calls/getuid.c +++ b/libc/calls/getuid.c @@ -25,7 +25,7 @@ #include "libc/intrin/atomic.h" #include "libc/intrin/strace.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/calls/internal.h b/libc/calls/internal.h index 8a9b54819ac..04e87a36cd2 100644 --- a/libc/calls/internal.h +++ b/libc/calls/internal.h @@ -4,7 +4,7 @@ #include "libc/intrin/fds.h" #include "libc/calls/struct/sigval.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdbool.h" #define kSigactionMinRva 8 /* >SIG_{ERR,DFL,IGN,...} */ diff --git a/libc/calls/ioctl.c b/libc/calls/ioctl.c index 7eaa44a0052..1130a6c3466 100644 --- a/libc/calls/ioctl.c +++ b/libc/calls/ioctl.c @@ -27,7 +27,7 @@ #include "libc/intrin/fds.h" #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alloca.h" #include "libc/mem/mem.h" #include "libc/nt/console.h" diff --git a/libc/calls/kntsystemdirectory.S b/libc/calls/kntsystemdirectory.S index 85338d5558a..e50cc348596 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.internal.h" +#include "libc/macros.h" #define BYTES 64 diff --git a/libc/calls/kntwindowsdirectory.S b/libc/calls/kntwindowsdirectory.S index de7418a622a..0a20e3183a0 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.internal.h" +#include "libc/macros.h" #define BYTES 64 diff --git a/libc/calls/metalfile.c b/libc/calls/metalfile.c index cdfb6bc5f6c..d20736e35df 100644 --- a/libc/calls/metalfile.c +++ b/libc/calls/metalfile.c @@ -32,7 +32,7 @@ #include "libc/intrin/directmap.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/pc.internal.h" #include "libc/runtime/runtime.h" diff --git a/libc/calls/metalfile_init.S b/libc/calls/metalfile_init.S index 72e7f8972ac..0f5466fc50f 100644 --- a/libc/calls/metalfile_init.S +++ b/libc/calls/metalfile_init.S @@ -24,7 +24,7 @@ │ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR │ │ OTHER DEALINGS IN THE SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/calls/metalfile.internal.h" .init.start 102,_init_metalfile diff --git a/libc/calls/mkntpath.c b/libc/calls/mkntpath.c index f1ca7d15361..c3116d794e2 100644 --- a/libc/calls/mkntpath.c +++ b/libc/calls/mkntpath.c @@ -20,7 +20,7 @@ #include "libc/dce.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/systeminfo.h" #include "libc/str/str.h" #include "libc/sysv/consts/o.h" diff --git a/libc/calls/mkntpathat.c b/libc/calls/mkntpathat.c index e1e845b55f6..81a80ecc837 100644 --- a/libc/calls/mkntpathat.c +++ b/libc/calls/mkntpathat.c @@ -19,7 +19,7 @@ #include "libc/calls/internal.h" #include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/files.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/calls/netbsdtramp.S b/libc/calls/netbsdtramp.S index 01fdca76909..dddd3536b81 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.internal.h" +#include "libc/macros.h" .privileged __restore_rt_netbsd: diff --git a/libc/calls/ntspawn.c b/libc/calls/ntspawn.c index 3925319158d..1db070f1942 100644 --- a/libc/calls/ntspawn.c +++ b/libc/calls/ntspawn.c @@ -39,7 +39,7 @@ #include "libc/nt/struct/startupinfo.h" #include "libc/nt/struct/startupinfoex.h" #include "libc/proc/ntspawn.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" #ifdef __x86_64__ diff --git a/libc/calls/open-nt.c b/libc/calls/open-nt.c index 9a2f5808f48..09061eb8a58 100644 --- a/libc/calls/open-nt.c +++ b/libc/calls/open-nt.c @@ -25,7 +25,7 @@ #include "libc/calls/syscall_support-nt.internal.h" #include "libc/errno.h" #include "libc/intrin/fds.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/console.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" diff --git a/libc/calls/openat-metal.c b/libc/calls/openat-metal.c index ec958f4c0fc..16650f4b3ef 100644 --- a/libc/calls/openat-metal.c +++ b/libc/calls/openat-metal.c @@ -23,7 +23,7 @@ #include "libc/calls/metalfile.internal.h" #include "libc/intrin/directmap.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/pc.internal.h" #include "libc/runtime/runtime.h" diff --git a/libc/calls/parsepromises.c b/libc/calls/parsepromises.c index af4770e0669..c12b2ee3337 100644 --- a/libc/calls/parsepromises.c +++ b/libc/calls/parsepromises.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/pledge.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" static int FindPromise(const char *name) { diff --git a/libc/calls/pledge-linux.c b/libc/calls/pledge-linux.c index fbafd3d1e75..1dfeb7b8f3a 100644 --- a/libc/calls/pledge-linux.c +++ b/libc/calls/pledge-linux.c @@ -29,7 +29,7 @@ #include "libc/intrin/bsr.h" #include "libc/intrin/likely.h" #include "libc/intrin/promises.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/runtime/stack.h" #include "libc/sysv/consts/audit.h" diff --git a/libc/calls/poll-nt.c b/libc/calls/poll-nt.c index ac1e64c7ef9..4735c7f4045 100644 --- a/libc/calls/poll-nt.c +++ b/libc/calls/poll-nt.c @@ -28,7 +28,7 @@ #include "libc/errno.h" #include "libc/intrin/atomic.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nt/console.h" #include "libc/nt/enum/filetype.h" diff --git a/libc/calls/pread.c b/libc/calls/pread.c index 0064397cb06..ee42b55bdab 100644 --- a/libc/calls/pread.c +++ b/libc/calls/pread.c @@ -26,7 +26,7 @@ #include "libc/dce.h" #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/runtime/zipos.internal.h" #include "libc/stdio/sysparam.h" diff --git a/libc/calls/program_executable_name_init.S b/libc/calls/program_executable_name_init.S index 99ed4db3ed3..262018e257d 100644 --- a/libc/calls/program_executable_name_init.S +++ b/libc/calls/program_executable_name_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.internal.h" +#include "libc/macros.h" .init.start 305,_init_program_executable_name push %rdi diff --git a/libc/calls/pwrite.c b/libc/calls/pwrite.c index e1f030def1b..c76c1d01ae0 100644 --- a/libc/calls/pwrite.c +++ b/libc/calls/pwrite.c @@ -26,7 +26,7 @@ #include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdio/sysparam.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/read-nt.c b/libc/calls/read-nt.c index 146adec2008..47ea08294a1 100644 --- a/libc/calls/read-nt.c +++ b/libc/calls/read-nt.c @@ -34,7 +34,7 @@ #include "libc/intrin/nomultics.h" #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/console.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" diff --git a/libc/calls/readv-metal.c b/libc/calls/readv-metal.c index 5de8ace91fb..926d6fbc8c2 100644 --- a/libc/calls/readv-metal.c +++ b/libc/calls/readv-metal.c @@ -22,7 +22,7 @@ #include "libc/calls/struct/iovec.h" #include "libc/calls/struct/iovec.internal.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" #include "libc/vga/vga.internal.h" diff --git a/libc/calls/releasefd.c b/libc/calls/releasefd.c index f6947d22da9..ccf2664bd15 100644 --- a/libc/calls/releasefd.c +++ b/libc/calls/releasefd.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/intrin/atomic.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" // really want to avoid locking here so close() needn't block signals diff --git a/libc/calls/restore.S b/libc/calls/restore.S index 6ce3471604a..596b01f7cbe 100644 --- a/libc/calls/restore.S +++ b/libc/calls/restore.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.windows // Restores thread to state before signal. diff --git a/libc/calls/rusage_add.c b/libc/calls/rusage_add.c index 38a831aac88..254b041690d 100644 --- a/libc/calls/rusage_add.c +++ b/libc/calls/rusage_add.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/rusage.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" /** * Accumulates resource statistics in `y` to `x`. diff --git a/libc/calls/select-nt.c b/libc/calls/select-nt.c index 8245f9f326a..a669cae3721 100644 --- a/libc/calls/select-nt.c +++ b/libc/calls/select-nt.c @@ -21,7 +21,7 @@ #include "libc/calls/state.internal.h" #include "libc/calls/struct/timeval.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sock/select.h" #include "libc/sock/sock.h" #include "libc/sock/struct/pollfd.h" diff --git a/libc/calls/setrlimit.c b/libc/calls/setrlimit.c index 7cfaeccc687..6b832848941 100644 --- a/libc/calls/setrlimit.c +++ b/libc/calls/setrlimit.c @@ -24,7 +24,7 @@ #include "libc/errno.h" #include "libc/intrin/describeflags.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/runtime/syslib.internal.h" #include "libc/sysv/consts/rlimit.h" diff --git a/libc/calls/sigaction.c b/libc/calls/sigaction.c index d3f46e71b9e..be67e817cb3 100644 --- a/libc/calls/sigaction.c +++ b/libc/calls/sigaction.c @@ -36,7 +36,7 @@ #include "libc/limits.h" #include "libc/log/backtrace.internal.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/runtime/syslib.internal.h" diff --git a/libc/calls/sigaltstack.c b/libc/calls/sigaltstack.c index 0e246d749e6..dac5f4526ad 100644 --- a/libc/calls/sigaltstack.c +++ b/libc/calls/sigaltstack.c @@ -23,7 +23,7 @@ #include "libc/dce.h" #include "libc/intrin/describeflags.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/runtime/syslib.internal.h" #include "libc/sysv/consts/ss.h" diff --git a/libc/calls/sigcrashsig.c b/libc/calls/sigcrashsig.c index 21e0d020349..060c2b31063 100644 --- a/libc/calls/sigcrashsig.c +++ b/libc/calls/sigcrashsig.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/sig.internal.h" #include "libc/intrin/pushpop.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/signal.h" #include "libc/nt/enum/status.h" #include "libc/nt/struct/ntexceptionpointers.h" diff --git a/libc/calls/sigenter-freebsd.c b/libc/calls/sigenter-freebsd.c index 0f29ad54730..d895f630ce0 100644 --- a/libc/calls/sigenter-freebsd.c +++ b/libc/calls/sigenter-freebsd.c @@ -28,7 +28,7 @@ #include "libc/calls/struct/ucontext-freebsd.internal.h" #include "libc/calls/ucontext.h" #include "libc/log/libfatal.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/runtime/stack.h" #include "libc/str/str.h" diff --git a/libc/calls/sigenter-netbsd.c b/libc/calls/sigenter-netbsd.c index 9e20817df35..09f8ff90c21 100644 --- a/libc/calls/sigenter-netbsd.c +++ b/libc/calls/sigenter-netbsd.c @@ -27,7 +27,7 @@ #include "libc/calls/struct/ucontext-netbsd.internal.h" #include "libc/calls/ucontext.h" #include "libc/log/libfatal.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/runtime/stack.h" #include "libc/str/str.h" diff --git a/libc/calls/sigenter-openbsd.c b/libc/calls/sigenter-openbsd.c index 5be46f32a73..ac381974092 100644 --- a/libc/calls/sigenter-openbsd.c +++ b/libc/calls/sigenter-openbsd.c @@ -27,7 +27,7 @@ #include "libc/calls/struct/ucontext-openbsd.internal.h" #include "libc/calls/ucontext.h" #include "libc/log/libfatal.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/runtime/stack.h" #include "libc/str/str.h" diff --git a/libc/calls/swapcontext.S b/libc/calls/swapcontext.S index 6dd78947fda..d7b96556f22 100644 --- a/libc/calls/swapcontext.S +++ b/libc/calls/swapcontext.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Saves machine to 𝑥 and activates 𝑦, i.e. // diff --git a/libc/calls/sysinfo.c b/libc/calls/sysinfo.c index cf7ce29d3ea..e67de5921ac 100644 --- a/libc/calls/sysinfo.c +++ b/libc/calls/sysinfo.c @@ -23,7 +23,7 @@ #include "libc/calls/struct/timeval.h" #include "libc/dce.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/tailcontext.S b/libc/calls/tailcontext.S index a55163dce2e..071f980673d 100644 --- a/libc/calls/tailcontext.S +++ b/libc/calls/tailcontext.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // tailed called by setcontext() implementation __tailcontext: diff --git a/libc/calls/tmpdir.c b/libc/calls/tmpdir.c index 5524671678a..946bf2bbf30 100644 --- a/libc/calls/tmpdir.c +++ b/libc/calls/tmpdir.c @@ -21,7 +21,7 @@ #include "libc/cosmo.h" #include "libc/dce.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/systeminfo.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/calls/uname.c b/libc/calls/uname.c index 8569c783989..0f3f0e2d43a 100644 --- a/libc/calls/uname.c +++ b/libc/calls/uname.c @@ -27,7 +27,7 @@ #include "libc/fmt/itoa.h" #include "libc/intrin/strace.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/computernameformat.h" #include "libc/nt/systeminfo.h" #include "libc/runtime/runtime.h" diff --git a/libc/calls/unveil.c b/libc/calls/unveil.c index 8112fc72107..c4bcbb5594b 100644 --- a/libc/calls/unveil.c +++ b/libc/calls/unveil.c @@ -33,7 +33,7 @@ #include "libc/fmt/libgen.h" #include "libc/intrin/strace.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/vendor.internal.h" #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" diff --git a/libc/calls/winexec.c b/libc/calls/winexec.c index cdb41dd722a..ca52372c53c 100644 --- a/libc/calls/winexec.c +++ b/libc/calls/winexec.c @@ -24,7 +24,7 @@ #include "libc/nt/runtime.h" #include "libc/nt/struct/overlapped.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "third_party/linenoise/linenoise.h" #define Read32(s) (s[3] << 24 | s[2] << 16 | s[1] << 8 | s[0]) diff --git a/libc/crt/crt.S b/libc/crt/crt.S index b5ba61a59b9..d34bc83b8ae 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.internal.h" +#include "libc/macros.h" .section .start,"ax",@progbits #if SupportsXnu() && defined(__x86_64__) diff --git a/libc/dlopen/foreign_tramp.S b/libc/dlopen/foreign_tramp.S index dbd03630665..38dc914f162 100644 --- a/libc/dlopen/foreign_tramp.S +++ b/libc/dlopen/foreign_tramp.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #define SIZE 0x0200 #define SKEW 0x10 diff --git a/libc/dos.internal.h b/libc/dos.h similarity index 100% rename from libc/dos.internal.h rename to libc/dos.h diff --git a/libc/fmt/bing.c b/libc/fmt/bing.c index 3ccfb87c6b7..8280685cb15 100644 --- a/libc/fmt/bing.c +++ b/libc/fmt/bing.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/fmt/bing.internal.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * Turns binary octet into unicode glyph representation. diff --git a/libc/fmt/itoa64radix16.greg.c b/libc/fmt/itoa64radix16.greg.c index 25c5e55a9c3..28555685d68 100644 --- a/libc/fmt/itoa64radix16.greg.c +++ b/libc/fmt/itoa64radix16.greg.c @@ -19,7 +19,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/intrin/bsr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" size_t uint64toarray_radix16(uint64_t x, char b[hasatleast 17]) { return uint64toarray_fixed16(x, b, ROUNDUP(x ? bsrl(x) + 1 : 1, 4)); diff --git a/libc/fmt/unbing.c b/libc/fmt/unbing.c index ddee8e82867..66ae63d7fa4 100644 --- a/libc/fmt/unbing.c +++ b/libc/fmt/unbing.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/bing.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" static const int kCp437i[] = { 0x000a << 8 | 10, // \n NEWLINE diff --git a/libc/fmt/unzleb64.c b/libc/fmt/unzleb64.c index edc7c71c7e5..4627da678aa 100644 --- a/libc/fmt/unzleb64.c +++ b/libc/fmt/unzleb64.c @@ -28,7 +28,7 @@ ░███▓▀ ▀▓▓██▀▀░ ░▀░ */ #include "libc/fmt/leb128.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" /** * Decodes array to signed integer w/ zig-zag encoding. diff --git a/libc/fmt/wcstol.c b/libc/fmt/wcstol.c index f95000e1cfd..ac303732598 100644 --- a/libc/fmt/wcstol.c +++ b/libc/fmt/wcstol.c @@ -22,7 +22,7 @@ #include "libc/limits.h" #include "libc/stdckdint.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * Decodes signed long integer from wide string. diff --git a/libc/fmt/wcstoul.c b/libc/fmt/wcstoul.c index 9085a80007f..b953c1366fa 100644 --- a/libc/fmt/wcstoul.c +++ b/libc/fmt/wcstoul.c @@ -22,7 +22,7 @@ #include "libc/limits.h" #include "libc/stdckdint.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * Decodes unsigned integer from wide string. diff --git a/libc/imag.internal.h b/libc/imag.h similarity index 100% rename from libc/imag.internal.h rename to libc/imag.h diff --git a/libc/intrin/aarch64/asmdefs.h b/libc/intrin/aarch64/asmdefs.h index f18eb2bc195..e8d677849b7 100644 --- a/libc/intrin/aarch64/asmdefs.h +++ b/libc/intrin/aarch64/asmdefs.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_AARCH64_ASMDEFS_H_ #define COSMOPOLITAN_LIBC_INTRIN_AARCH64_ASMDEFS_H_ -#include "libc/macros.internal.h" +#include "libc/macros.h" #ifdef __ASSEMBLER__ // clang-format off diff --git a/libc/intrin/cxaatexit.c b/libc/intrin/cxaatexit.c index 7f13261bf52..eca0952ce53 100644 --- a/libc/intrin/cxaatexit.c +++ b/libc/intrin/cxaatexit.c @@ -20,7 +20,7 @@ #include "libc/intrin/cxaatexit.h" #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/sysv/errfuns.h" diff --git a/libc/intrin/describecapability.c b/libc/intrin/describecapability.c index 6e072f4dd31..7ef9e97fd6f 100644 --- a/libc/intrin/describecapability.c +++ b/libc/intrin/describecapability.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/itoa.h" #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/sysv/consts/cap.h" diff --git a/libc/intrin/describecontrolkeystate.c b/libc/intrin/describecontrolkeystate.c index c46d859a2dd..f8231d108a1 100644 --- a/libc/intrin/describecontrolkeystate.c +++ b/libc/intrin/describecontrolkeystate.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/struct/inputrecord.h" static const struct DescribeFlags kControlKeyState[] = { diff --git a/libc/intrin/describednotify.c b/libc/intrin/describednotify.c index b4b7199401f..2739ccca10b 100644 --- a/libc/intrin/describednotify.c +++ b/libc/intrin/describednotify.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/processaccess.h" #include "libc/sysv/consts/dn.h" diff --git a/libc/intrin/describegidlist.c b/libc/intrin/describegidlist.c index d35e9db87b5..c2c10613622 100644 --- a/libc/intrin/describegidlist.c +++ b/libc/intrin/describegidlist.c @@ -20,7 +20,7 @@ #include "libc/dce.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/popcnt.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #define N 128 diff --git a/libc/intrin/describeiovec.c b/libc/intrin/describeiovec.c index 2f1e9735042..a39c69c3f9f 100644 --- a/libc/intrin/describeiovec.c +++ b/libc/intrin/describeiovec.c @@ -21,7 +21,7 @@ #include "libc/dce.h" #include "libc/intrin/kprintf.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #define N 300 diff --git a/libc/intrin/describeiovnt.c b/libc/intrin/describeiovnt.c index 8229301d24a..58e60ec4168 100644 --- a/libc/intrin/describeiovnt.c +++ b/libc/intrin/describeiovnt.c @@ -19,7 +19,7 @@ #include "libc/dce.h" #include "libc/intrin/describeflags.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/winsock.h" void DescribeIovNt(const struct NtIovec *iov, uint32_t iovlen, ssize_t rem) { diff --git a/libc/intrin/describemapflags.c b/libc/intrin/describemapflags.c index 770798ac02d..e46b28a3d1f 100644 --- a/libc/intrin/describemapflags.c +++ b/libc/intrin/describemapflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/consolemodeflags.h" #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/prot.h" diff --git a/libc/intrin/describemremapflags.c b/libc/intrin/describemremapflags.c index 185206e3cc5..a4505131af6 100644 --- a/libc/intrin/describemremapflags.c +++ b/libc/intrin/describemremapflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/mremap.h" static const struct DescribeFlags kMremapFlags[] = { diff --git a/libc/intrin/describemsyncflags.c b/libc/intrin/describemsyncflags.c index 4814934890d..2223afe6203 100644 --- a/libc/intrin/describemsyncflags.c +++ b/libc/intrin/describemsyncflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/msync.h" const char *(DescribeMsyncFlags)(char buf[48], int x) { diff --git a/libc/intrin/describentconsolemodeinputflags.c b/libc/intrin/describentconsolemodeinputflags.c index caeeae037db..fdea2e24969 100644 --- a/libc/intrin/describentconsolemodeinputflags.c +++ b/libc/intrin/describentconsolemodeinputflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/consolemodeflags.h" static const struct DescribeFlags kConsoleModeInputFlags[] = { diff --git a/libc/intrin/describentconsolemodeoutputflags.c b/libc/intrin/describentconsolemodeoutputflags.c index 68ab4c2c144..78f1d39d551 100644 --- a/libc/intrin/describentconsolemodeoutputflags.c +++ b/libc/intrin/describentconsolemodeoutputflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/consolemodeflags.h" static const struct DescribeFlags kConsoleModeOutputFlags[] = { diff --git a/libc/intrin/describentfileaccessflags.c b/libc/intrin/describentfileaccessflags.c index 996c9f36b4a..b1d935a55a3 100644 --- a/libc/intrin/describentfileaccessflags.c +++ b/libc/intrin/describentfileaccessflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/accessmask.h" #include "libc/nt/enum/filesharemode.h" // clang-format off diff --git a/libc/intrin/describentfileflagattr.c b/libc/intrin/describentfileflagattr.c index a27024fbd00..5dc9ee8ccc5 100644 --- a/libc/intrin/describentfileflagattr.c +++ b/libc/intrin/describentfileflagattr.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/runtime/runtime.h" diff --git a/libc/intrin/describentfilemapflags.c b/libc/intrin/describentfilemapflags.c index 11d28d5613d..316fb089452 100644 --- a/libc/intrin/describentfilemapflags.c +++ b/libc/intrin/describentfilemapflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/filemapflags.h" static const struct DescribeFlags kFileMapFlags[] = { diff --git a/libc/intrin/describentfileshareflags.c b/libc/intrin/describentfileshareflags.c index 865cda1d7e5..49e771979f8 100644 --- a/libc/intrin/describentfileshareflags.c +++ b/libc/intrin/describentfileshareflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/filesharemode.h" static const struct DescribeFlags kFileShareflags[] = { diff --git a/libc/intrin/describentfiletypeflags.c b/libc/intrin/describentfiletypeflags.c index 8e720f30225..5f7c9d1343c 100644 --- a/libc/intrin/describentfiletypeflags.c +++ b/libc/intrin/describentfiletypeflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/filetype.h" #include "libc/sysv/consts/mremap.h" diff --git a/libc/intrin/describentlockfileflags.c b/libc/intrin/describentlockfileflags.c index 69f0875bcd0..a32a75bca3f 100644 --- a/libc/intrin/describentlockfileflags.c +++ b/libc/intrin/describentlockfileflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/filelockflags.h" static const struct DescribeFlags kNtLockFileFlags[] = { diff --git a/libc/intrin/describentmovfileinpflags.c b/libc/intrin/describentmovfileinpflags.c index 1b301cd6afc..e4ba860ca49 100644 --- a/libc/intrin/describentmovfileinpflags.c +++ b/libc/intrin/describentmovfileinpflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/movefileexflags.h" static const struct DescribeFlags kMoveFileInputFlags[] = { diff --git a/libc/intrin/describentoverlapped.c b/libc/intrin/describentoverlapped.c index d6727424db6..c516c51d895 100644 --- a/libc/intrin/describentoverlapped.c +++ b/libc/intrin/describentoverlapped.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describentoverlapped.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" const char *(DescribeNtOverlapped)(char b[128], const struct NtOverlapped *o) { int i = 0, n = 128; diff --git a/libc/intrin/describentpageflags.c b/libc/intrin/describentpageflags.c index 30acb62bcbb..55ef2e63c81 100644 --- a/libc/intrin/describentpageflags.c +++ b/libc/intrin/describentpageflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/pageflags.h" static const struct DescribeFlags kPageFlags[] = { diff --git a/libc/intrin/describentpipemodeflags.c b/libc/intrin/describentpipemodeflags.c index 4bab699f4a4..f64125eb81b 100644 --- a/libc/intrin/describentpipemodeflags.c +++ b/libc/intrin/describentpipemodeflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/filemapflags.h" #include "libc/nt/ipc.h" diff --git a/libc/intrin/describentpipeopenflags.c b/libc/intrin/describentpipeopenflags.c index bc81342291a..8f4b0d783f4 100644 --- a/libc/intrin/describentpipeopenflags.c +++ b/libc/intrin/describentpipeopenflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/accessmask.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/enum/filemapflags.h" diff --git a/libc/intrin/describentprocaccessflags.c b/libc/intrin/describentprocaccessflags.c index a7f5db91743..732f7df186b 100644 --- a/libc/intrin/describentprocaccessflags.c +++ b/libc/intrin/describentprocaccessflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/processaccess.h" static const struct DescribeFlags kProcessAccessflags[] = { diff --git a/libc/intrin/describentstartflags.c b/libc/intrin/describentstartflags.c index 6a46b736cf4..082dd026f1c 100644 --- a/libc/intrin/describentstartflags.c +++ b/libc/intrin/describentstartflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/startf.h" #include "libc/sysv/consts/prot.h" diff --git a/libc/intrin/describentsymlinkflags.c b/libc/intrin/describentsymlinkflags.c index 85e5d5896c1..2da9dfb1019 100644 --- a/libc/intrin/describentsymlinkflags.c +++ b/libc/intrin/describentsymlinkflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/symboliclink.h" static const struct DescribeFlags kSymbolicLinkflags[] = { diff --git a/libc/intrin/describeopenflags.c b/libc/intrin/describeopenflags.c index 984ecd76e21..c8741e9ef6b 100644 --- a/libc/intrin/describeopenflags.c +++ b/libc/intrin/describeopenflags.c @@ -20,7 +20,7 @@ #include "libc/fmt/itoa.h" #include "libc/fmt/magnumstrs.internal.h" #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/sol.h" diff --git a/libc/intrin/describepersonalityflags.c b/libc/intrin/describepersonalityflags.c index 86d5563cf9a..ea2ce49eeca 100644 --- a/libc/intrin/describepersonalityflags.c +++ b/libc/intrin/describepersonalityflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/accessmask.h" #include "libc/nt/enum/filesharemode.h" #include "libc/sysv/consts/personality.h" diff --git a/libc/intrin/describepollfds.c b/libc/intrin/describepollfds.c index dd1b8a19a8f..60691a98475 100644 --- a/libc/intrin/describepollfds.c +++ b/libc/intrin/describepollfds.c @@ -20,7 +20,7 @@ #include "libc/intrin/describeflags.h" #include "libc/intrin/kprintf.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sock/struct/pollfd.h" #include "libc/sock/struct/pollfd.internal.h" diff --git a/libc/intrin/describepollflags.c b/libc/intrin/describepollflags.c index e902914a33b..f552d965171 100644 --- a/libc/intrin/describepollflags.c +++ b/libc/intrin/describepollflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/filemapflags.h" #include "libc/sysv/consts/poll.h" diff --git a/libc/intrin/describeprotflags.c b/libc/intrin/describeprotflags.c index 33baf5fcf2b..03492a9b231 100644 --- a/libc/intrin/describeprotflags.c +++ b/libc/intrin/describeprotflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/prot.h" const char *(DescribeProtFlags)(char buf[48], int x) { diff --git a/libc/intrin/describeschedpolicy.c b/libc/intrin/describeschedpolicy.c index 687636ae3b2..5e65a554f16 100644 --- a/libc/intrin/describeschedpolicy.c +++ b/libc/intrin/describeschedpolicy.c @@ -19,7 +19,7 @@ #include "libc/fmt/itoa.h" #include "libc/fmt/magnumstrs.internal.h" #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/sysv/consts/sched.h" diff --git a/libc/intrin/describesigaction.c b/libc/intrin/describesigaction.c index a9b1fb8d6e7..e9c0413d3b3 100644 --- a/libc/intrin/describesigaction.c +++ b/libc/intrin/describesigaction.c @@ -23,7 +23,7 @@ #include "libc/dce.h" #include "libc/intrin/describeflags.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alloca.h" #include "libc/sysv/consts/sa.h" diff --git a/libc/intrin/describesigaltstackflags.c b/libc/intrin/describesigaltstackflags.c index e9c7c6e8b8c..537ebae65fa 100644 --- a/libc/intrin/describesigaltstackflags.c +++ b/libc/intrin/describesigaltstackflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/ss.h" const char *(DescribeSigaltstackFlags)(char buf[22], int x) { diff --git a/libc/intrin/describetermios.c b/libc/intrin/describetermios.c index 6a76a223493..36ad691bd0c 100644 --- a/libc/intrin/describetermios.c +++ b/libc/intrin/describetermios.c @@ -22,7 +22,7 @@ #include "libc/dce.h" #include "libc/intrin/describeflags.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/termios.h" #define N 1024 diff --git a/libc/intrin/describethreadcreationflags.c b/libc/intrin/describethreadcreationflags.c index 1b0e75b6269..a53064a27a3 100644 --- a/libc/intrin/describethreadcreationflags.c +++ b/libc/intrin/describethreadcreationflags.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/processcreationflags.h" static const struct DescribeFlags kThreadCreationFlags[] = { diff --git a/libc/intrin/describevirtualkeycode.c b/libc/intrin/describevirtualkeycode.c index 2e4bc1b05eb..4131b31f3b2 100644 --- a/libc/intrin/describevirtualkeycode.c +++ b/libc/intrin/describevirtualkeycode.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/vk.h" // clang-format off diff --git a/libc/intrin/describewinsize.c b/libc/intrin/describewinsize.c index 994ade4240f..de671b7ead0 100644 --- a/libc/intrin/describewinsize.c +++ b/libc/intrin/describewinsize.c @@ -22,7 +22,7 @@ #include "libc/intrin/describeflags.h" #include "libc/intrin/kprintf.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #define N 64 diff --git a/libc/intrin/directmap-metal.c b/libc/intrin/directmap-metal.c index 77c0ee8b9b9..8ed352fef61 100644 --- a/libc/intrin/directmap-metal.c +++ b/libc/intrin/directmap-metal.c @@ -20,7 +20,7 @@ #include "libc/calls/internal.h" #include "libc/calls/metalfile.internal.h" #include "libc/intrin/directmap.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/pc.internal.h" #include "libc/str/str.h" #include "libc/sysv/consts/prot.h" diff --git a/libc/intrin/dsohandle.S b/libc/intrin/dsohandle.S index 39cc3e9895f..37108e8a390 100644 --- a/libc/intrin/dsohandle.S +++ b/libc/intrin/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.internal.h" +#include "libc/macros.h" .underrun // Uniquely identifies each artifact linked in an address space. diff --git a/libc/intrin/fds_init.S b/libc/intrin/fds_init.S index d0fa0b96d9c..f86569b6f7c 100644 --- a/libc/intrin/fds_init.S +++ b/libc/intrin/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.internal.h" +#include "libc/macros.h" .init.start 305,_init_fds push %rdi diff --git a/libc/intrin/fenv.S b/libc/intrin/fenv.S index ae00d8684d2..697d19999f5 100644 --- a/libc/intrin/fenv.S +++ b/libc/intrin/fenv.S @@ -25,7 +25,7 @@ │ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Clears floating point exception status, e.g. // diff --git a/libc/intrin/formathex64.c b/libc/intrin/formathex64.c index 33ba78f8e96..e54a1b2c7fd 100644 --- a/libc/intrin/formathex64.c +++ b/libc/intrin/formathex64.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/itoa.h" #include "libc/intrin/bsr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" static inline int PickGoodWidth(unsigned x, char z) { if (z) { diff --git a/libc/intrin/futex.S b/libc/intrin/futex.S index 73971e95900..67c1d9822f6 100644 --- a/libc/intrin/futex.S +++ b/libc/intrin/futex.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/sysv/consts/nr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .privileged _futex: diff --git a/libc/intrin/gcov.S b/libc/intrin/gcov.S index c32da3b855a..410e30da254 100644 --- a/libc/intrin/gcov.S +++ b/libc/intrin/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.internal.h" +#include "libc/macros.h" // Magic words to unbreak build if GCOV flags are passed. diff --git a/libc/intrin/getcpuidbrand.S b/libc/intrin/getcpuidbrand.S index 0f4c397f42e..255d34a48a0 100644 --- a/libc/intrin/getcpuidbrand.S +++ b/libc/intrin/getcpuidbrand.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" GetCpuidBrand: mov %esi,%eax diff --git a/libc/intrin/getmainstack.c b/libc/intrin/getmainstack.c index af6e901ba49..5aa21a6d6f8 100644 --- a/libc/intrin/getmainstack.c +++ b/libc/intrin/getmainstack.c @@ -22,7 +22,7 @@ #include "libc/intrin/getauxval.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/maps.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/auxv.h" #include "libc/sysv/consts/rlim.h" diff --git a/libc/intrin/getminsigstksz.c b/libc/intrin/getminsigstksz.c index cb87e441c6d..2718aa13d7b 100644 --- a/libc/intrin/getminsigstksz.c +++ b/libc/intrin/getminsigstksz.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/getauxval.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/auxv.h" #include "libc/sysv/consts/ss.h" diff --git a/libc/intrin/interrupts.S b/libc/intrin/interrupts.S index 837973a1811..f1b4298c507 100644 --- a/libc/intrin/interrupts.S +++ b/libc/intrin/interrupts.S @@ -26,7 +26,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/intrin/kprintf.h" #include "libc/runtime/pc.internal.h" diff --git a/libc/intrin/kclocknames.S b/libc/intrin/kclocknames.S index 9a4ba9d6a46..aed7d28c416 100644 --- a/libc/intrin/kclocknames.S +++ b/libc/intrin/kclocknames.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kClockNames diff --git a/libc/intrin/kdos2errno.S b/libc/intrin/kdos2errno.S index 8d3e824a77b..e753485c4c1 100644 --- a/libc/intrin/kdos2errno.S +++ b/libc/intrin/kdos2errno.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // @fileoverview data structure for __dos2errno() // @see libc/sysv/dos2errno.sh for the numbers diff --git a/libc/intrin/kerrnodocs.S b/libc/intrin/kerrnodocs.S index 5bae4dd56ba..e2947b79a5c 100644 --- a/libc/intrin/kerrnodocs.S +++ b/libc/intrin/kerrnodocs.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kErrnoDocs diff --git a/libc/intrin/kerrnonames.S b/libc/intrin/kerrnonames.S index a79a52a13ec..078a60306f1 100644 --- a/libc/intrin/kerrnonames.S +++ b/libc/intrin/kerrnonames.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e .long \e - kErrnoNames diff --git a/libc/intrin/kfcntlcmds.S b/libc/intrin/kfcntlcmds.S index 6eb1db6e106..6de1f427e04 100644 --- a/libc/intrin/kfcntlcmds.S +++ b/libc/intrin/kfcntlcmds.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kFcntlCmds diff --git a/libc/intrin/kipoptnames.S b/libc/intrin/kipoptnames.S index f2a2ede1f79..b8cd57dc3b3 100644 --- a/libc/intrin/kipoptnames.S +++ b/libc/intrin/kipoptnames.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kIpOptnames diff --git a/libc/intrin/kmonthname.S b/libc/intrin/kmonthname.S index e9a4984d01b..bf47c762245 100644 --- a/libc/intrin/kmonthname.S +++ b/libc/intrin/kmonthname.S @@ -7,7 +7,7 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/macros.internal.h" +#include "libc/macros.h" // extern const char kMonthName[12][10]; .section .rodata,"a",@progbits diff --git a/libc/intrin/kmonthnameshort.S b/libc/intrin/kmonthnameshort.S index 4f1874086af..573f1bc6a8d 100644 --- a/libc/intrin/kmonthnameshort.S +++ b/libc/intrin/kmonthnameshort.S @@ -7,7 +7,7 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/macros.internal.h" +#include "libc/macros.h" // Type #1: // - Indexable C-String Array diff --git a/libc/intrin/kopenflags.S b/libc/intrin/kopenflags.S index bc6691990ad..7927fbacd00 100644 --- a/libc/intrin/kopenflags.S +++ b/libc/intrin/kopenflags.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kOpenFlags diff --git a/libc/intrin/kpollnames.S b/libc/intrin/kpollnames.S index 21e0d4038e5..76fbc4b00b1 100644 --- a/libc/intrin/kpollnames.S +++ b/libc/intrin/kpollnames.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kPollNames diff --git a/libc/intrin/kprintf.greg.c b/libc/intrin/kprintf.greg.c index 21eac26a68b..ee9f6a5399e 100644 --- a/libc/intrin/kprintf.greg.c +++ b/libc/intrin/kprintf.greg.c @@ -53,7 +53,7 @@ #include "libc/stdckdint.h" #include "libc/stdio/sysparam.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/str/utf16.h" #include "libc/sysv/consts/at.h" #include "libc/sysv/consts/f.h" diff --git a/libc/intrin/krlimitnames.S b/libc/intrin/krlimitnames.S index 46c6f5dd105..e7f0e788b8e 100644 --- a/libc/intrin/krlimitnames.S +++ b/libc/intrin/krlimitnames.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kRlimitNames diff --git a/libc/intrin/ksignalnames.S b/libc/intrin/ksignalnames.S index 19ad59e9c37..6dbc09c017f 100644 --- a/libc/intrin/ksignalnames.S +++ b/libc/intrin/ksignalnames.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kSignalNames diff --git a/libc/intrin/ksockoptnames.S b/libc/intrin/ksockoptnames.S index 90d5927881c..4ac81066c8c 100644 --- a/libc/intrin/ksockoptnames.S +++ b/libc/intrin/ksockoptnames.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kSockOptnames diff --git a/libc/intrin/ktcpoptnames.S b/libc/intrin/ktcpoptnames.S index d4ab2fdbeef..314c6b16be4 100644 --- a/libc/intrin/ktcpoptnames.S +++ b/libc/intrin/ktcpoptnames.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .macro .e e s .long \e - kTcpOptnames diff --git a/libc/intrin/kweekdayname.S b/libc/intrin/kweekdayname.S index 0fa2d967c96..835b8bfe930 100644 --- a/libc/intrin/kweekdayname.S +++ b/libc/intrin/kweekdayname.S @@ -7,7 +7,7 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/macros.internal.h" +#include "libc/macros.h" // extern const char kWeekdayName[7][10]; .section .rodata,"a",@progbits diff --git a/libc/intrin/kweekdaynameshort.S b/libc/intrin/kweekdaynameshort.S index 14a37b1bd82..05886838f70 100644 --- a/libc/intrin/kweekdaynameshort.S +++ b/libc/intrin/kweekdaynameshort.S @@ -7,7 +7,7 @@ │ • http://creativecommons.org/publicdomain/zero/1.0/ │ ╚─────────────────────────────────────────────────────────────────*/ #endif -#include "libc/macros.internal.h" +#include "libc/macros.h" // Type #1: // - Indexable C-String Array diff --git a/libc/intrin/leaky.S b/libc/intrin/leaky.S index b9ba43ed2a4..45b034ffd8f 100644 --- a/libc/intrin/leaky.S +++ b/libc/intrin/leaky.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Decentralized section for leaky functions. .section .piro.relo.sort.leaky.1,"aw",@progbits diff --git a/libc/intrin/maps_init.S b/libc/intrin/maps_init.S index 56f2c7f6389..134ed77f77c 100644 --- a/libc/intrin/maps_init.S +++ b/libc/intrin/maps_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.internal.h" +#include "libc/macros.h" .init.start 301,_init_maps push %rdi diff --git a/libc/intrin/mman.greg.c b/libc/intrin/mman.greg.c index 8d7f17449a5..07059f91945 100644 --- a/libc/intrin/mman.greg.c +++ b/libc/intrin/mman.greg.c @@ -36,7 +36,7 @@ #include "libc/assert.h" #include "libc/elf/def.h" #include "libc/elf/struct/phdr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/uart.internal.h" #include "libc/runtime/e820.internal.h" #include "libc/runtime/metalprintf.internal.h" diff --git a/libc/intrin/msync.c b/libc/intrin/msync.c index d3e43e26de2..3d241c7a29b 100644 --- a/libc/intrin/msync.c +++ b/libc/intrin/msync.c @@ -25,7 +25,7 @@ #include "libc/dce.h" #include "libc/intrin/describeflags.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/intrin/packsswb.c b/libc/intrin/packsswb.c index da3fa67b91e..84ae0b712a1 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.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/packuswb.c b/libc/intrin/packuswb.c index 66d9c766f24..c4200a3e81f 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.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/pagesize_init.S b/libc/intrin/pagesize_init.S index 5c1cda3fa79..bb9a8188e83 100644 --- a/libc/intrin/pagesize_init.S +++ b/libc/intrin/pagesize_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.internal.h" +#include "libc/macros.h" .init.start 251,_init_pagesize push %rdi diff --git a/libc/intrin/palignr.c b/libc/intrin/palignr.c index 2f447407635..549d339aae2 100644 --- a/libc/intrin/palignr.c +++ b/libc/intrin/palignr.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/palignr.h" #include "libc/assert.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" /** * Overlaps vectors. diff --git a/libc/intrin/palignrs.S b/libc/intrin/palignrs.S index 9eeee072fa1..6d8b8225f48 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.internal.h" +#include "libc/macros.h" // Jump table for palignr() with non-constexpr immediate parameter. // diff --git a/libc/intrin/pmaddubsw.c b/libc/intrin/pmaddubsw.c index f2bdc9b58ce..9f730f029c2 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.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" /** diff --git a/libc/intrin/printmaps.c b/libc/intrin/printmaps.c index d9eaa32af68..48a84127d39 100644 --- a/libc/intrin/printmaps.c +++ b/libc/intrin/printmaps.c @@ -21,7 +21,7 @@ #include "libc/intrin/describeflags.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/maps.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/memtrack.internal.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/auxv.h" diff --git a/libc/intrin/pthread_atfork_actual.c b/libc/intrin/pthread_atfork_actual.c index 81551720673..505cbdc9672 100644 --- a/libc/intrin/pthread_atfork_actual.c +++ b/libc/intrin/pthread_atfork_actual.c @@ -24,7 +24,7 @@ #include "libc/intrin/atomic.h" #include "libc/intrin/dll.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/proc/proc.internal.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/intrin/pushpop.h b/libc/intrin/pushpop.h index 2f693e54268..17f551ac4c9 100644 --- a/libc/intrin/pushpop.h +++ b/libc/intrin/pushpop.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_BITS_PUSHPOP_H_ #define COSMOPOLITAN_LIBC_BITS_PUSHPOP_H_ #ifdef _COSMO_SOURCE -#include "libc/macros.internal.h" +#include "libc/macros.h" #if !defined(__GNUC__) || defined(__STRICT_ANSI__) || !defined(__x86_64__) || \ !defined(__MNO_RED_ZONE__) diff --git a/libc/intrin/reservefd.c b/libc/intrin/reservefd.c index e751c1dd6e4..84345b23d45 100644 --- a/libc/intrin/reservefd.c +++ b/libc/intrin/reservefd.c @@ -22,7 +22,7 @@ #include "libc/intrin/atomic.h" #include "libc/intrin/cmpxchg.h" #include "libc/intrin/extend.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/memtrack.internal.h" #include "libc/str/str.h" #include "libc/sysv/consts/map.h" diff --git a/libc/intrin/safemacros.h b/libc/intrin/safemacros.h index 443843f3778..8fe6613f4d3 100644 --- a/libc/intrin/safemacros.h +++ b/libc/intrin/safemacros.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_ #define COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" COSMOPOLITAN_C_START_ diff --git a/libc/intrin/sizefmt.c b/libc/intrin/sizefmt.c index a3cb8ea6b27..14e52c9f9a5 100644 --- a/libc/intrin/sizefmt.c +++ b/libc/intrin/sizefmt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/itoa.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" /** * Represents size as readable string. diff --git a/libc/intrin/stackcall.S b/libc/intrin/stackcall.S index 6ad9bc8ec60..6e3658a4779 100644 --- a/libc/intrin/stackcall.S +++ b/libc/intrin/stackcall.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Calls function on different stack. // diff --git a/libc/intrin/stackchkguard.S b/libc/intrin/stackchkguard.S index b78117a5da7..f35484a8e8e 100644 --- a/libc/intrin/stackchkguard.S +++ b/libc/intrin/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.internal.h" +#include "libc/macros.h" // Canary for -fstack-protector. // diff --git a/libc/intrin/strerror.c b/libc/intrin/strerror.c index a465c5c7d14..89110783ed5 100644 --- a/libc/intrin/strerror.c +++ b/libc/intrin/strerror.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/fmt/magnumstrs.internal.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/str/str.h" alignas(1) static char strerror_buf[128]; diff --git a/libc/intrin/sys_sched_yield.S b/libc/intrin/sys_sched_yield.S index eab70951169..2bfaa7ccba3 100644 --- a/libc/intrin/sys_sched_yield.S +++ b/libc/intrin/sys_sched_yield.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/sysv/consts/nr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" // Relinquishes scheduled quantum. // diff --git a/libc/intrin/sys_set_tls.S b/libc/intrin/sys_set_tls.S index e013014b5d6..4f81305212a 100644 --- a/libc/intrin/sys_set_tls.S +++ b/libc/intrin/sys_set_tls.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // we can't allow ftrace here since ftrace needs tls sys_set_tls: diff --git a/libc/intrin/typeinfo.S b/libc/intrin/typeinfo.S index e195c73c3f4..0b35f0f7285 100644 --- a/libc/intrin/typeinfo.S +++ b/libc/intrin/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.internal.h" +#include "libc/macros.h" // __cxxabiv1::__function_type_info (?) // Because Clang in MODE=dbg doesn't respect -fno-rtti diff --git a/libc/irq/acpi-fadt-init.S b/libc/irq/acpi-fadt-init.S index e58410cc3cd..de1038be364 100644 --- a/libc/irq/acpi-fadt-init.S +++ b/libc/irq/acpi-fadt-init.S @@ -26,7 +26,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/irq/acpi.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/pc.internal.h" .init.start 312,_init_acpi_fadt diff --git a/libc/irq/acpi-madt-init.S b/libc/irq/acpi-madt-init.S index 3a3b473d1f7..6bfbddbf528 100644 --- a/libc/irq/acpi-madt-init.S +++ b/libc/irq/acpi-madt-init.S @@ -26,7 +26,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/irq/acpi.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/pc.internal.h" .init.start 311,_init_acpi_madt diff --git a/libc/irq/acpi-xsdt-init.S b/libc/irq/acpi-xsdt-init.S index 2275dc8d36d..98f7db6a306 100644 --- a/libc/irq/acpi-xsdt-init.S +++ b/libc/irq/acpi-xsdt-init.S @@ -26,7 +26,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/irq/acpi.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/pc.internal.h" .init.start 310,_init_acpi_xsdt diff --git a/libc/irq/acpi-xsdt.c b/libc/irq/acpi-xsdt.c index 94dc50a82f2..44c2a6da5be 100644 --- a/libc/irq/acpi-xsdt.c +++ b/libc/irq/acpi-xsdt.c @@ -30,7 +30,7 @@ #include "libc/intrin/kprintf.h" #include "libc/irq/acpi.internal.h" #include "libc/log/color.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/efi.h" #include "libc/runtime/pc.internal.h" #include "libc/serialize.h" diff --git a/libc/iso646.internal.h b/libc/iso646.h similarity index 100% rename from libc/iso646.internal.h rename to libc/iso646.h diff --git a/libc/isystem/complex.h b/libc/isystem/complex.h index bd8c4569b3c..80c28cbf496 100644 --- a/libc/isystem/complex.h +++ b/libc/isystem/complex.h @@ -1,6 +1,6 @@ #ifndef _COMPLEX_H #define _COMPLEX_H #include "libc/complex.h" -#include "libc/imag.internal.h" +#include "libc/imag.h" #include "libc/math.h" #endif /* _COMPLEX_H */ diff --git a/libc/isystem/iso646.h b/libc/isystem/iso646.h index 5d203df5ff8..11e3a77c97c 100644 --- a/libc/isystem/iso646.h +++ b/libc/isystem/iso646.h @@ -1,4 +1,4 @@ #ifndef _ISO646_H #define _ISO646_H -#include "libc/iso646.internal.h" +#include "libc/iso646.h" #endif /* _ISO646_H */ diff --git a/libc/isystem/stdalign.h b/libc/isystem/stdalign.h index 16874814a20..9aeebe101c2 100644 --- a/libc/isystem/stdalign.h +++ b/libc/isystem/stdalign.h @@ -1,4 +1,4 @@ #ifndef _STDALIGN_H #define _STDALIGN_H -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #endif /* _STDALIGN_H */ diff --git a/libc/isystem/tgmath.h b/libc/isystem/tgmath.h index 28d1244863d..8721bb9442e 100644 --- a/libc/isystem/tgmath.h +++ b/libc/isystem/tgmath.h @@ -1,7 +1,7 @@ #ifndef _TGMATH_H #define _TGMATH_H #include "libc/complex.h" -#include "libc/imag.internal.h" +#include "libc/imag.h" #include "libc/math.h" #if __STDC_VERSION__ + 0 >= 201112 diff --git a/libc/log/backtrace3.c b/libc/log/backtrace3.c index a49240bce27..967a31a2bbd 100644 --- a/libc/log/backtrace3.c +++ b/libc/log/backtrace3.c @@ -24,7 +24,7 @@ #include "libc/intrin/kprintf.h" #include "libc/intrin/weaken.h" #include "libc/log/backtrace.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/gc.internal.h" #include "libc/nexgen32e/stackframe.h" #include "libc/runtime/memtrack.internal.h" diff --git a/libc/log/check.h b/libc/log/check.h index f4fda0c015c..fa482304bbb 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.internal.h" +#include "libc/macros.h" COSMOPOLITAN_C_START_ #define CHECK(X, ...) __CHK(ne, !=, false, "false", !!(X), #X, "" __VA_ARGS__) diff --git a/libc/log/countbranch.h b/libc/log/countbranch.h index 403a0c98e5c..7476e7b41f7 100644 --- a/libc/log/countbranch.h +++ b/libc/log/countbranch.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_LOG_COUNTBRANCH_H_ #define COSMOPOLITAN_LIBC_LOG_COUNTBRANCH_H_ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdbool.h" COSMOPOLITAN_C_START_ diff --git a/libc/log/countbranch_data.S b/libc/log/countbranch_data.S index eaf3dc07822..a0063f7a4ce 100644 --- a/libc/log/countbranch_data.S +++ b/libc/log/countbranch_data.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .yoink countbranch_report diff --git a/libc/log/countbranch_report.c b/libc/log/countbranch_report.c index a152dbc0797..2e1c881586d 100644 --- a/libc/log/countbranch_report.c +++ b/libc/log/countbranch_report.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/intrin/kprintf.h" #include "libc/log/countbranch.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/alg.h" #include "libc/runtime/runtime.h" diff --git a/libc/log/countexpr.h b/libc/log/countexpr.h index 51104bcbe33..84e0be7fc64 100644 --- a/libc/log/countexpr.h +++ b/libc/log/countexpr.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_LOG_COUNTEXPR_H_ #define COSMOPOLITAN_LIBC_LOG_COUNTEXPR_H_ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/bench.h" COSMOPOLITAN_C_START_ diff --git a/libc/log/countexpr_data.S b/libc/log/countexpr_data.S index 72db2252fb4..2546e06a167 100644 --- a/libc/log/countexpr_data.S +++ b/libc/log/countexpr_data.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .yoink countexpr_report diff --git a/libc/log/countexpr_report.c b/libc/log/countexpr_report.c index 75be608578d..e8f151d7f1d 100644 --- a/libc/log/countexpr_report.c +++ b/libc/log/countexpr_report.c @@ -21,7 +21,7 @@ #include "libc/intrin/kprintf.h" #include "libc/limits.h" #include "libc/log/countexpr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/runtime/runtime.h" #include "libc/stdckdint.h" diff --git a/libc/log/libfatal.internal.h b/libc/log/libfatal.internal.h index 4c55269c43a..bd10073a11a 100644 --- a/libc/log/libfatal.internal.h +++ b/libc/log/libfatal.internal.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_ #define COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_ -#include "libc/macros.internal.h" +#include "libc/macros.h" COSMOPOLITAN_C_START_ forceinline unsigned long __strlen(const char *s) { diff --git a/libc/log/oncrash_amd64.c b/libc/log/oncrash_amd64.c index e55cfa7e58e..3d174a94779 100644 --- a/libc/log/oncrash_amd64.c +++ b/libc/log/oncrash_amd64.c @@ -41,7 +41,7 @@ #include "libc/log/gdb.h" #include "libc/log/internal.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/alloca.h" #include "libc/nexgen32e/stackframe.h" diff --git a/libc/log/oncrash_arm64.c b/libc/log/oncrash_arm64.c index d22062c71ff..6658a7c84d3 100644 --- a/libc/log/oncrash_arm64.c +++ b/libc/log/oncrash_arm64.c @@ -41,7 +41,7 @@ #include "libc/intrin/kprintf.h" #include "libc/log/internal.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/stackframe.h" #include "libc/runtime/memtrack.internal.h" #include "libc/runtime/runtime.h" diff --git a/libc/log/printwindowsmemory.c b/libc/log/printwindowsmemory.c index ed9a4a14525..a305aae675e 100644 --- a/libc/log/printwindowsmemory.c +++ b/libc/log/printwindowsmemory.c @@ -20,7 +20,7 @@ #include "libc/intrin/describeflags.h" #include "libc/intrin/kprintf.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/memflags.h" #include "libc/nt/memory.h" #include "libc/nt/struct/memorybasicinformation.h" diff --git a/libc/log/showcrashreportsearly.S b/libc/log/showcrashreportsearly.S index 75741426310..dfc41fe19d9 100644 --- a/libc/log/showcrashreportsearly.S +++ b/libc/log/showcrashreportsearly.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Normally we call ShowCrashReports() from main, but if // there's a crash in a constructor, this will help with diff --git a/libc/log/watch-hook.S b/libc/log/watch-hook.S index e73da1dc83f..c8b99ba55dc 100644 --- a/libc/log/watch-hook.S +++ b/libc/log/watch-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.internal.h" +#include "libc/macros.h" __watch_hook: push %rbp diff --git a/libc/mach.internal.h b/libc/mach.h similarity index 100% rename from libc/mach.internal.h rename to libc/mach.h diff --git a/libc/macho.internal.h b/libc/macho.h similarity index 100% rename from libc/macho.internal.h rename to libc/macho.h diff --git a/libc/macros.internal.h b/libc/macros.h similarity index 100% rename from libc/macros.internal.h rename to libc/macros.h diff --git a/libc/mem/aligned_alloc.c b/libc/mem/aligned_alloc.c index 3432bfbc778..27090f73ee4 100644 --- a/libc/mem/aligned_alloc.c +++ b/libc/mem/aligned_alloc.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" /** diff --git a/libc/mem/mergesort.c b/libc/mem/mergesort.c index 400b6dfe36a..b79e67756bb 100644 --- a/libc/mem/mergesort.c +++ b/libc/mem/mergesort.c @@ -28,7 +28,7 @@ │ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF │ │ SUCH DAMAGE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/libc/mem/posix_memalign.c b/libc/mem/posix_memalign.c index 32f9411aabf..4cc5b65cbea 100644 --- a/libc/mem/posix_memalign.c +++ b/libc/mem/posix_memalign.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" /** diff --git a/libc/mem/putenv.c b/libc/mem/putenv.c index 9a096673c05..423b3eb69a9 100644 --- a/libc/mem/putenv.c +++ b/libc/mem/putenv.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/getenv.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/internal.h" #include "libc/mem/leaks.h" #include "libc/mem/mem.h" diff --git a/libc/mem/qsort.c b/libc/mem/qsort.c index 361f26a8672..0a2c1e5504c 100644 --- a/libc/mem/qsort.c +++ b/libc/mem/qsort.c @@ -28,7 +28,7 @@ │ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF │ │ SUCH DAMAGE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/str/str.h" __static_yoink("openbsd_sorting_notice"); diff --git a/libc/mem/tinymalloc.inc b/libc/mem/tinymalloc.inc index f726fcd76b9..450bb3c5e7c 100644 --- a/libc/mem/tinymalloc.inc +++ b/libc/mem/tinymalloc.inc @@ -17,7 +17,7 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/mem/mem.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/stdckdint.h" #include "libc/str/str.h" diff --git a/libc/nexgen32e/argc.S b/libc/nexgen32e/argc.S index 9e85f4409bd..165c05447d1 100644 --- a/libc/nexgen32e/argc.S +++ b/libc/nexgen32e/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.internal.h" +#include "libc/macros.h" .initbss 300,_init_argc // Global variable holding _start(argc) parameter. diff --git a/libc/nexgen32e/argv.S b/libc/nexgen32e/argv.S index 9ee0934764a..7963698c812 100644 --- a/libc/nexgen32e/argv.S +++ b/libc/nexgen32e/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.internal.h" +#include "libc/macros.h" .initbss 300,_init_argv // Global variable holding _start(argv) parameter. diff --git a/libc/nexgen32e/auxv.S b/libc/nexgen32e/auxv.S index e750b74fe5f..52381e1c680 100644 --- a/libc/nexgen32e/auxv.S +++ b/libc/nexgen32e/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.internal.h" +#include "libc/macros.h" .initbss 250,_init_auxv // Global variable holding _start(auxv) parameter. diff --git a/libc/nexgen32e/checkstackalign.S b/libc/nexgen32e/checkstackalign.S index 18d3605076d..abe8dae61e6 100644 --- a/libc/nexgen32e/checkstackalign.S +++ b/libc/nexgen32e/checkstackalign.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Checks that stack is 16-byte aligned. // diff --git a/libc/nexgen32e/djbsort-avx2.S b/libc/nexgen32e/djbsort-avx2.S index 70e24cbdd81..8f51d678e86 100644 --- a/libc/nexgen32e/djbsort-avx2.S +++ b/libc/nexgen32e/djbsort-avx2.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" // D.J. Bernstein's outrageously fast integer sorting algorithm. // diff --git a/libc/nexgen32e/environ.S b/libc/nexgen32e/environ.S index d1419a52c79..dc3cb2d34d8 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.internal.h" +#include "libc/macros.h" // Environment variable pointer list. .bss diff --git a/libc/nexgen32e/gc.S b/libc/nexgen32e/gc.S index 6b60ae2402d..4fb1ebff5b3 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.internal.h" +#include "libc/macros.h" #include "libc/dce.h" nop diff --git a/libc/nexgen32e/gclongjmp.S b/libc/nexgen32e/gclongjmp.S index 1fb68131b4f..88f534e1047 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.internal.h" +#include "libc/macros.h" // Jumps up stack to previous setjmp() invocation. // diff --git a/libc/nexgen32e/identity.S b/libc/nexgen32e/identity.S index 7fc23e4d820..804b65bda86 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.internal.h" +#include "libc/macros.h" // The identity() function. // @return first argument diff --git a/libc/nexgen32e/kbase36.c b/libc/nexgen32e/kbase36.c index 8a105da1cab..d490a966bd7 100644 --- a/libc/nexgen32e/kbase36.c +++ b/libc/nexgen32e/kbase36.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/stdalign.internal.h" -#include "libc/str/tab.internal.h" +#include "libc/stdalign.h" +#include "libc/str/tab.h" alignas(uint8_t) const uint8_t kBase36[256] = { ['0'] = 1, // diff --git a/libc/nexgen32e/kcp437.S b/libc/nexgen32e/kcp437.S index 084313d8e8c..36f5bf28d9a 100644 --- a/libc/nexgen32e/kcp437.S +++ b/libc/nexgen32e/kcp437.S @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/str/tab.internal.h" -#include "libc/macros.internal.h" +#include "libc/str/tab.h" +#include "libc/macros.h" .rodata .balign 2 diff --git a/libc/nexgen32e/kcpuids.S b/libc/nexgen32e/kcpuids.S index adc6ef5d1dc..6cb2f124821 100644 --- a/libc/nexgen32e/kcpuids.S +++ b/libc/nexgen32e/kcpuids.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/pc.internal.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/kcpuids.h" #include "libc/nexgen32e/x86feature.h" diff --git a/libc/nexgen32e/khalfcache3.S b/libc/nexgen32e/khalfcache3.S index 2d53f71674e..b6e6c7a3b89 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.internal.h" +#include "libc/macros.h" #ifdef __x86_64__ diff --git a/libc/nexgen32e/ksha256.S b/libc/nexgen32e/ksha256.S index 0df26986e12..58056ee475c 100644 --- a/libc/nexgen32e/ksha256.S +++ b/libc/nexgen32e/ksha256.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .rodata .balign 64 diff --git a/libc/nexgen32e/ksha512.S b/libc/nexgen32e/ksha512.S index 1d9450a8c00..f039aa0c284 100644 --- a/libc/nexgen32e/ksha512.S +++ b/libc/nexgen32e/ksha512.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .rodata .balign 64 diff --git a/libc/nexgen32e/ktensindex.S b/libc/nexgen32e/ktensindex.S index 0840a17db6b..7d9081c0cee 100644 --- a/libc/nexgen32e/ktensindex.S +++ b/libc/nexgen32e/ktensindex.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .rodata kTensIndex: diff --git a/libc/nexgen32e/ktolower.c b/libc/nexgen32e/ktolower.c index db169897e60..40bf0127c16 100644 --- a/libc/nexgen32e/ktolower.c +++ b/libc/nexgen32e/ktolower.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/stdalign.internal.h" -#include "libc/str/tab.internal.h" +#include "libc/stdalign.h" +#include "libc/str/tab.h" alignas(uint8_t) const uint8_t kToLower[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, diff --git a/libc/nexgen32e/ktoupper.c b/libc/nexgen32e/ktoupper.c index 86e688a851f..4c57cda9ba9 100644 --- a/libc/nexgen32e/ktoupper.c +++ b/libc/nexgen32e/ktoupper.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/stdalign.internal.h" -#include "libc/str/tab.internal.h" +#include "libc/stdalign.h" +#include "libc/str/tab.h" alignas(uint8_t) const uint8_t kToUpper[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, diff --git a/libc/nexgen32e/longjmp.S b/libc/nexgen32e/longjmp.S index 985a2d657d3..aa4e0cfc7b4 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.internal.h" +#include "libc/macros.h" // Loads previously saved processor state. // diff --git a/libc/nexgen32e/mcount.S b/libc/nexgen32e/mcount.S index 27076f1f6e6..f95b46ceee0 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.internal.h" +#include "libc/macros.h" // Function Profiling Hook. // cc -pg adds this to the start of global functions. diff --git a/libc/nexgen32e/mul4x4adx.S b/libc/nexgen32e/mul4x4adx.S index 67d7f721696..55643f75a80 100644 --- a/libc/nexgen32e/mul4x4adx.S +++ b/libc/nexgen32e/mul4x4adx.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Computes 512-bit product of 256-bit and 256-bit numbers. // diff --git a/libc/nexgen32e/mul6x6adx.S b/libc/nexgen32e/mul6x6adx.S index e0213a389fb..204bb4444c2 100644 --- a/libc/nexgen32e/mul6x6adx.S +++ b/libc/nexgen32e/mul6x6adx.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Computes 768-bit product of 384-bit and 384-bit numbers. // diff --git a/libc/nexgen32e/mul8x8adx.S b/libc/nexgen32e/mul8x8adx.S index f83450d224a..d4eeb026946 100644 --- a/libc/nexgen32e/mul8x8adx.S +++ b/libc/nexgen32e/mul8x8adx.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Computes 1024-bit product of 512-bit and 512-bit numbers. // diff --git a/libc/nexgen32e/nt2sysv.S b/libc/nexgen32e/nt2sysv.S index ca9d87c19d0..e4461d1bb82 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.internal.h" +#include "libc/macros.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 a5cd491d688..ab82db0b5f4 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.internal.h" +#include "libc/macros.h" .initbss 300,_init_program_invocation_name // Supplies argv[0] the GNU way. diff --git a/libc/nexgen32e/rldecode.S b/libc/nexgen32e/rldecode.S index 06fcba57e1d..74d150faf06 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.internal.h" +#include "libc/macros.h" .text.startup // Thirteen byte decompressor. diff --git a/libc/nexgen32e/setjmp.S b/libc/nexgen32e/setjmp.S index 0dfac7df981..7f795ed4a96 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.internal.h" +#include "libc/macros.h" // Saves cpu state. // diff --git a/libc/nexgen32e/sha1.S b/libc/nexgen32e/sha1.S index 1016c0498ff..34ecfd2fefc 100644 --- a/libc/nexgen32e/sha1.S +++ b/libc/nexgen32e/sha1.S @@ -31,7 +31,7 @@ │ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .section .notice,"aR",@progbits .asciz "\n\n\ diff --git a/libc/nexgen32e/sha1ni.S b/libc/nexgen32e/sha1ni.S index 223f5f25ddd..cfbc9f7bd9d 100644 --- a/libc/nexgen32e/sha1ni.S +++ b/libc/nexgen32e/sha1ni.S @@ -31,7 +31,7 @@ │ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .section .notice,"aR",@progbits .asciz "\n\n\ diff --git a/libc/nexgen32e/sha256.S b/libc/nexgen32e/sha256.S index df175bf5b06..fd5e420305d 100644 --- a/libc/nexgen32e/sha256.S +++ b/libc/nexgen32e/sha256.S @@ -47,7 +47,7 @@ ///////////////////////////////////////////////////////////////////////// // This code schedules 2 blocks at a time, with 4 lanes per block ///////////////////////////////////////////////////////////////////////// -#include "libc/macros.internal.h" +#include "libc/macros.h" .section .notice,"aR",@progbits .asciz "\n\n\ diff --git a/libc/nexgen32e/sha256ni.S b/libc/nexgen32e/sha256ni.S index eb020d70626..7365248221f 100644 --- a/libc/nexgen32e/sha256ni.S +++ b/libc/nexgen32e/sha256ni.S @@ -31,7 +31,7 @@ │ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .section .notice,"aR",@progbits .asciz "\n\n\ diff --git a/libc/nexgen32e/sha512.S b/libc/nexgen32e/sha512.S index 6e36d6d1b64..34f7c5fbbcb 100644 --- a/libc/nexgen32e/sha512.S +++ b/libc/nexgen32e/sha512.S @@ -48,7 +48,7 @@ ///////////////////////////////////////////////////////////////////////// // This code schedules 1 blocks at a time, with 4 lanes per block ///////////////////////////////////////////////////////////////////////// -#include "libc/macros.internal.h" +#include "libc/macros.h" .section .notice,"aR",@progbits .asciz "\n\n\ diff --git a/libc/nexgen32e/xmm.S b/libc/nexgen32e/xmm.S index ef3658a2b36..e944d62537f 100644 --- a/libc/nexgen32e/xmm.S +++ b/libc/nexgen32e/xmm.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .privileged __xmm_save: diff --git a/libc/nexgen32e/zip.S b/libc/nexgen32e/zip.S index 313f84e2dff..b15142f0604 100644 --- a/libc/nexgen32e/zip.S +++ b/libc/nexgen32e/zip.S @@ -16,9 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "ape/relocations.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" .section .zip.eocd,"",@progbits // ZIP End Of Central Directory (EOCD) record. diff --git a/libc/nt/ntdllimport.S b/libc/nt/ntdllimport.S index b84411560c9..438f340f97a 100644 --- a/libc/nt/ntdllimport.S +++ b/libc/nt/ntdllimport.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nt/enum/status.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #ifdef __x86_64__ // @fileoverview NTDLL.DLL Non-Mandatory Importer diff --git a/libc/nt/ntdllimport.h b/libc/nt/ntdllimport.h index 6eb8e93f6f7..657ed05eae1 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.internal.h" +#include "libc/macros.h" #ifdef __ASSEMBLER__ /* clang-format off */ diff --git a/libc/proc/cocmd.c b/libc/proc/cocmd.c index 4632ab559c8..5345b13b85a 100644 --- a/libc/proc/cocmd.c +++ b/libc/proc/cocmd.c @@ -29,7 +29,7 @@ #include "libc/intrin/getenv.h" #include "libc/intrin/weaken.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/serialize.h" #include "libc/stdio/stdio.h" diff --git a/libc/proc/fork-nt.c b/libc/proc/fork-nt.c index 19a22a16e5f..996aff0fa00 100644 --- a/libc/proc/fork-nt.c +++ b/libc/proc/fork-nt.c @@ -32,7 +32,7 @@ #include "libc/intrin/strace.h" #include "libc/intrin/tree.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" #include "libc/nt/enum/creationdisposition.h" diff --git a/libc/proc/nice.c b/libc/proc/nice.c index 783ed49361d..de243b93ce9 100644 --- a/libc/proc/nice.c +++ b/libc/proc/nice.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/fmt/conv.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/prio.h" static int clamp(int p) { diff --git a/libc/proc/posix_spawnattr_getrlimit.c b/libc/proc/posix_spawnattr_getrlimit.c index 941e4088920..cc226599843 100644 --- a/libc/proc/posix_spawnattr_getrlimit.c +++ b/libc/proc/posix_spawnattr_getrlimit.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/rlimit.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/proc/posix_spawn.h" #include "libc/proc/posix_spawn.internal.h" #include "libc/stdio/sysparam.h" diff --git a/libc/proc/posix_spawnattr_setrlimit.c b/libc/proc/posix_spawnattr_setrlimit.c index 0d0a7970b1a..dd15a74ec07 100644 --- a/libc/proc/posix_spawnattr_setrlimit.c +++ b/libc/proc/posix_spawnattr_setrlimit.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/rlimit.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/proc/posix_spawn.h" #include "libc/proc/posix_spawn.internal.h" #include "libc/sysv/consts/rlim.h" diff --git a/libc/proc/vfork.S b/libc/proc/vfork.S index 39d7ae6e2af..e9b7911278f 100644 --- a/libc/proc/vfork.S +++ b/libc/proc/vfork.S @@ -19,7 +19,7 @@ #include "libc/dce.h" #include "libc/intrin/strace.h" #include "libc/thread/tls.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" // Forks process without copying page tables. // diff --git a/libc/runtime/at_quick_exit.c b/libc/runtime/at_quick_exit.c index 4786d801bc0..26c1c86afd9 100644 --- a/libc/runtime/at_quick_exit.c +++ b/libc/runtime/at_quick_exit.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/atomic.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/thread/thread.h" diff --git a/libc/runtime/clone-linux.S b/libc/runtime/clone-linux.S index 2863daac846..8ac10c89bba 100644 --- a/libc/runtime/clone-linux.S +++ b/libc/runtime/clone-linux.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .privileged // Invokes clone() system call on GNU/Systemd. diff --git a/libc/runtime/clone-openbsd.S b/libc/runtime/clone-openbsd.S index a1a9feb78d4..daa3cde0c3c 100644 --- a/libc/runtime/clone-openbsd.S +++ b/libc/runtime/clone-openbsd.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #define SYS___tfork 8 diff --git a/libc/runtime/clone-xnu.S b/libc/runtime/clone-xnu.S index fea63d203e7..66b1c4283d5 100644 --- a/libc/runtime/clone-xnu.S +++ b/libc/runtime/clone-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.internal.h" +#include "libc/macros.h" sys_clone_xnu: mov $0x02000168,%eax # bsdthread_create diff --git a/libc/runtime/clone.c b/libc/runtime/clone.c index a1918a1c7cd..3f2f822dd6c 100644 --- a/libc/runtime/clone.c +++ b/libc/runtime/clone.c @@ -32,7 +32,7 @@ #include "libc/intrin/ulock.h" #include "libc/intrin/weaken.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alloca.h" #include "libc/nt/enum/processcreationflags.h" #include "libc/nt/runtime.h" @@ -45,7 +45,7 @@ #include "libc/runtime/stack.h" #include "libc/runtime/syslib.internal.h" #include "libc/sock/internal.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/stdio/sysparam.h" #include "libc/str/str.h" #include "libc/sysv/consts/arch.h" diff --git a/libc/runtime/cosmo.S b/libc/runtime/cosmo.S index 07b6c459f03..0b52e57d6c2 100644 --- a/libc/runtime/cosmo.S +++ b/libc/runtime/cosmo.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/prot.h" #include "libc/sysv/consts/map.h" #include "libc/intrin/strace.h" diff --git a/libc/runtime/cosmo2.c b/libc/runtime/cosmo2.c index ccd926192dc..d2a80c66ed1 100644 --- a/libc/runtime/cosmo2.c +++ b/libc/runtime/cosmo2.c @@ -24,7 +24,7 @@ #include "libc/intrin/maps.h" #include "libc/intrin/strace.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/runtime/internal.h" #include "libc/runtime/memtrack.internal.h" diff --git a/libc/runtime/efimain.greg.c b/libc/runtime/efimain.greg.c index 4ecda0ecaaa..33aefcb21ce 100644 --- a/libc/runtime/efimain.greg.c +++ b/libc/runtime/efimain.greg.c @@ -21,7 +21,7 @@ #include "libc/dce.h" #include "libc/intrin/newbie.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/efi.h" #include "libc/nt/thunk/msabi.h" #include "libc/runtime/e820.internal.h" diff --git a/libc/runtime/efipostboot.S b/libc/runtime/efipostboot.S index 4a2f715de86..6b3561562e4 100644 --- a/libc/runtime/efipostboot.S +++ b/libc/runtime/efipostboot.S @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "ape/relocations.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/pc.internal.h" .real diff --git a/libc/runtime/enable_tls.c b/libc/runtime/enable_tls.c index fb94950ff58..3fc35201e40 100644 --- a/libc/runtime/enable_tls.c +++ b/libc/runtime/enable_tls.c @@ -26,7 +26,7 @@ #include "libc/intrin/kprintf.h" #include "libc/intrin/maps.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/files.h" #include "libc/nt/process.h" #include "libc/nt/runtime.h" @@ -35,7 +35,7 @@ #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" #include "libc/runtime/syslib.internal.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/str/locale.h" #include "libc/str/locale.internal.h" #include "libc/str/str.h" diff --git a/libc/runtime/findcombinary.c b/libc/runtime/findcombinary.c index 4c00844561b..bc2214f8bec 100644 --- a/libc/runtime/findcombinary.c +++ b/libc/runtime/findcombinary.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" #include "libc/sysv/consts/auxv.h" diff --git a/libc/runtime/fpreset.S b/libc/runtime/fpreset.S index 1a130ae1812..ec817a942a9 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.internal.h" +#include "libc/macros.h" // Re-initializes FPU. .ftrace1 diff --git a/libc/runtime/ftrace-hook.S b/libc/runtime/ftrace-hook.S index 9340d7f7374..3878c506dad 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.internal.h" +#include "libc/macros.h" .privileged ftrace_hook: diff --git a/libc/runtime/ftracer.c b/libc/runtime/ftracer.c index d2e686d3b15..ca09b1d5ac1 100644 --- a/libc/runtime/ftracer.c +++ b/libc/runtime/ftracer.c @@ -21,7 +21,7 @@ #include "libc/fmt/itoa.h" #include "libc/intrin/cmpxchg.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/stackframe.h" #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" diff --git a/libc/runtime/getargmax.c b/libc/runtime/getargmax.c index 37ce64c8375..a94a3fa7c09 100644 --- a/libc/runtime/getargmax.c +++ b/libc/runtime/getargmax.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/stdio/sysparam.h" #include "libc/sysv/consts/_posix.h" diff --git a/libc/runtime/getinterpreterexecutablename.c b/libc/runtime/getinterpreterexecutablename.c index 6a93514d09b..ba4069ccb75 100644 --- a/libc/runtime/getinterpreterexecutablename.c +++ b/libc/runtime/getinterpreterexecutablename.c @@ -20,7 +20,7 @@ #include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" #include "libc/sysv/consts/at.h" diff --git a/libc/runtime/getlogin.c b/libc/runtime/getlogin.c index 73b8dec591b..72f92bbb638 100644 --- a/libc/runtime/getlogin.c +++ b/libc/runtime/getlogin.c @@ -19,7 +19,7 @@ #include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/accounting.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/runtime/getlogin_r.c b/libc/runtime/getlogin_r.c index 4b2311b071f..53950be9ac5 100644 --- a/libc/runtime/getlogin_r.c +++ b/libc/runtime/getlogin_r.c @@ -19,7 +19,7 @@ #include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/accounting.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/runtime/getresourcelimit.c b/libc/runtime/getresourcelimit.c index d68b256b3a0..48e10be8e66 100644 --- a/libc/runtime/getresourcelimit.c +++ b/libc/runtime/getresourcelimit.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/rlimit.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/rlim.h" long __get_rlimit(int resource) { diff --git a/libc/runtime/getsymboltable.c b/libc/runtime/getsymboltable.c index c3ad9552c50..3ee47d5a38d 100644 --- a/libc/runtime/getsymboltable.c +++ b/libc/runtime/getsymboltable.c @@ -23,14 +23,14 @@ #include "libc/intrin/promises.h" #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" #include "libc/runtime/symbols.internal.h" #include "libc/runtime/zipos.internal.h" #include "libc/str/str.h" #include "libc/x/x.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "third_party/puff/puff.h" __static_yoink("__get_symbol"); diff --git a/libc/runtime/grow.c b/libc/runtime/grow.c index 1b865d499f2..27564d3c468 100644 --- a/libc/runtime/grow.c +++ b/libc/runtime/grow.c @@ -20,7 +20,7 @@ #include "libc/assert.h" #include "libc/fmt/conv.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/stdckdint.h" diff --git a/libc/runtime/hook.greg.c b/libc/runtime/hook.greg.c index 16596bf6a96..d736eade277 100644 --- a/libc/runtime/hook.greg.c +++ b/libc/runtime/hook.greg.c @@ -19,7 +19,7 @@ #include "ape/sections.internal.h" #include "libc/calls/struct/sigset.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/runtime/symbols.internal.h" diff --git a/libc/runtime/inflate.c b/libc/runtime/inflate.c index c7a82fa0be8..f3264a3fe1e 100644 --- a/libc/runtime/inflate.c +++ b/libc/runtime/inflate.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" #include "third_party/puff/puff.h" diff --git a/libc/runtime/init.S b/libc/runtime/init.S index a3922476b26..1cf5e035bce 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.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/prot.h" #include "libc/dce.h" @@ -42,7 +42,7 @@ // @param r15 is envp (still callee saved) // @note rdi is __init_bss_start (callee monotonic lockstep) // @note rsi is __init_rodata_start (callee monotonic lockstep) -// @see .init.start & .init.end (libc/macros.internal.h) +// @see .init.start & .init.end (libc/macros.h) // @see ape/ape.lds .section .initprologue,"ax",@progbits .type _init,@function @@ -86,7 +86,7 @@ _init_check_rdi_rsi: // Decentralized section for packed data structures & initializers. // -// @see .initro (libc/macros.internal.h) +// @see .initro (libc/macros.h) // @see ape/ape.lds .section .initroprologue,"a",@progbits .type __init_rodata_start,@object @@ -110,7 +110,7 @@ __init_rodata_end: // // Data in this section becomes read-only after initialization. // -// @see .piro.bss.init (libc/macros.internal.h) +// @see .piro.bss.init (libc/macros.h) // @see libc/runtime/piro.c // @see ape/ape.lds .section .piro.bss.init.1,"aw",@nobits diff --git a/libc/runtime/isstackoverflow.c b/libc/runtime/isstackoverflow.c index cb1068a9c8d..35c646dd992 100644 --- a/libc/runtime/isstackoverflow.c +++ b/libc/runtime/isstackoverflow.c @@ -19,7 +19,7 @@ #include "libc/calls/struct/siginfo.h" #include "libc/calls/struct/ucontext.internal.h" #include "libc/calls/ucontext.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/auxv.h" #include "libc/sysv/consts/sig.h" diff --git a/libc/runtime/opensymboltable.greg.c b/libc/runtime/opensymboltable.greg.c index 2a54eb7b672..5da44f023b0 100644 --- a/libc/runtime/opensymboltable.greg.c +++ b/libc/runtime/opensymboltable.greg.c @@ -25,7 +25,7 @@ #include "libc/intrin/strace.h" #include "libc/limits.h" #include "libc/log/libfatal.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" diff --git a/libc/runtime/progname.S b/libc/runtime/progname.S index c2f807dcc2d..e98f0fb3c4a 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.internal.h" +#include "libc/macros.h" // Provides argv[0] The BSD Way. .initbss 300,_init___progname diff --git a/libc/runtime/sigsetjmp.S b/libc/runtime/sigsetjmp.S index 98598bd50cc..1ef838ccef2 100644 --- a/libc/runtime/sigsetjmp.S +++ b/libc/runtime/sigsetjmp.S @@ -25,7 +25,7 @@ │ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Saves caller CPU state and signal mask. // diff --git a/libc/runtime/sysconf.c b/libc/runtime/sysconf.c index f0c32dd90f2..17ff15c548d 100644 --- a/libc/runtime/sysconf.c +++ b/libc/runtime/sysconf.c @@ -24,7 +24,7 @@ #include "libc/dce.h" #include "libc/intrin/maps.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/clktck.h" #include "libc/runtime/runtime.h" #include "libc/runtime/sysconf.h" diff --git a/libc/runtime/valist.c b/libc/runtime/valist.c index 47294559bd7..b996e2732ee 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.internal.h" +#include "libc/macros.h" /* */ struct __va_list { diff --git a/libc/runtime/winmain.greg.c b/libc/runtime/winmain.greg.c index 6ecbaa16d23..5bf3318797a 100644 --- a/libc/runtime/winmain.greg.c +++ b/libc/runtime/winmain.greg.c @@ -26,7 +26,7 @@ #include "libc/intrin/nomultics.h" #include "libc/intrin/weaken.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/nt/accounting.h" #include "libc/nt/console.h" diff --git a/libc/runtime/zipos-access.c b/libc/runtime/zipos-access.c index 291000d2777..eb3807b0fc3 100644 --- a/libc/runtime/zipos-access.c +++ b/libc/runtime/zipos-access.c @@ -22,7 +22,7 @@ #include "libc/sysv/consts/ok.h" #include "libc/sysv/consts/s.h" #include "libc/sysv/errfuns.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" // TODO: this should check parent directory components diff --git a/libc/runtime/zipos-find.c b/libc/runtime/zipos-find.c index 2fc30d44237..15443064eb3 100644 --- a/libc/runtime/zipos-find.c +++ b/libc/runtime/zipos-find.c @@ -17,12 +17,12 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/zipos.internal.h" #include "libc/str/str.h" #include "libc/sysv/consts/s.h" #include "libc/sysv/errfuns.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" static ssize_t __zipos_match(struct Zipos *z, struct ZiposUri *name, int len, int i) { diff --git a/libc/runtime/zipos-get.c b/libc/runtime/zipos-get.c index e97918d1414..55660e28547 100644 --- a/libc/runtime/zipos-get.c +++ b/libc/runtime/zipos-get.c @@ -26,7 +26,7 @@ #include "libc/intrin/cmpxchg.h" #include "libc/intrin/promises.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/runtime/runtime.h" #include "libc/runtime/zipos.internal.h" @@ -38,7 +38,7 @@ #include "libc/sysv/consts/posix.h" #include "libc/sysv/consts/prot.h" #include "libc/thread/thread.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #ifdef __x86_64__ __static_yoink(APE_COM_NAME); diff --git a/libc/runtime/zipos-inode.c b/libc/runtime/zipos-inode.c index c4f26ae27a3..480d999c482 100644 --- a/libc/runtime/zipos-inode.c +++ b/libc/runtime/zipos-inode.c @@ -21,7 +21,7 @@ #include "libc/runtime/zipos.internal.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" uint64_t __zipos_inode(struct Zipos *zipos, int64_t cfile, // const void *name, size_t namelen) { diff --git a/libc/runtime/zipos-mmap.c b/libc/runtime/zipos-mmap.c index d2551ed3d4d..d137d372d69 100644 --- a/libc/runtime/zipos-mmap.c +++ b/libc/runtime/zipos-mmap.c @@ -29,7 +29,7 @@ #include "libc/sysv/consts/prot.h" #include "libc/sysv/consts/s.h" #include "libc/sysv/errfuns.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #define IP(X) (intptr_t)(X) #define VIP(X) (void *)IP(X) diff --git a/libc/runtime/zipos-open.c b/libc/runtime/zipos-open.c index 46707b1796c..af01a567ce3 100644 --- a/libc/runtime/zipos-open.c +++ b/libc/runtime/zipos-open.c @@ -37,7 +37,7 @@ #include "libc/sysv/consts/prot.h" #include "libc/sysv/consts/s.h" #include "libc/sysv/errfuns.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" struct ZiposHandle *__zipos_keep(struct ZiposHandle *h) { atomic_fetch_add_explicit(&h->refs, 1, memory_order_relaxed); diff --git a/libc/runtime/zipos-read.c b/libc/runtime/zipos-read.c index 8fae44da4ff..9b90c987b96 100644 --- a/libc/runtime/zipos-read.c +++ b/libc/runtime/zipos-read.c @@ -27,7 +27,7 @@ #include "libc/sysv/consts/s.h" #include "libc/sysv/errfuns.h" #include "libc/thread/tls.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" static ssize_t __zipos_read_impl(struct ZiposHandle *h, const struct iovec *iov, size_t iovlen, ssize_t opt_offset) { diff --git a/libc/runtime/zipos-stat-impl.c b/libc/runtime/zipos-stat-impl.c index ff0a4b316c1..ef47bb2073b 100644 --- a/libc/runtime/zipos-stat-impl.c +++ b/libc/runtime/zipos-stat-impl.c @@ -24,7 +24,7 @@ #include "libc/runtime/zipos.internal.h" #include "libc/str/str.h" #include "libc/sysv/consts/s.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" int __zipos_stat_impl(struct Zipos *zipos, size_t cf, struct stat *st) { size_t lf; diff --git a/libc/runtime/zipos.S b/libc/runtime/zipos.S index 507db9efe84..df0ba39ff2f 100644 --- a/libc/runtime/zipos.S +++ b/libc/runtime/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.internal.h" +#include "libc/macros.h" // static_yoink this symbol for open(/zip/...) support. zipos = 0 diff --git a/libc/sock/epoll.c b/libc/sock/epoll.c index 818ddf19e8b..c5d809150cb 100644 --- a/libc/sock/epoll.c +++ b/libc/sock/epoll.c @@ -43,7 +43,7 @@ #include "libc/errno.h" #include "libc/intrin/strace.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nt/enum/accessmask.h" #include "libc/nt/enum/afd.h" diff --git a/libc/sock/gethostips.c b/libc/sock/gethostips.c index 0e956c1b0ae..6a1234f0be9 100644 --- a/libc/sock/gethostips.c +++ b/libc/sock/gethostips.c @@ -20,7 +20,7 @@ #include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nt/errors.h" #include "libc/nt/iphlpapi.h" diff --git a/libc/sock/inet_pton.c b/libc/sock/inet_pton.c index dd226eaaeb2..8ad1bbd2474 100644 --- a/libc/sock/inet_pton.c +++ b/libc/sock/inet_pton.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/ctype.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" #include "libc/sysv/consts/af.h" diff --git a/libc/sock/iovec2nt.c b/libc/sock/iovec2nt.c index cba7dce6be1..b433e9dbe26 100644 --- a/libc/sock/iovec2nt.c +++ b/libc/sock/iovec2nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/iovec.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sock/internal.h" #include "libc/sysv/consts/iov.h" diff --git a/libc/sock/send.c b/libc/sock/send.c index 4d9df49adc0..4050a2fba91 100644 --- a/libc/sock/send.c +++ b/libc/sock/send.c @@ -22,7 +22,7 @@ #include "libc/calls/struct/iovec.internal.h" #include "libc/dce.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" #include "libc/sysv/errfuns.h" diff --git a/libc/sock/sendto.c b/libc/sock/sendto.c index 803e48fa08a..b533fdc3ef0 100644 --- a/libc/sock/sendto.c +++ b/libc/sock/sendto.c @@ -23,7 +23,7 @@ #include "libc/calls/struct/iovec.internal.h" #include "libc/dce.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" #include "libc/sock/struct/sockaddr.h" diff --git a/libc/sock/sockaddr.c b/libc/sock/sockaddr.c index f72f664ac3c..36973bde32a 100644 --- a/libc/sock/sockaddr.c +++ b/libc/sock/sockaddr.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/sock/struct/sockaddr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sock/sock.h" #include "libc/sock/struct/sockaddr.h" #include "libc/sock/struct/sockaddr.internal.h" diff --git a/libc/sock/sockaddr2linux.c b/libc/sock/sockaddr2linux.c index 69efdb9f1ba..26fd4e0f476 100644 --- a/libc/sock/sockaddr2linux.c +++ b/libc/sock/sockaddr2linux.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sock/internal.h" #include "libc/sock/struct/sockaddr.internal.h" #include "libc/sock/struct/sockaddr6-bsd.internal.h" diff --git a/libc/sock/sockdebug.c b/libc/sock/sockdebug.c index fd98aeb30fc..d26bc3a4b82 100644 --- a/libc/sock/sockdebug.c +++ b/libc/sock/sockdebug.c @@ -19,7 +19,7 @@ #include "libc/errno.h" #include "libc/fmt/itoa.h" #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sock/sock.h" #include "libc/sock/struct/sockaddr.h" #include "libc/sock/struct/sockaddr6.h" diff --git a/libc/sock/sys_sendfile_freebsd.S b/libc/sock/sys_sendfile_freebsd.S index 6e7a973349f..a8443b42b1f 100644 --- a/libc/sock/sys_sendfile_freebsd.S +++ b/libc/sock/sys_sendfile_freebsd.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" sys_sendfile_freebsd: jmp sys_sendfile diff --git a/libc/sock/sys_sendfile_xnu.S b/libc/sock/sys_sendfile_xnu.S index 99d28b1e4ff..ca04c39a7c5 100644 --- a/libc/sock/sys_sendfile_xnu.S +++ b/libc/sock/sys_sendfile_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.internal.h" +#include "libc/macros.h" sys_sendfile_xnu: jmp sys_sendfile diff --git a/libc/stdalign.internal.h b/libc/stdalign.h similarity index 52% rename from libc/stdalign.internal.h rename to libc/stdalign.h index 9b4d39de4c1..293b337997d 100644 --- a/libc/stdalign.internal.h +++ b/libc/stdalign.h @@ -1,5 +1,5 @@ -#ifndef COSMOPOLITAN_LIBC_STDALIGN_INTERNAL_H_ -#define COSMOPOLITAN_LIBC_STDALIGN_INTERNAL_H_ +#ifndef COSMOPOLITAN_LIBC_STDALIGN_H_ +#define COSMOPOLITAN_LIBC_STDALIGN_H_ #ifndef __cplusplus #define alignas _Alignas @@ -9,4 +9,4 @@ #define __alignas_is_defined 1 #define __alignof_is_defined 1 -#endif /* COSMOPOLITAN_LIBC_STDALIGN_INTERNAL_H_ */ +#endif /* COSMOPOLITAN_LIBC_STDALIGN_H_ */ diff --git a/libc/stdio/appendd.c b/libc/stdio/appendd.c index 409f5d55004..025a67055b9 100644 --- a/libc/stdio/appendd.c +++ b/libc/stdio/appendd.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/stdio/append.h" #include "libc/str/str.h" diff --git a/libc/stdio/appendr.c b/libc/stdio/appendr.c index d5554531a8d..fbe47be037d 100644 --- a/libc/stdio/appendr.c +++ b/libc/stdio/appendr.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/dce.h" #include "libc/intrin/bsr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/stdio/append.h" #include "libc/str/str.h" diff --git a/libc/stdio/appendw.c b/libc/stdio/appendw.c index 9c90ff6d0d9..ffff19be924 100644 --- a/libc/stdio/appendw.c +++ b/libc/stdio/appendw.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/dce.h" #include "libc/intrin/bsr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/serialize.h" #include "libc/stdio/append.h" diff --git a/libc/stdio/dirstream.c b/libc/stdio/dirstream.c index 215eb90937b..ef11b674b42 100644 --- a/libc/stdio/dirstream.c +++ b/libc/stdio/dirstream.c @@ -29,7 +29,7 @@ #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/critbit0.h" #include "libc/mem/mem.h" #include "libc/nt/createfile.h" @@ -51,7 +51,7 @@ #include "libc/sysv/errfuns.h" #include "libc/thread/thread.h" #include "libc/thread/tls.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * @fileoverview Directory Streams for Linux+Mac+Windows+FreeBSD+OpenBSD. diff --git a/libc/stdio/dumphexc.c b/libc/stdio/dumphexc.c index 3bf900cb64c..90bab43eb18 100644 --- a/libc/stdio/dumphexc.c +++ b/libc/stdio/dumphexc.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/stdio/append.h" #include "libc/stdio/hex.internal.h" diff --git a/libc/stdio/fgets_unlocked.c b/libc/stdio/fgets_unlocked.c index 9fb38e00c6f..0210dc82940 100644 --- a/libc/stdio/fgets_unlocked.c +++ b/libc/stdio/fgets_unlocked.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/libc/stdio/fmt.c b/libc/stdio/fmt.c index e52bfaf7c30..5ef9b42092a 100644 --- a/libc/stdio/fmt.c +++ b/libc/stdio/fmt.c @@ -49,7 +49,7 @@ #include "libc/intrin/nomultics.h" #include "libc/intrin/safemacros.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/mem/reverse.internal.h" @@ -57,7 +57,7 @@ #include "libc/serialize.h" #include "libc/str/str.h" #include "libc/str/strwidth.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/str/thompike.h" #include "libc/str/unicode.h" #include "libc/str/utf16.h" diff --git a/libc/stdio/fread_unlocked.c b/libc/stdio/fread_unlocked.c index d76bd3216f3..2ebc087138b 100644 --- a/libc/stdio/fread_unlocked.c +++ b/libc/stdio/fread_unlocked.c @@ -20,7 +20,7 @@ #include "libc/calls/calls.h" #include "libc/calls/struct/iovec.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdckdint.h" #include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" diff --git a/libc/stdio/fseek_unlocked.c b/libc/stdio/fseek_unlocked.c index 6703a59ecc9..f2acddc267c 100644 --- a/libc/stdio/fseek_unlocked.c +++ b/libc/stdio/fseek_unlocked.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" #include "libc/sysv/consts/o.h" diff --git a/libc/stdio/fwrite_unlocked.c b/libc/stdio/fwrite_unlocked.c index ef29022fe6d..4fa7c4d0460 100644 --- a/libc/stdio/fwrite_unlocked.c +++ b/libc/stdio/fwrite_unlocked.c @@ -20,7 +20,7 @@ #include "libc/calls/struct/iovec.internal.h" #include "libc/errno.h" #include "libc/fmt/conv.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdckdint.h" #include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" diff --git a/libc/stdio/kvappendf.c b/libc/stdio/kvappendf.c index 5c171a1c441..cdbf85b9ccf 100644 --- a/libc/stdio/kvappendf.c +++ b/libc/stdio/kvappendf.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/dce.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/stdio/append.h" diff --git a/libc/stdio/mt19937.c b/libc/stdio/mt19937.c index 72fd5fce7df..778cf2f1fd6 100644 --- a/libc/stdio/mt19937.c +++ b/libc/stdio/mt19937.c @@ -35,7 +35,7 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/likely.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdio/rand.h" __notice(mt19937_notice, "mt19937 (BSD-3)\n\ diff --git a/libc/stdio/printargs.c b/libc/stdio/printargs.c index 3e2ba0bb759..16226c8c28a 100644 --- a/libc/stdio/printargs.c +++ b/libc/stdio/printargs.c @@ -32,7 +32,7 @@ #include "libc/intrin/promises.h" #include "libc/intrin/strace.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/cpuid4.internal.h" #include "libc/nexgen32e/kcpuids.h" #include "libc/nexgen32e/x86feature.h" diff --git a/libc/stdio/vappendf.c b/libc/stdio/vappendf.c index 726e5945001..5ed5ab10f2b 100644 --- a/libc/stdio/vappendf.c +++ b/libc/stdio/vappendf.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/stdio/append.h" #include "libc/stdio/stdio.h" diff --git a/libc/stdio/vcscanf.c b/libc/stdio/vcscanf.c index 130670cced5..ddfa010970d 100644 --- a/libc/stdio/vcscanf.c +++ b/libc/stdio/vcscanf.c @@ -23,7 +23,7 @@ #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/str/tpdecodecb.internal.h" #include "libc/str/utf16.h" #include "libc/sysv/errfuns.h" diff --git a/libc/stdio/vdprintf.c b/libc/stdio/vdprintf.c index 0e9ef1c76ac..15d2d79091e 100644 --- a/libc/stdio/vdprintf.c +++ b/libc/stdio/vdprintf.c @@ -20,7 +20,7 @@ #include "libc/dce.h" #include "libc/fmt/internal.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/files.h" #include "libc/sock/sock.h" #include "libc/str/str.h" diff --git a/libc/stdio/vsnprintf.c b/libc/stdio/vsnprintf.c index f46bc0e267e..a113335df05 100644 --- a/libc/stdio/vsnprintf.c +++ b/libc/stdio/vsnprintf.c @@ -20,7 +20,7 @@ #include "libc/dce.h" #include "libc/fmt/internal.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/libc/str/blake2.c b/libc/str/blake2.c index acbeb1b704e..f2e10416a76 100644 --- a/libc/str/blake2.c +++ b/libc/str/blake2.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/blake2.h" #include "libc/assert.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #define ROR(v, n) (((v) >> (n)) | ((v) << (64 - (n)))) diff --git a/libc/str/compareslices.c b/libc/str/compareslices.c index b57b902a6c1..0bca09438e6 100644 --- a/libc/str/compareslices.c +++ b/libc/str/compareslices.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/slice.h" int CompareSlices(const char *a, size_t n, const char *b, size_t m) { diff --git a/libc/str/compareslicescase.c b/libc/str/compareslicescase.c index a4f88145023..129d9b22cec 100644 --- a/libc/str/compareslicescase.c +++ b/libc/str/compareslicescase.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/slice.h" int CompareSlicesCase(const char *a, size_t n, const char *b, size_t m) { diff --git a/libc/str/dosdatetimetounix.c b/libc/str/dosdatetimetounix.c index 7cc956fd315..a4cd181093e 100644 --- a/libc/str/dosdatetimetounix.c +++ b/libc/str/dosdatetimetounix.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/time.h" /** diff --git a/libc/str/getzipcdircomment.c b/libc/str/getzipcdircomment.c index 35ca8b38f82..85d8d8ce75d 100644 --- a/libc/str/getzipcdircomment.c +++ b/libc/str/getzipcdircomment.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns comment of zip central directory. diff --git a/libc/str/getzipcdircommentsize.c b/libc/str/getzipcdircommentsize.c index ac83f995b42..c4fbc77d839 100644 --- a/libc/str/getzipcdircommentsize.c +++ b/libc/str/getzipcdircommentsize.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns comment of zip central directory. diff --git a/libc/str/getzipcdiroffset.c b/libc/str/getzipcdiroffset.c index 6698290ced8..0aaefb03d54 100644 --- a/libc/str/getzipcdiroffset.c +++ b/libc/str/getzipcdiroffset.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns offset of zip central directory. diff --git a/libc/str/getzipcdirrecords.c b/libc/str/getzipcdirrecords.c index 20f0cef5908..f127dd299b2 100644 --- a/libc/str/getzipcdirrecords.c +++ b/libc/str/getzipcdirrecords.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns number of records in zip central directory. diff --git a/libc/str/getzipcdirsize.c b/libc/str/getzipcdirsize.c index 3ea16c201f1..c8a1e3da99b 100644 --- a/libc/str/getzipcdirsize.c +++ b/libc/str/getzipcdirsize.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns size of zip central directory. diff --git a/libc/str/getzipcfilecompressedsize.c b/libc/str/getzipcfilecompressedsize.c index f2c26ba3689..96a492e840f 100644 --- a/libc/str/getzipcfilecompressedsize.c +++ b/libc/str/getzipcfilecompressedsize.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns compressed size in bytes from zip central directory header. diff --git a/libc/str/getzipcfilemode.c b/libc/str/getzipcfilemode.c index f4a944301af..d73e708a4f7 100644 --- a/libc/str/getzipcfilemode.c +++ b/libc/str/getzipcfilemode.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nt/enum/fileflagandattributes.h" #include "libc/sysv/consts/s.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" static int ConvertWindowsToUnixMode(int x) { int m; diff --git a/libc/str/getzipcfileoffset.c b/libc/str/getzipcfileoffset.c index 5a18f6a9207..66726cea8ac 100644 --- a/libc/str/getzipcfileoffset.c +++ b/libc/str/getzipcfileoffset.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns offset of local file header. diff --git a/libc/str/getzipcfiletimestamps.c b/libc/str/getzipcfiletimestamps.c index 0a06b699225..4d246c4ab45 100644 --- a/libc/str/getzipcfiletimestamps.c +++ b/libc/str/getzipcfiletimestamps.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/wintime.internal.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" static inline int pop(int x) { return !!(x & 1) + !!(x & 2) + !!(x & 4); diff --git a/libc/str/getzipcfileuncompressedsize.c b/libc/str/getzipcfileuncompressedsize.c index 3a38bd29e81..d129b55e516 100644 --- a/libc/str/getzipcfileuncompressedsize.c +++ b/libc/str/getzipcfileuncompressedsize.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns uncompressed size in bytes from zip central directory header. diff --git a/libc/str/getzipeocd.c b/libc/str/getzipeocd.c index ee862cc19a5..86c1cc1e7e3 100644 --- a/libc/str/getzipeocd.c +++ b/libc/str/getzipeocd.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" typedef char v16qi __attribute__((__vector_size__(16))); typedef short v8hi __attribute__((__vector_size__(16))); diff --git a/libc/str/getziplfilecompressedsize.c b/libc/str/getziplfilecompressedsize.c index 26403d30052..5147c893401 100644 --- a/libc/str/getziplfilecompressedsize.c +++ b/libc/str/getziplfilecompressedsize.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns compressed size in bytes from zip local file header. diff --git a/libc/str/getziplfileuncompressedsize.c b/libc/str/getziplfileuncompressedsize.c index 86a6b36210c..e76b74bc90c 100644 --- a/libc/str/getziplfileuncompressedsize.c +++ b/libc/str/getziplfileuncompressedsize.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns uncompressed size in bytes from zip local file header. diff --git a/libc/str/iswctype.c b/libc/str/iswctype.c index 0c2b83fabd8..553e828203d 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.internal.h" +#include "libc/macros.h" #include "libc/wctype.h" typedef int (*isw_f)(wint_t); diff --git a/libc/str/iszipeocd32.c b/libc/str/iszipeocd32.c index 883bf93db28..fedc002420b 100644 --- a/libc/str/iszipeocd32.c +++ b/libc/str/iszipeocd32.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/stdckdint.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Determines if ZIP EOCD record seems legit. diff --git a/libc/str/iszipeocd64.c b/libc/str/iszipeocd64.c index cbc37af29b5..ff29795d6be 100644 --- a/libc/str/iszipeocd64.c +++ b/libc/str/iszipeocd64.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/stdckdint.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" /** * Returns kZipOk if zip64 end of central directory header seems legit. diff --git a/libc/str/khextoint.c b/libc/str/khextoint.c index 53e2093d0d2..fd30e72cfe2 100644 --- a/libc/str/khextoint.c +++ b/libc/str/khextoint.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/stdalign.internal.h" -#include "libc/str/tab.internal.h" +#include "libc/stdalign.h" +#include "libc/str/tab.h" alignas(int8_t) const int8_t kHexToInt[256] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x00 diff --git a/libc/str/kx86processormodels.c b/libc/str/kx86processormodels.c index d5f62ea3ce1..9bf5c196e35 100644 --- a/libc/str/kx86processormodels.c +++ b/libc/str/kx86processormodels.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/x86info.h" const struct X86ProcessorModel kX86ProcessorModels[] = { diff --git a/libc/str/memcasecmp.c b/libc/str/memcasecmp.c index 05e552f0bab..28a221c5ff4 100644 --- a/libc/str/memcasecmp.c +++ b/libc/str/memcasecmp.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/serialize.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * Compares memory case-insensitively. diff --git a/libc/str/startswithi.c b/libc/str/startswithi.c index 974ece79472..136192abfdf 100644 --- a/libc/str/startswithi.c +++ b/libc/str/startswithi.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * Checks if string starts with prefix, case insensitively. diff --git a/libc/str/stpncpy.c b/libc/str/stpncpy.c index 30b6f2bb953..66d2d3e5526 100644 --- a/libc/str/stpncpy.c +++ b/libc/str/stpncpy.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" /** diff --git a/libc/str/strcasecmp.c b/libc/str/strcasecmp.c index 2443afd93d1..8510f603489 100644 --- a/libc/str/strcasecmp.c +++ b/libc/str/strcasecmp.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * Compares NUL-terminated strings ascii case-insensitively. diff --git a/libc/str/strcasestr.c b/libc/str/strcasestr.c index 26f969c0993..ec40c16f1ad 100644 --- a/libc/str/strcasestr.c +++ b/libc/str/strcasestr.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" #include "libc/dce.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" typedef char xmm_t __attribute__((__vector_size__(16), __aligned__(16))); diff --git a/libc/str/strncasecmp.c b/libc/str/strncasecmp.c index 419b7eec837..75673245450 100644 --- a/libc/str/strncasecmp.c +++ b/libc/str/strncasecmp.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * Compares NUL-terminated strings case-insensitively w/ limit. diff --git a/libc/str/strncpy.c b/libc/str/strncpy.c index 26ac33e02cd..052b00217f6 100644 --- a/libc/str/strncpy.c +++ b/libc/str/strncpy.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" /** diff --git a/libc/str/strnwidth.c b/libc/str/strnwidth.c index 0e39fc70ace..761994e8000 100644 --- a/libc/str/strnwidth.c +++ b/libc/str/strnwidth.c @@ -19,7 +19,7 @@ #include "libc/intrin/bsf.h" #include "libc/intrin/pcmpgtb.h" #include "libc/intrin/pmovmskb.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/str/thompike.h" #include "libc/str/unicode.h" diff --git a/libc/str/strtol.c b/libc/str/strtol.c index 0548bb26555..aa7bdd3b212 100644 --- a/libc/str/strtol.c +++ b/libc/str/strtol.c @@ -22,7 +22,7 @@ #include "libc/limits.h" #include "libc/stdckdint.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * Decodes signed integer from ASCII string. diff --git a/libc/str/strtoul.c b/libc/str/strtoul.c index ee8f01fbd32..37f28fe1e26 100644 --- a/libc/str/strtoul.c +++ b/libc/str/strtoul.c @@ -22,7 +22,7 @@ #include "libc/limits.h" #include "libc/stdckdint.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * Decodes unsigned integer from ASCII string. diff --git a/libc/str/tab.internal.h b/libc/str/tab.h similarity index 77% rename from libc/str/tab.internal.h rename to libc/str/tab.h index c40d9f66343..ea1310bbc62 100644 --- a/libc/str/tab.internal.h +++ b/libc/str/tab.h @@ -1,5 +1,5 @@ -#ifndef COSMOPOLITAN_LIBC_STR_TAB_INTERNAL_H_ -#define COSMOPOLITAN_LIBC_STR_TAB_INTERNAL_H_ +#ifndef COSMOPOLITAN_LIBC_STR_TAB_H_ +#define COSMOPOLITAN_LIBC_STR_TAB_H_ #define kHexToInt __kHexToInt #define kToLower __kToLower @@ -20,4 +20,4 @@ extern const char16_t kCp437[256]; COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_STR_TAB_INTERNAL_H_ */ +#endif /* COSMOPOLITAN_LIBC_STR_TAB_H_ */ diff --git a/libc/str/towlower.c b/libc/str/towlower.c index 313a53079da..eb791adbc8c 100644 --- a/libc/str/towlower.c +++ b/libc/str/towlower.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" /* clang-format off */ diff --git a/libc/str/towupper.c b/libc/str/towupper.c index e946cd14237..42dd6f37486 100644 --- a/libc/str/towupper.c +++ b/libc/str/towupper.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" // clang-format off diff --git a/libc/str/wctype.c b/libc/str/wctype.c index 20516dc4763..e20ef27bea6 100644 --- a/libc/str/wctype.c +++ b/libc/str/wctype.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/wctype.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/serialize.h" static const char kWcTypeNames[][8] = { diff --git a/libc/str/wcwidth_osx.c b/libc/str/wcwidth_osx.c index 6a2b64c014b..43a1bda9dfd 100644 --- a/libc/str/wcwidth_osx.c +++ b/libc/str/wcwidth_osx.c @@ -20,7 +20,7 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/wcwidth_osx.internal.h" const uint8_t kWcwidthOsxIndex1[] = { diff --git a/libc/sysv/consts/syscon.internal.h b/libc/sysv/consts/syscon.internal.h index 33b97c9a00e..396f0b67196 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.internal.h" +#include "libc/macros.h" // clang-format off #ifdef __x86_64__ diff --git a/libc/sysv/errfun.S b/libc/sysv/errfun.S index debb98d2f5a..e1ef6908a85 100644 --- a/libc/sysv/errfun.S +++ b/libc/sysv/errfun.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely __errfun: diff --git a/libc/sysv/errfuns/e2big.S b/libc/sysv/errfuns/e2big.S index 32ac86542f0..7b6fd6a2033 100644 --- a/libc/sysv/errfuns/e2big.S +++ b/libc/sysv/errfuns/e2big.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eacces.S b/libc/sysv/errfuns/eacces.S index 2ba28917089..5657ed49716 100644 --- a/libc/sysv/errfuns/eacces.S +++ b/libc/sysv/errfuns/eacces.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eaddrinuse.S b/libc/sysv/errfuns/eaddrinuse.S index 4d8c41d3451..77dee3e32ba 100644 --- a/libc/sysv/errfuns/eaddrinuse.S +++ b/libc/sysv/errfuns/eaddrinuse.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eaddrnotavail.S b/libc/sysv/errfuns/eaddrnotavail.S index 101b936a66a..28a3a3998ab 100644 --- a/libc/sysv/errfuns/eaddrnotavail.S +++ b/libc/sysv/errfuns/eaddrnotavail.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eadv.S b/libc/sysv/errfuns/eadv.S index aeadda50930..acf8e5f8661 100644 --- a/libc/sysv/errfuns/eadv.S +++ b/libc/sysv/errfuns/eadv.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eafnosupport.S b/libc/sysv/errfuns/eafnosupport.S index 0f4fa0b5ad8..4e4787cc8b3 100644 --- a/libc/sysv/errfuns/eafnosupport.S +++ b/libc/sysv/errfuns/eafnosupport.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eagain.S b/libc/sysv/errfuns/eagain.S index 5124a43f1d9..e19df5a4f40 100644 --- a/libc/sysv/errfuns/eagain.S +++ b/libc/sysv/errfuns/eagain.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ealready.S b/libc/sysv/errfuns/ealready.S index e8b32b0ebfb..4f39c44d8a8 100644 --- a/libc/sysv/errfuns/ealready.S +++ b/libc/sysv/errfuns/ealready.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ebade.S b/libc/sysv/errfuns/ebade.S index 8d0a0c19f75..0eb25fca311 100644 --- a/libc/sysv/errfuns/ebade.S +++ b/libc/sysv/errfuns/ebade.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ebadf.S b/libc/sysv/errfuns/ebadf.S index 693fe7c4682..34318ce1839 100644 --- a/libc/sysv/errfuns/ebadf.S +++ b/libc/sysv/errfuns/ebadf.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ebadfd.S b/libc/sysv/errfuns/ebadfd.S index fb4fc502d41..a2900bc3d01 100644 --- a/libc/sysv/errfuns/ebadfd.S +++ b/libc/sysv/errfuns/ebadfd.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ebadmsg.S b/libc/sysv/errfuns/ebadmsg.S index e650ed2968e..5781527bdbe 100644 --- a/libc/sysv/errfuns/ebadmsg.S +++ b/libc/sysv/errfuns/ebadmsg.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ebadr.S b/libc/sysv/errfuns/ebadr.S index e8f9ab68d23..f80316c45a7 100644 --- a/libc/sysv/errfuns/ebadr.S +++ b/libc/sysv/errfuns/ebadr.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ebadrqc.S b/libc/sysv/errfuns/ebadrqc.S index e5fd4491534..1debb93f56d 100644 --- a/libc/sysv/errfuns/ebadrqc.S +++ b/libc/sysv/errfuns/ebadrqc.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ebadslt.S b/libc/sysv/errfuns/ebadslt.S index 4bc407c0e0f..38a091a3e56 100644 --- a/libc/sysv/errfuns/ebadslt.S +++ b/libc/sysv/errfuns/ebadslt.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ebusy.S b/libc/sysv/errfuns/ebusy.S index 54a43600148..a677d254ba1 100644 --- a/libc/sysv/errfuns/ebusy.S +++ b/libc/sysv/errfuns/ebusy.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ecanceled.S b/libc/sysv/errfuns/ecanceled.S index 58007cb2d2e..ac974c3f455 100644 --- a/libc/sysv/errfuns/ecanceled.S +++ b/libc/sysv/errfuns/ecanceled.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/echild.S b/libc/sysv/errfuns/echild.S index e3e79409b20..7733922f58b 100644 --- a/libc/sysv/errfuns/echild.S +++ b/libc/sysv/errfuns/echild.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/echrng.S b/libc/sysv/errfuns/echrng.S index 0ffa5c922d6..0f20dda564f 100644 --- a/libc/sysv/errfuns/echrng.S +++ b/libc/sysv/errfuns/echrng.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ecomm.S b/libc/sysv/errfuns/ecomm.S index 1a9a9828669..4afe7326bda 100644 --- a/libc/sysv/errfuns/ecomm.S +++ b/libc/sysv/errfuns/ecomm.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/econnaborted.S b/libc/sysv/errfuns/econnaborted.S index ec62e3e676e..7f8c2737fe7 100644 --- a/libc/sysv/errfuns/econnaborted.S +++ b/libc/sysv/errfuns/econnaborted.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/econnrefused.S b/libc/sysv/errfuns/econnrefused.S index b16e4ce731e..20adf6b88ec 100644 --- a/libc/sysv/errfuns/econnrefused.S +++ b/libc/sysv/errfuns/econnrefused.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/econnreset.S b/libc/sysv/errfuns/econnreset.S index 0c8fd94f4f1..8255f0bdc8f 100644 --- a/libc/sysv/errfuns/econnreset.S +++ b/libc/sysv/errfuns/econnreset.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/edeadlk.S b/libc/sysv/errfuns/edeadlk.S index caf4dbc2f7f..b812e07e985 100644 --- a/libc/sysv/errfuns/edeadlk.S +++ b/libc/sysv/errfuns/edeadlk.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/edestaddrreq.S b/libc/sysv/errfuns/edestaddrreq.S index 74dd51f96a1..bd3b8d56f23 100644 --- a/libc/sysv/errfuns/edestaddrreq.S +++ b/libc/sysv/errfuns/edestaddrreq.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/edom.S b/libc/sysv/errfuns/edom.S index c26449ac2bf..a3f40bb7cbd 100644 --- a/libc/sysv/errfuns/edom.S +++ b/libc/sysv/errfuns/edom.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/edotdot.S b/libc/sysv/errfuns/edotdot.S index e1a347a3a34..6cdc947398e 100644 --- a/libc/sysv/errfuns/edotdot.S +++ b/libc/sysv/errfuns/edotdot.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/edquot.S b/libc/sysv/errfuns/edquot.S index 0e3e6fe792b..2d62f612433 100644 --- a/libc/sysv/errfuns/edquot.S +++ b/libc/sysv/errfuns/edquot.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eexist.S b/libc/sysv/errfuns/eexist.S index d1fb3a3143c..65cc2e363b0 100644 --- a/libc/sysv/errfuns/eexist.S +++ b/libc/sysv/errfuns/eexist.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/efault.S b/libc/sysv/errfuns/efault.S index a219fff848d..802d9f12ff8 100644 --- a/libc/sysv/errfuns/efault.S +++ b/libc/sysv/errfuns/efault.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/efbig.S b/libc/sysv/errfuns/efbig.S index 0d614e720e2..32be5b13712 100644 --- a/libc/sysv/errfuns/efbig.S +++ b/libc/sysv/errfuns/efbig.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ehostdown.S b/libc/sysv/errfuns/ehostdown.S index 55a766ca993..b472f021a7e 100644 --- a/libc/sysv/errfuns/ehostdown.S +++ b/libc/sysv/errfuns/ehostdown.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ehostunreach.S b/libc/sysv/errfuns/ehostunreach.S index bc5c311f0bd..8fa84fca196 100644 --- a/libc/sysv/errfuns/ehostunreach.S +++ b/libc/sysv/errfuns/ehostunreach.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ehwpoison.S b/libc/sysv/errfuns/ehwpoison.S index d1d261565a0..d7df790b186 100644 --- a/libc/sysv/errfuns/ehwpoison.S +++ b/libc/sysv/errfuns/ehwpoison.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eidrm.S b/libc/sysv/errfuns/eidrm.S index 0c0d72542d7..3ba2f2bca28 100644 --- a/libc/sysv/errfuns/eidrm.S +++ b/libc/sysv/errfuns/eidrm.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eilseq.S b/libc/sysv/errfuns/eilseq.S index d34482cea76..25fdac2c6c8 100644 --- a/libc/sysv/errfuns/eilseq.S +++ b/libc/sysv/errfuns/eilseq.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/einprogress.S b/libc/sysv/errfuns/einprogress.S index 9d356fd2aad..db22b1bc6e8 100644 --- a/libc/sysv/errfuns/einprogress.S +++ b/libc/sysv/errfuns/einprogress.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eintr.S b/libc/sysv/errfuns/eintr.S index e6a3f88d3c8..96d03d28abb 100644 --- a/libc/sysv/errfuns/eintr.S +++ b/libc/sysv/errfuns/eintr.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/einval.S b/libc/sysv/errfuns/einval.S index 537af95c8ce..1b23f8ba1e7 100644 --- a/libc/sysv/errfuns/einval.S +++ b/libc/sysv/errfuns/einval.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eio.S b/libc/sysv/errfuns/eio.S index cdf541c95c6..dade87a5475 100644 --- a/libc/sysv/errfuns/eio.S +++ b/libc/sysv/errfuns/eio.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eisconn.S b/libc/sysv/errfuns/eisconn.S index 148423224f9..36db72604ad 100644 --- a/libc/sysv/errfuns/eisconn.S +++ b/libc/sysv/errfuns/eisconn.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eisdir.S b/libc/sysv/errfuns/eisdir.S index 83e775f5155..5330710865b 100644 --- a/libc/sysv/errfuns/eisdir.S +++ b/libc/sysv/errfuns/eisdir.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eisnam.S b/libc/sysv/errfuns/eisnam.S index 4450ca1ea98..a8b632d2012 100644 --- a/libc/sysv/errfuns/eisnam.S +++ b/libc/sysv/errfuns/eisnam.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ekeyexpired.S b/libc/sysv/errfuns/ekeyexpired.S index 89f4507bc3c..810d2078f81 100644 --- a/libc/sysv/errfuns/ekeyexpired.S +++ b/libc/sysv/errfuns/ekeyexpired.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ekeyrejected.S b/libc/sysv/errfuns/ekeyrejected.S index fda4019bd05..874b2570736 100644 --- a/libc/sysv/errfuns/ekeyrejected.S +++ b/libc/sysv/errfuns/ekeyrejected.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/ekeyrevoked.S b/libc/sysv/errfuns/ekeyrevoked.S index d8e2e11c28d..fa5b4ce5c59 100644 --- a/libc/sysv/errfuns/ekeyrevoked.S +++ b/libc/sysv/errfuns/ekeyrevoked.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/el2hlt.S b/libc/sysv/errfuns/el2hlt.S index 5462d3ec918..b8400dca846 100644 --- a/libc/sysv/errfuns/el2hlt.S +++ b/libc/sysv/errfuns/el2hlt.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/el2nsync.S b/libc/sysv/errfuns/el2nsync.S index bb249b131ae..bbf44361336 100644 --- a/libc/sysv/errfuns/el2nsync.S +++ b/libc/sysv/errfuns/el2nsync.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/el3hlt.S b/libc/sysv/errfuns/el3hlt.S index 40535b6d64d..c527a2cf480 100644 --- a/libc/sysv/errfuns/el3hlt.S +++ b/libc/sysv/errfuns/el3hlt.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/el3rst.S b/libc/sysv/errfuns/el3rst.S index 036afd48e31..b277a12dd65 100644 --- a/libc/sysv/errfuns/el3rst.S +++ b/libc/sysv/errfuns/el3rst.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/elibacc.S b/libc/sysv/errfuns/elibacc.S index b598c2e471d..ecaa787ce1f 100644 --- a/libc/sysv/errfuns/elibacc.S +++ b/libc/sysv/errfuns/elibacc.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/elibbad.S b/libc/sysv/errfuns/elibbad.S index 4a0f7f72bf8..6929d6c18e4 100644 --- a/libc/sysv/errfuns/elibbad.S +++ b/libc/sysv/errfuns/elibbad.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/elibexec.S b/libc/sysv/errfuns/elibexec.S index 6b50932161c..141f1acefdd 100644 --- a/libc/sysv/errfuns/elibexec.S +++ b/libc/sysv/errfuns/elibexec.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/elibmax.S b/libc/sysv/errfuns/elibmax.S index 73dc1d570a6..5738b1ebd21 100644 --- a/libc/sysv/errfuns/elibmax.S +++ b/libc/sysv/errfuns/elibmax.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/elibscn.S b/libc/sysv/errfuns/elibscn.S index fd3fbe24536..730a3da62f2 100644 --- a/libc/sysv/errfuns/elibscn.S +++ b/libc/sysv/errfuns/elibscn.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/elnrng.S b/libc/sysv/errfuns/elnrng.S index 0e0e37ed48d..7db38cca6c3 100644 --- a/libc/sysv/errfuns/elnrng.S +++ b/libc/sysv/errfuns/elnrng.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eloop.S b/libc/sysv/errfuns/eloop.S index faef0e95c5b..e7edbbc927f 100644 --- a/libc/sysv/errfuns/eloop.S +++ b/libc/sysv/errfuns/eloop.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/emediumtype.S b/libc/sysv/errfuns/emediumtype.S index 4480809384b..0d7de3b518b 100644 --- a/libc/sysv/errfuns/emediumtype.S +++ b/libc/sysv/errfuns/emediumtype.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/emfile.S b/libc/sysv/errfuns/emfile.S index 6adb57077b0..a7f1d6e2b87 100644 --- a/libc/sysv/errfuns/emfile.S +++ b/libc/sysv/errfuns/emfile.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/emlink.S b/libc/sysv/errfuns/emlink.S index 8c6b7d95a6f..e0d810f9c42 100644 --- a/libc/sysv/errfuns/emlink.S +++ b/libc/sysv/errfuns/emlink.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/emsgsize.S b/libc/sysv/errfuns/emsgsize.S index 9870b85a15e..d2c22cb06a8 100644 --- a/libc/sysv/errfuns/emsgsize.S +++ b/libc/sysv/errfuns/emsgsize.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/emultihop.S b/libc/sysv/errfuns/emultihop.S index 27140db9f66..cb54b95201c 100644 --- a/libc/sysv/errfuns/emultihop.S +++ b/libc/sysv/errfuns/emultihop.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enametoolong.S b/libc/sysv/errfuns/enametoolong.S index d46f2bfa1b7..d085fc6bf49 100644 --- a/libc/sysv/errfuns/enametoolong.S +++ b/libc/sysv/errfuns/enametoolong.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enavail.S b/libc/sysv/errfuns/enavail.S index d7aa15d49bd..a86a5b386ea 100644 --- a/libc/sysv/errfuns/enavail.S +++ b/libc/sysv/errfuns/enavail.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enetdown.S b/libc/sysv/errfuns/enetdown.S index 7850a589213..fe4f2f9086d 100644 --- a/libc/sysv/errfuns/enetdown.S +++ b/libc/sysv/errfuns/enetdown.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enetreset.S b/libc/sysv/errfuns/enetreset.S index fd6cf0c532d..31126c73b82 100644 --- a/libc/sysv/errfuns/enetreset.S +++ b/libc/sysv/errfuns/enetreset.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enetunreach.S b/libc/sysv/errfuns/enetunreach.S index 36a6ee69e10..ec730c63782 100644 --- a/libc/sysv/errfuns/enetunreach.S +++ b/libc/sysv/errfuns/enetunreach.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enfile.S b/libc/sysv/errfuns/enfile.S index a2b5157dd70..5df56837a9a 100644 --- a/libc/sysv/errfuns/enfile.S +++ b/libc/sysv/errfuns/enfile.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enoano.S b/libc/sysv/errfuns/enoano.S index f3a713901af..81724c4b359 100644 --- a/libc/sysv/errfuns/enoano.S +++ b/libc/sysv/errfuns/enoano.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enobufs.S b/libc/sysv/errfuns/enobufs.S index 7936a1e1f3a..3ba3a8b9cb6 100644 --- a/libc/sysv/errfuns/enobufs.S +++ b/libc/sysv/errfuns/enobufs.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enocsi.S b/libc/sysv/errfuns/enocsi.S index ab63ad07101..c6e6fdd22ad 100644 --- a/libc/sysv/errfuns/enocsi.S +++ b/libc/sysv/errfuns/enocsi.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enodata.S b/libc/sysv/errfuns/enodata.S index e5fd0642555..4394c5f8b63 100644 --- a/libc/sysv/errfuns/enodata.S +++ b/libc/sysv/errfuns/enodata.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enodev.S b/libc/sysv/errfuns/enodev.S index 1be5d5846e3..da1741b1d80 100644 --- a/libc/sysv/errfuns/enodev.S +++ b/libc/sysv/errfuns/enodev.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enoent.S b/libc/sysv/errfuns/enoent.S index 3929a214d73..4bd569d9d5a 100644 --- a/libc/sysv/errfuns/enoent.S +++ b/libc/sysv/errfuns/enoent.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enoexec.S b/libc/sysv/errfuns/enoexec.S index 30cee1e8a24..4b6f0022871 100644 --- a/libc/sysv/errfuns/enoexec.S +++ b/libc/sysv/errfuns/enoexec.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enokey.S b/libc/sysv/errfuns/enokey.S index 399aa97c97f..5c5c2004837 100644 --- a/libc/sysv/errfuns/enokey.S +++ b/libc/sysv/errfuns/enokey.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enolck.S b/libc/sysv/errfuns/enolck.S index ceda3386275..9d5b995e9e1 100644 --- a/libc/sysv/errfuns/enolck.S +++ b/libc/sysv/errfuns/enolck.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enolink.S b/libc/sysv/errfuns/enolink.S index 189d8ad7bf1..e35ae060e79 100644 --- a/libc/sysv/errfuns/enolink.S +++ b/libc/sysv/errfuns/enolink.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enomedium.S b/libc/sysv/errfuns/enomedium.S index c7a6893ecf2..3bf1573fb48 100644 --- a/libc/sysv/errfuns/enomedium.S +++ b/libc/sysv/errfuns/enomedium.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enomem.S b/libc/sysv/errfuns/enomem.S index d9a7050c8e2..62a49eb7c5e 100644 --- a/libc/sysv/errfuns/enomem.S +++ b/libc/sysv/errfuns/enomem.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enomsg.S b/libc/sysv/errfuns/enomsg.S index 0307c3ec244..49d558667f6 100644 --- a/libc/sysv/errfuns/enomsg.S +++ b/libc/sysv/errfuns/enomsg.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enonet.S b/libc/sysv/errfuns/enonet.S index fc2e5468c3b..e84f0012151 100644 --- a/libc/sysv/errfuns/enonet.S +++ b/libc/sysv/errfuns/enonet.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enopkg.S b/libc/sysv/errfuns/enopkg.S index 3b08e87a54e..5431b0c9e8b 100644 --- a/libc/sysv/errfuns/enopkg.S +++ b/libc/sysv/errfuns/enopkg.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enoprotoopt.S b/libc/sysv/errfuns/enoprotoopt.S index 80fca7bb589..8ffec69634d 100644 --- a/libc/sysv/errfuns/enoprotoopt.S +++ b/libc/sysv/errfuns/enoprotoopt.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enospc.S b/libc/sysv/errfuns/enospc.S index 69023893d36..afbe6a497d8 100644 --- a/libc/sysv/errfuns/enospc.S +++ b/libc/sysv/errfuns/enospc.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enosr.S b/libc/sysv/errfuns/enosr.S index 9d7119e538f..289c4b645e8 100644 --- a/libc/sysv/errfuns/enosr.S +++ b/libc/sysv/errfuns/enosr.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enostr.S b/libc/sysv/errfuns/enostr.S index 6705b715517..e9f64241e6b 100644 --- a/libc/sysv/errfuns/enostr.S +++ b/libc/sysv/errfuns/enostr.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enosys.S b/libc/sysv/errfuns/enosys.S index c0f6e7c3661..4f213272645 100644 --- a/libc/sysv/errfuns/enosys.S +++ b/libc/sysv/errfuns/enosys.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotblk.S b/libc/sysv/errfuns/enotblk.S index c4812cb039d..c04ba77b479 100644 --- a/libc/sysv/errfuns/enotblk.S +++ b/libc/sysv/errfuns/enotblk.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotconn.S b/libc/sysv/errfuns/enotconn.S index b6c26d55c4f..1ea6d6eca51 100644 --- a/libc/sysv/errfuns/enotconn.S +++ b/libc/sysv/errfuns/enotconn.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotdir.S b/libc/sysv/errfuns/enotdir.S index 7afc1762fe3..14103122d5c 100644 --- a/libc/sysv/errfuns/enotdir.S +++ b/libc/sysv/errfuns/enotdir.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotempty.S b/libc/sysv/errfuns/enotempty.S index 67bbdc837a3..dd014acbc61 100644 --- a/libc/sysv/errfuns/enotempty.S +++ b/libc/sysv/errfuns/enotempty.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotnam.S b/libc/sysv/errfuns/enotnam.S index 7a1094e5bc3..259a7bdaeab 100644 --- a/libc/sysv/errfuns/enotnam.S +++ b/libc/sysv/errfuns/enotnam.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotrecoverable.S b/libc/sysv/errfuns/enotrecoverable.S index e5043045264..85ed3a66363 100644 --- a/libc/sysv/errfuns/enotrecoverable.S +++ b/libc/sysv/errfuns/enotrecoverable.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotsock.S b/libc/sysv/errfuns/enotsock.S index 8f0753ce5e3..02e2b93ff0a 100644 --- a/libc/sysv/errfuns/enotsock.S +++ b/libc/sysv/errfuns/enotsock.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotsup.S b/libc/sysv/errfuns/enotsup.S index 59d1306233f..01888f28074 100644 --- a/libc/sysv/errfuns/enotsup.S +++ b/libc/sysv/errfuns/enotsup.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotty.S b/libc/sysv/errfuns/enotty.S index beed92e95c0..e07629a98c5 100644 --- a/libc/sysv/errfuns/enotty.S +++ b/libc/sysv/errfuns/enotty.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enotuniq.S b/libc/sysv/errfuns/enotuniq.S index 57b04e9ba00..a40cf8982eb 100644 --- a/libc/sysv/errfuns/enotuniq.S +++ b/libc/sysv/errfuns/enotuniq.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/enxio.S b/libc/sysv/errfuns/enxio.S index 637241908b7..6e827d4c670 100644 --- a/libc/sysv/errfuns/enxio.S +++ b/libc/sysv/errfuns/enxio.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eopnotsupp.S b/libc/sysv/errfuns/eopnotsupp.S index fa974a99847..0c740d2abe8 100644 --- a/libc/sysv/errfuns/eopnotsupp.S +++ b/libc/sysv/errfuns/eopnotsupp.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eoverflow.S b/libc/sysv/errfuns/eoverflow.S index 81aad5b645b..98fae88a94e 100644 --- a/libc/sysv/errfuns/eoverflow.S +++ b/libc/sysv/errfuns/eoverflow.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eownerdead.S b/libc/sysv/errfuns/eownerdead.S index 5968f380792..033cab8bf57 100644 --- a/libc/sysv/errfuns/eownerdead.S +++ b/libc/sysv/errfuns/eownerdead.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eperm.S b/libc/sysv/errfuns/eperm.S index cc4fefa78da..54df77607c2 100644 --- a/libc/sysv/errfuns/eperm.S +++ b/libc/sysv/errfuns/eperm.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/epfnosupport.S b/libc/sysv/errfuns/epfnosupport.S index 73da7dd259e..9732440f5f5 100644 --- a/libc/sysv/errfuns/epfnosupport.S +++ b/libc/sysv/errfuns/epfnosupport.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/epipe.S b/libc/sysv/errfuns/epipe.S index 5c1f019481b..fcf57e4c897 100644 --- a/libc/sysv/errfuns/epipe.S +++ b/libc/sysv/errfuns/epipe.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eproto.S b/libc/sysv/errfuns/eproto.S index 22ceb6bd723..f5c7e0c1fab 100644 --- a/libc/sysv/errfuns/eproto.S +++ b/libc/sysv/errfuns/eproto.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eprotonosupport.S b/libc/sysv/errfuns/eprotonosupport.S index f8f9bcd6a59..3934683f944 100644 --- a/libc/sysv/errfuns/eprotonosupport.S +++ b/libc/sysv/errfuns/eprotonosupport.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eprototype.S b/libc/sysv/errfuns/eprototype.S index ceb8efbb3c4..208d4989ffa 100644 --- a/libc/sysv/errfuns/eprototype.S +++ b/libc/sysv/errfuns/eprototype.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/erange.S b/libc/sysv/errfuns/erange.S index 1dc1b07e337..e9e8e727c54 100644 --- a/libc/sysv/errfuns/erange.S +++ b/libc/sysv/errfuns/erange.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eremchg.S b/libc/sysv/errfuns/eremchg.S index 201ae2688d9..2bdcac6925e 100644 --- a/libc/sysv/errfuns/eremchg.S +++ b/libc/sysv/errfuns/eremchg.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eremote.S b/libc/sysv/errfuns/eremote.S index db3ddb6270e..515e7d5b6a4 100644 --- a/libc/sysv/errfuns/eremote.S +++ b/libc/sysv/errfuns/eremote.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eremoteio.S b/libc/sysv/errfuns/eremoteio.S index 12e2a74b500..d57d9e11923 100644 --- a/libc/sysv/errfuns/eremoteio.S +++ b/libc/sysv/errfuns/eremoteio.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/erestart.S b/libc/sysv/errfuns/erestart.S index 30eaa1d0b92..67bc02b9bcc 100644 --- a/libc/sysv/errfuns/erestart.S +++ b/libc/sysv/errfuns/erestart.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/erfkill.S b/libc/sysv/errfuns/erfkill.S index 141b8e85ada..49be57d2786 100644 --- a/libc/sysv/errfuns/erfkill.S +++ b/libc/sysv/errfuns/erfkill.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/erofs.S b/libc/sysv/errfuns/erofs.S index fdab8c9a83d..6d926c89028 100644 --- a/libc/sysv/errfuns/erofs.S +++ b/libc/sysv/errfuns/erofs.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eshutdown.S b/libc/sysv/errfuns/eshutdown.S index 1f6d8cfd1d5..dfbcce1201b 100644 --- a/libc/sysv/errfuns/eshutdown.S +++ b/libc/sysv/errfuns/eshutdown.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/esocktnosupport.S b/libc/sysv/errfuns/esocktnosupport.S index 6a29e9c8177..6891eb9d914 100644 --- a/libc/sysv/errfuns/esocktnosupport.S +++ b/libc/sysv/errfuns/esocktnosupport.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/espipe.S b/libc/sysv/errfuns/espipe.S index 373a088447e..4b8bbd3b9ee 100644 --- a/libc/sysv/errfuns/espipe.S +++ b/libc/sysv/errfuns/espipe.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/esrch.S b/libc/sysv/errfuns/esrch.S index 91dc831d686..d7220c067cd 100644 --- a/libc/sysv/errfuns/esrch.S +++ b/libc/sysv/errfuns/esrch.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/esrmnt.S b/libc/sysv/errfuns/esrmnt.S index 109dc659ee3..3cea6826306 100644 --- a/libc/sysv/errfuns/esrmnt.S +++ b/libc/sysv/errfuns/esrmnt.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/estale.S b/libc/sysv/errfuns/estale.S index 88a27e0c8a7..8653aa5b4fe 100644 --- a/libc/sysv/errfuns/estale.S +++ b/libc/sysv/errfuns/estale.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/estrpipe.S b/libc/sysv/errfuns/estrpipe.S index 52a5c083e5c..037d0644dde 100644 --- a/libc/sysv/errfuns/estrpipe.S +++ b/libc/sysv/errfuns/estrpipe.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/etime.S b/libc/sysv/errfuns/etime.S index a0071f60076..b3f273c2509 100644 --- a/libc/sysv/errfuns/etime.S +++ b/libc/sysv/errfuns/etime.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/etimedout.S b/libc/sysv/errfuns/etimedout.S index 7787c672aae..878b9a7e946 100644 --- a/libc/sysv/errfuns/etimedout.S +++ b/libc/sysv/errfuns/etimedout.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/etoomanyrefs.S b/libc/sysv/errfuns/etoomanyrefs.S index 5e2fe7174c1..7f22e9ef67f 100644 --- a/libc/sysv/errfuns/etoomanyrefs.S +++ b/libc/sysv/errfuns/etoomanyrefs.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/etxtbsy.S b/libc/sysv/errfuns/etxtbsy.S index 672146f5814..8cf8c93fb8d 100644 --- a/libc/sysv/errfuns/etxtbsy.S +++ b/libc/sysv/errfuns/etxtbsy.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/euclean.S b/libc/sysv/errfuns/euclean.S index 891e5f8668f..80aeddd80de 100644 --- a/libc/sysv/errfuns/euclean.S +++ b/libc/sysv/errfuns/euclean.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eunatch.S b/libc/sysv/errfuns/eunatch.S index 655cfc37d01..fc675e49d31 100644 --- a/libc/sysv/errfuns/eunatch.S +++ b/libc/sysv/errfuns/eunatch.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/eusers.S b/libc/sysv/errfuns/eusers.S index de75227d87a..b6ffd4571bc 100644 --- a/libc/sysv/errfuns/eusers.S +++ b/libc/sysv/errfuns/eusers.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/exdev.S b/libc/sysv/errfuns/exdev.S index 679c3a67b36..76fb8f71f92 100644 --- a/libc/sysv/errfuns/exdev.S +++ b/libc/sysv/errfuns/exdev.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/errfuns/exfull.S b/libc/sysv/errfuns/exfull.S index fdc83132aef..2d8f37848aa 100644 --- a/libc/sysv/errfuns/exfull.S +++ b/libc/sysv/errfuns/exfull.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" .text.unlikely .ftrace1 diff --git a/libc/sysv/gen.sh b/libc/sysv/gen.sh index da514a9037d..7abdf723d57 100644 --- a/libc/sysv/gen.sh +++ b/libc/sysv/gen.sh @@ -66,7 +66,7 @@ errfun() { NAME="$1" ERRNO="$2" { - printf '#include "libc/macros.internal.h"\n.text.unlikely\n\n' + printf '#include "libc/macros.h"\n.text.unlikely\n\n' printf '\t.ftrace1\n' printf '%s:\n' "$NAME" printf '\t.ftrace2\n' diff --git a/libc/sysv/hostos.S b/libc/sysv/hostos.S index a378a5c70d4..e4550d48808 100644 --- a/libc/sysv/hostos.S +++ b/libc/sysv/hostos.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .bss .balign 8 diff --git a/libc/sysv/macros.internal.h b/libc/sysv/macros.internal.h index da2ec43d6d4..4d348d5daa3 100644 --- a/libc/sysv/macros.internal.h +++ b/libc/sysv/macros.internal.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_MACROS_H_ #define COSMOPOLITAN_LIBC_SYSV_MACROS_H_ -#include "libc/macros.internal.h" +#include "libc/macros.h" #ifdef __ASSEMBLER__ /* clang-format off */ diff --git a/libc/sysv/restorert.S b/libc/sysv/restorert.S index 864e1d5d9c5..356fa575eb5 100644 --- a/libc/sysv/restorert.S +++ b/libc/sysv/restorert.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/sysv/consts/nrlinux.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" .privileged // Linux Signal Trampoline (HOLY CODE) diff --git a/libc/sysv/syscall2.S b/libc/sysv/syscall2.S index c420783ef8e..30cf685b107 100644 --- a/libc/sysv/syscall2.S +++ b/libc/sysv/syscall2.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Invokes system call w/ arity of two. // diff --git a/libc/sysv/syscall3.S b/libc/sysv/syscall3.S index 06058bb2963..fc9ee105151 100644 --- a/libc/sysv/syscall3.S +++ b/libc/sysv/syscall3.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Invokes system call w/ arity of three. // diff --git a/libc/sysv/syscall4.S b/libc/sysv/syscall4.S index c5d37788a98..30aa9f4e3ca 100644 --- a/libc/sysv/syscall4.S +++ b/libc/sysv/syscall4.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" // Invokes system call w/ arity of four. // diff --git a/libc/sysv/syscon.S b/libc/sysv/syscon.S index 9aeae721a13..e3d6e812c5e 100644 --- a/libc/sysv/syscon.S +++ b/libc/sysv/syscon.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" // Sections for varint encoded magic numbers. // diff --git a/libc/sysv/syscount.S b/libc/sysv/syscount.S index 6ede1dc3e43..4bf4ec6d01b 100644 --- a/libc/sysv/syscount.S +++ b/libc/sysv/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.internal.h" +#include "libc/macros.h" // RII System Five system call counter. // diff --git a/libc/sysv/syslib.S b/libc/sysv/syslib.S index e9c1655880c..9c24943ad66 100644 --- a/libc/sysv/syslib.S +++ b/libc/sysv/syslib.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .bss .balign 8 diff --git a/libc/sysv/systemfive.S b/libc/sysv/systemfive.S index 879edaf053c..5fd782d62a0 100644 --- a/libc/sysv/systemfive.S +++ b/libc/sysv/systemfive.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/thread/pt.internal.h" #define SIG_IGN 1 diff --git a/libc/testlib/bench.S b/libc/testlib/bench.S index 730d0beb72e..49e1e83db91 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.internal.h" +#include "libc/macros.h" .yoink testlib_runallbenchmarks // Decentralized section for benchmark registration. diff --git a/libc/testlib/binequals.c b/libc/testlib/binequals.c index f56000a3824..79ab6c9f548 100644 --- a/libc/testlib/binequals.c +++ b/libc/testlib/binequals.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/testlib/testlib.h" /** diff --git a/libc/testlib/blake2b256_tests.S b/libc/testlib/blake2b256_tests.S index d5d600e193f..50d02704fd3 100644 --- a/libc/testlib/blake2b256_tests.S +++ b/libc/testlib/blake2b256_tests.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .rodata // Blake2B256 test vectors. diff --git a/libc/testlib/blocktronics.S b/libc/testlib/blocktronics.S index 0558036944e..dcbff573b68 100644 --- a/libc/testlib/blocktronics.S +++ b/libc/testlib/blocktronics.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .rodata // Nontrivial NUL-terminated string test vector. diff --git a/libc/testlib/ezbench.h b/libc/testlib/ezbench.h index 35fa23e3354..70bb39dd336 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.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/nexgen32e/bench.h" #include "libc/nexgen32e/x86feature.h" diff --git a/libc/testlib/fixture.S b/libc/testlib/fixture.S index 03139e2ab3b..bea3297bdc9 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.internal.h" +#include "libc/macros.h" // Decentralized section for test fixture registration. // diff --git a/libc/testlib/hexequals.c b/libc/testlib/hexequals.c index a4f8b5cf982..1fadd63edc0 100644 --- a/libc/testlib/hexequals.c +++ b/libc/testlib/hexequals.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/testlib/testlib.h" /** diff --git a/libc/testlib/hyperion.S b/libc/testlib/hyperion.S index 0e2925b5efb..66bdf3cf8cd 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.internal.h" +#include "libc/macros.h" .rodata // Nontrivial NUL-terminated string test vector. diff --git a/libc/testlib/moby.S b/libc/testlib/moby.S index aa382f5e41b..fff6bcaaac3 100644 --- a/libc/testlib/moby.S +++ b/libc/testlib/moby.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .rodata // Nontrivial NUL-terminated string test vector. diff --git a/libc/testlib/polluteregisters.S b/libc/testlib/polluteregisters.S index b26144eb41c..50cf2d5e4d2 100644 --- a/libc/testlib/polluteregisters.S +++ b/libc/testlib/polluteregisters.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/nexgen32e/x86feature.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" __polluteregisters: #ifdef __x86_64__ diff --git a/libc/testlib/subprocess.h b/libc/testlib/subprocess.h index 0d396de7530..c09ee56c098 100644 --- a/libc/testlib/subprocess.h +++ b/libc/testlib/subprocess.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_TESTLIB_SUBPROCESS_H_ #define COSMOPOLITAN_LIBC_TESTLIB_SUBPROCESS_H_ #include "libc/calls/calls.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/testlib/testlib.h" COSMOPOLITAN_C_START_ diff --git a/libc/testlib/testcase.S b/libc/testlib/testcase.S index 27252137845..46a76c3749e 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.internal.h" +#include "libc/macros.h" // Decentralized section for test testcase registration. // diff --git a/libc/testlib/testmain.c b/libc/testlib/testmain.c index e211f85642b..083a2daa2d6 100644 --- a/libc/testlib/testmain.c +++ b/libc/testlib/testmain.c @@ -32,7 +32,7 @@ #include "libc/intrin/ubsan.h" #include "libc/intrin/weaken.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/leaks.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nexgen32e.h" diff --git a/libc/testlib/testrunner.c b/libc/testlib/testrunner.c index efe4483e2c4..27ef2a63959 100644 --- a/libc/testlib/testrunner.c +++ b/libc/testlib/testrunner.c @@ -26,7 +26,7 @@ #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/process.h" #include "libc/runtime/runtime.h" #include "libc/stdio/rand.h" diff --git a/libc/testlib/viewables.S b/libc/testlib/viewables.S index aa5154a93db..f367d357790 100644 --- a/libc/testlib/viewables.S +++ b/libc/testlib/viewables.S @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" .rodata // Nontrivial NUL-terminated string test vector. diff --git a/libc/thread/makecontext.c b/libc/thread/makecontext.c index 0108979f7ec..328ff6a4eb4 100644 --- a/libc/thread/makecontext.c +++ b/libc/thread/makecontext.c @@ -23,7 +23,7 @@ #include "libc/nexgen32e/nexgen32e.h" #include "libc/nexgen32e/stackframe.h" #include "libc/runtime/runtime.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/str/str.h" #include "libc/thread/thread.h" diff --git a/libc/thread/mktls.c b/libc/thread/mktls.c index 3e461fe1786..b48ea313772 100644 --- a/libc/thread/mktls.c +++ b/libc/thread/mktls.c @@ -19,7 +19,7 @@ #include "ape/sections.internal.h" #include "libc/dce.h" #include "libc/intrin/atomic.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" diff --git a/libc/thread/pthread_create.c b/libc/thread/pthread_create.c index f44163c85e6..ec19ee9a758 100644 --- a/libc/thread/pthread_create.c +++ b/libc/thread/pthread_create.c @@ -32,7 +32,7 @@ #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" #include "libc/log/internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alloca.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" diff --git a/libc/thread/pthread_detach.c b/libc/thread/pthread_detach.c index 8c0bc0c6f3d..da41ee352bd 100644 --- a/libc/thread/pthread_detach.c +++ b/libc/thread/pthread_detach.c @@ -21,7 +21,7 @@ #include "libc/intrin/atomic.h" #include "libc/intrin/describeflags.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/thread/posixthread.internal.h" #include "libc/thread/thread.h" diff --git a/libc/thread/pthread_getattr_np.c b/libc/thread/pthread_getattr_np.c index 65f8c470aa4..7742b329ff8 100644 --- a/libc/thread/pthread_getattr_np.c +++ b/libc/thread/pthread_getattr_np.c @@ -22,7 +22,7 @@ #include "libc/intrin/atomic.h" #include "libc/intrin/maps.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" #include "libc/sysv/consts/auxv.h" diff --git a/libc/thread/pthread_getname_np.c b/libc/thread/pthread_getname_np.c index cca44d59d8d..5f31b828779 100644 --- a/libc/thread/pthread_getname_np.c +++ b/libc/thread/pthread_getname_np.c @@ -24,7 +24,7 @@ #include "libc/fmt/itoa.h" #include "libc/intrin/asmflag.h" #include "libc/intrin/atomic.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/sysv/consts/at.h" #include "libc/sysv/consts/o.h" diff --git a/libc/vga/rlinit-init-vga.S b/libc/vga/rlinit-init-vga.S index 70ff1ccb68d..6a759cb7352 100644 --- a/libc/vga/rlinit-init-vga.S +++ b/libc/vga/rlinit-init-vga.S @@ -24,7 +24,7 @@ │ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR │ │ OTHER DEALINGS IN THE SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/mman.internal.h" #include "libc/vga/vga.internal.h" diff --git a/libc/vga/rlinit-vesa.S b/libc/vga/rlinit-vesa.S index f1a91b1a098..dfa1922f8a5 100644 --- a/libc/vga/rlinit-vesa.S +++ b/libc/vga/rlinit-vesa.S @@ -25,7 +25,7 @@ │ OTHER DEALINGS IN THE SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "ape/relocations.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/mman.internal.h" #include "libc/vga/vga.internal.h" diff --git a/libc/vga/tty-graph.c b/libc/vga/tty-graph.c index 55c4c409f7b..1c2ad77df91 100644 --- a/libc/vga/tty-graph.c +++ b/libc/vga/tty-graph.c @@ -25,7 +25,7 @@ │ OTHER DEALINGS IN THE SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/newbie.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/vga/vga.internal.h" diff --git a/libc/vga/tty-graph.inc b/libc/vga/tty-graph.inc index 392e447f0ec..dc646ad2d66 100644 --- a/libc/vga/tty-graph.inc +++ b/libc/vga/tty-graph.inc @@ -25,7 +25,7 @@ │ OTHER DEALINGS IN THE SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/newbie.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdckdint.h" #include "libc/str/str.h" #include "libc/vga/vga.internal.h" diff --git a/libc/vga/tty-klog.greg.c b/libc/vga/tty-klog.greg.c index e841034b29c..35afe5380e6 100644 --- a/libc/vga/tty-klog.greg.c +++ b/libc/vga/tty-klog.greg.c @@ -25,7 +25,7 @@ │ OTHER DEALINGS IN THE SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/newbie.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/mman.internal.h" #include "libc/str/str.h" #include "libc/vga/vga.internal.h" diff --git a/libc/x/syslog.c b/libc/x/syslog.c index 8c58400166b..9d278ed8440 100644 --- a/libc/x/syslog.c +++ b/libc/x/syslog.c @@ -25,7 +25,7 @@ #include "libc/errno.h" #include "libc/intrin/safemacros.h" #include "libc/log/internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/events.h" #include "libc/nt/runtime.h" #include "libc/sock/sock.h" diff --git a/libc/zip.internal.h b/libc/zip.h similarity index 100% rename from libc/zip.internal.h rename to libc/zip.h diff --git a/net/finger/fingersyn.c b/net/finger/fingersyn.c index eb3d24fab51..e46a091e2cc 100644 --- a/net/finger/fingersyn.c +++ b/net/finger/fingersyn.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/bsr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" /** * Fingers IP+TCP SYN packet. diff --git a/net/http/base32.c b/net/http/base32.c index c9a3af12f82..3d8ed1160f9 100644 --- a/net/http/base32.c +++ b/net/http/base32.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/net/http/decodebase64.c b/net/http/decodebase64.c index a9b19288a6a..a3aeaa38dc5 100644 --- a/net/http/decodebase64.c +++ b/net/http/decodebase64.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "net/http/escape.h" diff --git a/net/http/encodeurl.c b/net/http/encodeurl.c index acb7e09d335..455a2bdc39a 100644 --- a/net/http/encodeurl.c +++ b/net/http/encodeurl.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/mem/mem.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "net/http/escape.h" #include "net/http/url.h" diff --git a/net/http/findcontenttype.c b/net/http/findcontenttype.c index 5ad6a3a818d..587a05cad37 100644 --- a/net/http/findcontenttype.c +++ b/net/http/findcontenttype.c @@ -18,10 +18,10 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/intrin/bswap.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/serialize.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "net/http/http.h" static const struct ContentTypeExtension { diff --git a/net/http/formathttpdatetime.c b/net/http/formathttpdatetime.c index 80089e3d0da..e0b6d5c1b09 100644 --- a/net/http/formathttpdatetime.c +++ b/net/http/formathttpdatetime.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/time.h" #include "net/http/http.h" diff --git a/net/http/gethttpheader.inc b/net/http/gethttpheader.inc index 72f3b7afe60..8e58c9279af 100644 --- a/net/http/gethttpheader.inc +++ b/net/http/gethttpheader.inc @@ -33,7 +33,7 @@ #line 1 "gethttpheader.gperf" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "net/http/http.h" #define GPERF_DOWNCASE #line 12 "gethttpheader.gperf" diff --git a/net/http/gethttpreason.c b/net/http/gethttpreason.c index 276a75baae5..e4492f91447 100644 --- a/net/http/gethttpreason.c +++ b/net/http/gethttpreason.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/itoa.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "net/http/http.h" static const struct thatispacked HttpReason { diff --git a/net/http/ismimetype.c b/net/http/ismimetype.c index a810a058525..17a0956d60a 100644 --- a/net/http/ismimetype.c +++ b/net/http/ismimetype.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "net/http/http.h" /** diff --git a/net/http/isnocompressext.c b/net/http/isnocompressext.c index 10b6b7e7228..49b21be2804 100644 --- a/net/http/isnocompressext.c +++ b/net/http/isnocompressext.c @@ -17,10 +17,10 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/bswap.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/serialize.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "net/http/http.h" static const char kNoCompressExts[][8] = { diff --git a/net/http/parsehttpmessage.c b/net/http/parsehttpmessage.c index 1a52fce57c8..8a0429a41c5 100644 --- a/net/http/parsehttpmessage.c +++ b/net/http/parsehttpmessage.c @@ -25,7 +25,7 @@ #include "libc/serialize.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/errfuns.h" #include "libc/x/x.h" #include "net/http/http.h" @@ -47,6 +47,7 @@ void DestroyHttpMessage(struct HttpMessage *r) { free(r->xheaders.p); r->xheaders.p = NULL; r->xheaders.n = 0; + r->xheaders.c = 0; } } diff --git a/net/http/parsehttpmethod.c b/net/http/parsehttpmethod.c index bb71041d4f4..152dadc2e41 100644 --- a/net/http/parsehttpmethod.c +++ b/net/http/parsehttpmethod.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "net/http/http.h" /** diff --git a/net/http/parsehttprange.c b/net/http/parsehttprange.c index 80aa738b7ab..4974482dc2f 100644 --- a/net/http/parsehttprange.c +++ b/net/http/parsehttprange.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdckdint.h" #include "libc/str/str.h" #include "net/http/http.h" diff --git a/net/http/parseurl.c b/net/http/parseurl.c index c967f4543f5..16ffd4b5875 100644 --- a/net/http/parseurl.c +++ b/net/http/parseurl.c @@ -20,7 +20,7 @@ #include "libc/limits.h" #include "libc/mem/mem.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/x/x.h" #include "net/http/escape.h" #include "net/http/url.h" diff --git a/net/http/unchunk.c b/net/http/unchunk.c index d3fe94bfefb..cbacd179ea0 100644 --- a/net/http/unchunk.c +++ b/net/http/unchunk.c @@ -16,9 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/errfuns.h" #include "net/http/escape.h" #include "net/http/http.h" diff --git a/net/https/describesslverifyfailure.c b/net/https/describesslverifyfailure.c index 46e0056ab75..44b22a8092a 100644 --- a/net/https/describesslverifyfailure.c +++ b/net/https/describesslverifyfailure.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "net/https/https.h" diff --git a/net/turfwar/turfwar.c b/net/turfwar/turfwar.c index 6a0b956ccb6..3a717fc5021 100644 --- a/net/turfwar/turfwar.c +++ b/net/turfwar/turfwar.c @@ -39,7 +39,7 @@ #include "libc/intrin/strace.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/mem/sortedints.internal.h" @@ -74,7 +74,7 @@ #include "libc/time.h" #include "libc/x/x.h" #include "libc/x/xasprintf.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "net/http/escape.h" #include "net/http/http.h" #include "net/http/ip.h" diff --git a/test/dsp/core/alaw_test.c b/test/dsp/core/alaw_test.c index ec434c8daf9..5f91bf1767a 100644 --- a/test/dsp/core/alaw_test.c +++ b/test/dsp/core/alaw_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/core/core.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/testlib/ezbench.h" diff --git a/test/dsp/core/getintegercoefficients_test.c b/test/dsp/core/getintegercoefficients_test.c index 4fa0e3009c7..ec7cd03e3ad 100644 --- a/test/dsp/core/getintegercoefficients_test.c +++ b/test/dsp/core/getintegercoefficients_test.c @@ -19,7 +19,7 @@ #include "dsp/core/core.h" #include "dsp/core/q.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/str/str.h" #include "libc/testlib/ezbench.h" diff --git a/test/dsp/core/mulaw_test.c b/test/dsp/core/mulaw_test.c index f19eda5c946..d2c0f286308 100644 --- a/test/dsp/core/mulaw_test.c +++ b/test/dsp/core/mulaw_test.c @@ -19,7 +19,7 @@ #include "dsp/core/core.h" #include "dsp/core/ituround.h" #include "libc/assert.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/stdio/rand.h" #include "libc/stdio/stdio.h" diff --git a/test/dsp/core/scalevolume_test.c b/test/dsp/core/scalevolume_test.c index 3940a70551b..a69d2fbf402 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.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/x86feature.h" #include "libc/stdio/rand.h" #include "libc/testlib/ezbench.h" diff --git a/test/dsp/scale/scale_test.c b/test/dsp/scale/scale_test.c index be2ae9d6e9c..b43368f43d7 100644 --- a/test/dsp/scale/scale_test.c +++ b/test/dsp/scale/scale_test.c @@ -22,7 +22,7 @@ #include "dsp/core/core.h" #include "dsp/core/half.h" #include "libc/fmt/bing.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/stdio/stdio.h" diff --git a/test/libc/calls/cachestat_test.c b/test/libc/calls/cachestat_test.c index 63c3e808859..b756d852d48 100644 --- a/test/libc/calls/cachestat_test.c +++ b/test/libc/calls/cachestat_test.c @@ -24,7 +24,7 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/runtime/runtime.h" #include "libc/runtime/sysconf.h" diff --git a/test/libc/calls/fchmodat_test.c b/test/libc/calls/fchmodat_test.c index cb6d99d403a..e103e3569a4 100644 --- a/test/libc/calls/fchmodat_test.c +++ b/test/libc/calls/fchmodat_test.c @@ -20,7 +20,7 @@ #include "libc/calls/struct/stat.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/at.h" #include "libc/sysv/consts/o.h" diff --git a/test/libc/calls/fcntl_test.c b/test/libc/calls/fcntl_test.c index 84675e66a51..d816d27fe57 100644 --- a/test/libc/calls/fcntl_test.c +++ b/test/libc/calls/fcntl_test.c @@ -22,7 +22,7 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/f.h" #include "libc/sysv/consts/fd.h" diff --git a/test/libc/calls/getcwd_test.c b/test/libc/calls/getcwd_test.c index 0cd9919a686..f76653466f5 100644 --- a/test/libc/calls/getcwd_test.c +++ b/test/libc/calls/getcwd_test.c @@ -22,7 +22,7 @@ #include "libc/errno.h" #include "libc/fmt/libgen.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/serialize.h" #include "libc/str/str.h" diff --git a/test/libc/calls/getgroups_test.c b/test/libc/calls/getgroups_test.c index 7c221e89939..e193722974d 100644 --- a/test/libc/calls/getgroups_test.c +++ b/test/libc/calls/getgroups_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/testlib/testlib.h" TEST(getgroups, test) { diff --git a/test/libc/calls/getrandom_test.c b/test/libc/calls/getrandom_test.c index 3e2386a7a4a..245fc967cec 100644 --- a/test/libc/calls/getrandom_test.c +++ b/test/libc/calls/getrandom_test.c @@ -23,7 +23,7 @@ #include "libc/calls/struct/sigset.h" #include "libc/errno.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" @@ -34,7 +34,7 @@ #include "libc/stdio/rand.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/consts/grnd.h" #include "libc/sysv/consts/sig.h" #include "libc/testlib/ezbench.h" diff --git a/test/libc/calls/lock_ofd_test.c b/test/libc/calls/lock_ofd_test.c index 4b70812995e..09c279cf250 100644 --- a/test/libc/calls/lock_ofd_test.c +++ b/test/libc/calls/lock_ofd_test.c @@ -23,7 +23,7 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/f.h" #include "libc/sysv/consts/o.h" diff --git a/test/libc/calls/lock_test.c b/test/libc/calls/lock_test.c index 5307228bec5..d05495400ef 100644 --- a/test/libc/calls/lock_test.c +++ b/test/libc/calls/lock_test.c @@ -20,7 +20,7 @@ #include "libc/calls/struct/flock.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/f.h" #include "libc/sysv/consts/o.h" diff --git a/test/libc/calls/open_test.c b/test/libc/calls/open_test.c index 230ef10b247..1962e6c078e 100644 --- a/test/libc/calls/open_test.c +++ b/test/libc/calls/open_test.c @@ -23,7 +23,7 @@ #include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/test/libc/calls/pledge_test.c b/test/libc/calls/pledge_test.c index c710147f199..d53886841d3 100644 --- a/test/libc/calls/pledge_test.c +++ b/test/libc/calls/pledge_test.c @@ -30,7 +30,7 @@ #include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" diff --git a/test/libc/calls/reservefd_test.c b/test/libc/calls/reservefd_test.c index b1013e01926..bd8c608d33a 100644 --- a/test/libc/calls/reservefd_test.c +++ b/test/libc/calls/reservefd_test.c @@ -23,7 +23,7 @@ #include "libc/calls/struct/rlimit.h" #include "libc/calls/struct/sigaction.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" #include "libc/runtime/stack.h" diff --git a/test/libc/calls/writev_test.c b/test/libc/calls/writev_test.c index c6a9a954003..834ae1a9066 100644 --- a/test/libc/calls/writev_test.c +++ b/test/libc/calls/writev_test.c @@ -21,7 +21,7 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/test/libc/fmt/formatint64thousands_test.c b/test/libc/fmt/formatint64thousands_test.c index c52389ebcce..b0b1398b60a 100644 --- a/test/libc/fmt/formatint64thousands_test.c +++ b/test/libc/fmt/formatint64thousands_test.c @@ -19,7 +19,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/stdio/stdio.h" #include "libc/testlib/ezbench.h" diff --git a/test/libc/intrin/demangle_test.c b/test/libc/intrin/demangle_test.c index 3ec28860ccf..27fce05ae3f 100644 --- a/test/libc/intrin/demangle_test.c +++ b/test/libc/intrin/demangle_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "demangle_cases.inc" #include "libc/cosmo.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdio/internal.h" #include "libc/str/str.h" diff --git a/test/libc/intrin/describeflags_test.c b/test/libc/intrin/describeflags_test.c index 14f2892a0fe..65be2c1e790 100644 --- a/test/libc/intrin/describeflags_test.c +++ b/test/libc/intrin/describeflags_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/testlib/testlib.h" static const struct DescribeFlags kFlags[] = { diff --git a/test/libc/intrin/kprintf_test.c b/test/libc/intrin/kprintf_test.c index e6d17b336b9..eeabf193ae2 100644 --- a/test/libc/intrin/kprintf_test.c +++ b/test/libc/intrin/kprintf_test.c @@ -23,7 +23,7 @@ #include "libc/intrin/kprintf.h" #include "libc/limits.h" #include "libc/log/libfatal.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/memtrack.internal.h" #include "libc/runtime/runtime.h" #include "libc/runtime/symbols.internal.h" diff --git a/test/libc/intrin/lockipc_test.c b/test/libc/intrin/lockipc_test.c index 6e9b84d526c..0f3467bc2f6 100644 --- a/test/libc/intrin/lockipc_test.c +++ b/test/libc/intrin/lockipc_test.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/errno.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/testlib/testlib.h" #include "libc/thread/thread.h" diff --git a/test/libc/intrin/magicu_test.c b/test/libc/intrin/magicu_test.c index 4a5753e2a73..351a861bb81 100644 --- a/test/libc/intrin/magicu_test.c +++ b/test/libc/intrin/magicu_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/magicu.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/testlib/ezbench.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/intrin/memmove_test.c b/test/libc/intrin/memmove_test.c index 701ef044ab5..7a4dbeb0338 100644 --- a/test/libc/intrin/memmove_test.c +++ b/test/libc/intrin/memmove_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.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/test/libc/intrin/pthread_mutex_lock_test.c b/test/libc/intrin/pthread_mutex_lock_test.c index e2e97cda120..0ee1dea0550 100644 --- a/test/libc/intrin/pthread_mutex_lock_test.c +++ b/test/libc/intrin/pthread_mutex_lock_test.c @@ -23,7 +23,7 @@ #include "libc/errno.h" #include "libc/intrin/strace.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/test/libc/intrin/rand64_test.c b/test/libc/intrin/rand64_test.c index dc0c19a4bdf..0e00626568b 100644 --- a/test/libc/intrin/rand64_test.c +++ b/test/libc/intrin/rand64_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/struct/sigaction.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/internal.h" #include "libc/stdio/rand.h" #include "libc/str/str.h" diff --git a/test/libc/intrin/strcmp_test.c b/test/libc/intrin/strcmp_test.c index 742dac914d2..c2be5af6c9a 100644 --- a/test/libc/intrin/strcmp_test.c +++ b/test/libc/intrin/strcmp_test.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/ctype.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/cachesize.h" diff --git a/test/libc/intrin/strlen_test.c b/test/libc/intrin/strlen_test.c index 87c316fa051..3d0619ee42f 100644 --- a/test/libc/intrin/strlen_test.c +++ b/test/libc/intrin/strlen_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.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/stdio/rand.h" #include "libc/stdio/stdio.h" diff --git a/test/libc/intrin/tree_test.c b/test/libc/intrin/tree_test.c index 0f9d3f04d16..7bafb37dd1c 100644 --- a/test/libc/intrin/tree_test.c +++ b/test/libc/intrin/tree_test.c @@ -17,7 +17,7 @@ #include "libc/intrin/kprintf.h" #include "libc/intrin/maps.h" #include "libc/intrin/tree.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/stdio/rand.h" diff --git a/test/libc/log/backtrace.c b/test/libc/log/backtrace.c index 4eb39eda3f7..09b858a8f91 100644 --- a/test/libc/log/backtrace.c +++ b/test/libc/log/backtrace.c @@ -20,7 +20,7 @@ #include "libc/intrin/weaken.h" #include "libc/limits.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/leaks.h" #include "libc/mem/mem.h" #include "libc/runtime/internal.h" diff --git a/test/libc/mem/djbsort_test.c b/test/libc/mem/djbsort_test.c index 3f1f9db9b6a..e4c53ff9461 100644 --- a/test/libc/mem/djbsort_test.c +++ b/test/libc/mem/djbsort_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/limits.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/test/libc/mem/malloc_test.c b/test/libc/mem/malloc_test.c index dd1908e68d3..5e69b98cab5 100644 --- a/test/libc/mem/malloc_test.c +++ b/test/libc/mem/malloc_test.c @@ -24,7 +24,7 @@ #include "libc/intrin/cxaatexit.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/safemacros.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/internal.h" diff --git a/test/libc/mem/qsort_test.c b/test/libc/mem/qsort_test.c index e693da6b684..de279d59ea3 100644 --- a/test/libc/mem/qsort_test.c +++ b/test/libc/mem/qsort_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.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/test/libc/nexgen32e/kbase36_test.c b/test/libc/nexgen32e/kbase36_test.c index aea4b995929..cd23d5fd0bd 100644 --- a/test/libc/nexgen32e/kbase36_test.c +++ b/test/libc/nexgen32e/kbase36_test.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/testlib/testlib.h" TEST(kBase36, test) { diff --git a/test/libc/nexgen32e/kcp437_test.c b/test/libc/nexgen32e/kcp437_test.c index 46ce97b078b..01845374460 100644 --- a/test/libc/nexgen32e/kcp437_test.c +++ b/test/libc/nexgen32e/kcp437_test.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/str/unicode.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/nexgen32e/memmove_test.c b/test/libc/nexgen32e/memmove_test.c index 8c54d5d08ec..92625b7689c 100644 --- a/test/libc/nexgen32e/memmove_test.c +++ b/test/libc/nexgen32e/memmove_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.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/stdio/rand.h" #include "libc/str/str.h" diff --git a/test/libc/proc/fork_test.c b/test/libc/proc/fork_test.c index 641909045f7..958fbbb2b1c 100644 --- a/test/libc/proc/fork_test.c +++ b/test/libc/proc/fork_test.c @@ -24,7 +24,7 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" diff --git a/test/libc/stdio/dtoa_test.c b/test/libc/stdio/dtoa_test.c index 738dbc8412b..7929d3daf70 100644 --- a/test/libc/stdio/dtoa_test.c +++ b/test/libc/stdio/dtoa_test.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/calls/struct/sched_param.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/test/libc/stdio/getentropy_test.c b/test/libc/stdio/getentropy_test.c index 532e6b0987f..f23ff2d4d26 100644 --- a/test/libc/stdio/getentropy_test.c +++ b/test/libc/stdio/getentropy_test.c @@ -22,13 +22,13 @@ #include "libc/calls/struct/sigset.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/stdio/rand.h" #include "libc/stdio/stdio.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/consts/sig.h" #include "libc/testlib/testlib.h" #include "libc/thread/thread.h" diff --git a/test/libc/stdio/mt19937_test.c b/test/libc/stdio/mt19937_test.c index 1da2588a91c..17de8f5ec01 100644 --- a/test/libc/stdio/mt19937_test.c +++ b/test/libc/stdio/mt19937_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/errno.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/test/libc/stdio/zipdir_test.c b/test/libc/stdio/zipdir_test.c index 83dda5aff98..141bb9ad371 100644 --- a/test/libc/stdio/zipdir_test.c +++ b/test/libc/stdio/zipdir_test.c @@ -20,7 +20,7 @@ #include "libc/calls/struct/dirent.h" #include "libc/calls/struct/stat.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/test/libc/str/blake2_test.c b/test/libc/str/blake2_test.c index 568a5d7efc1..4fe6d14272f 100644 --- a/test/libc/str/blake2_test.c +++ b/test/libc/str/blake2_test.c @@ -23,7 +23,7 @@ #include "libc/stdio/rand.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/testlib/benchmark.h" #include "libc/testlib/hyperion.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/str/hexpcpy_test.c b/test/libc/str/hexpcpy_test.c index 0a1c1c93d60..532342d64ad 100644 --- a/test/libc/str/hexpcpy_test.c +++ b/test/libc/str/hexpcpy_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.internal.h" +#include "libc/macros.h" #include "libc/stdio/rand.h" #include "libc/str/str.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/str/strcasestr_test.c b/test/libc/str/strcasestr_test.c index a4b29daff45..578e2e70e6a 100644 --- a/test/libc/str/strcasestr_test.c +++ b/test/libc/str/strcasestr_test.c @@ -22,7 +22,7 @@ #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/x86feature.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/testlib/ezbench.h" #include "libc/testlib/hyperion.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/thread/pthread_create_test.c b/test/libc/thread/pthread_create_test.c index d977dd0dc5f..03465ff9359 100644 --- a/test/libc/thread/pthread_create_test.c +++ b/test/libc/thread/pthread_create_test.c @@ -26,7 +26,7 @@ #include "libc/errno.h" #include "libc/intrin/kprintf.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nexgen32e.h" diff --git a/test/libc/tinymath/fdot_test.cc b/test/libc/tinymath/fdot_test.cc index b5b6ab6ca99..9cd724926d6 100644 --- a/test/libc/tinymath/fdot_test.cc +++ b/test/libc/tinymath/fdot_test.cc @@ -1,7 +1,7 @@ #include "libc/assert.h" #include "libc/calls/struct/timespec.h" #include "libc/intrin/bsr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/leaks.h" diff --git a/test/libc/tinymath/fsum_test.cc b/test/libc/tinymath/fsum_test.cc index 65f58b8e9df..5e51c4cc293 100644 --- a/test/libc/tinymath/fsum_test.cc +++ b/test/libc/tinymath/fsum_test.cc @@ -1,7 +1,7 @@ #include "libc/assert.h" #include "libc/calls/struct/timespec.h" #include "libc/intrin/bsr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/leaks.h" diff --git a/test/libc/tinymath/powl_test.c b/test/libc/tinymath/powl_test.c index 0c2f3bada17..8d25a718632 100644 --- a/test/libc/tinymath/powl_test.c +++ b/test/libc/tinymath/powl_test.c @@ -20,7 +20,7 @@ #include "libc/calls/struct/siginfo.h" #include "libc/calls/ucontext.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/runtime/pc.internal.h" diff --git a/test/libc/tinymath/strtod_test.c b/test/libc/tinymath/strtod_test.c index 05e46173ebb..e6a64531cfc 100644 --- a/test/libc/tinymath/strtod_test.c +++ b/test/libc/tinymath/strtod_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/fenv.h" diff --git a/test/libc/tinymath/tanh_test.c b/test/libc/tinymath/tanh_test.c index c59e5511cd0..bf30626028a 100644 --- a/test/libc/tinymath/tanh_test.c +++ b/test/libc/tinymath/tanh_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/runtime/runtime.h" diff --git a/test/libc/xed/x86ild_lib.c b/test/libc/xed/x86ild_lib.c index e7cc1b0e77e..af8d699aebd 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.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/str/str.h" #include "libc/testlib/testlib.h" diff --git a/test/net/https/mbedtls_test.c b/test/net/https/mbedtls_test.c index 34eea7401bb..992ffdf02d1 100644 --- a/test/net/https/mbedtls_test.c +++ b/test/net/https/mbedtls_test.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/bswap.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/nexgen32e/crc32.h" #include "libc/nexgen32e/nexgen32e.h" diff --git a/test/tool/net/sqlite_test.c b/test/tool/net/sqlite_test.c index 96c5bacc35e..5df4ff716d3 100644 --- a/test/tool/net/sqlite_test.c +++ b/test/tool/net/sqlite_test.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/test/tool/plinko/plinko_test.c b/test/tool/plinko/plinko_test.c index 0876632239d..aa260d554e8 100644 --- a/test/tool/plinko/plinko_test.c +++ b/test/tool/plinko/plinko_test.c @@ -20,7 +20,7 @@ #include "libc/calls/struct/sigaction.h" #include "libc/errno.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/test/tool/viz/lib/fun_test.c b/test/tool/viz/lib/fun_test.c index 11315a9dc18..a158d8e820a 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.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/stdio/rand.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 1e0f9e0e6bc..4136cf4d31e 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.internal.h" +#include "libc/macros.h" #include "libc/stdio/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 e17c68d2785..2859df2b753 100644 --- a/third_party/chibicc/as.c +++ b/third_party/chibicc/as.c @@ -24,13 +24,13 @@ #include "libc/intrin/popcnt.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/s.h" #include "libc/x/x.h" diff --git a/third_party/chibicc/chibicc.h b/third_party/chibicc/chibicc.h index 25beb34690c..aefe6592eaf 100644 --- a/third_party/chibicc/chibicc.h +++ b/third_party/chibicc/chibicc.h @@ -11,7 +11,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" #include "libc/runtime/runtime.h" diff --git a/third_party/chibicc/test/vla_test.c b/third_party/chibicc/test/vla_test.c index b5010645d07..870e04775d6 100644 --- a/third_party/chibicc/test/vla_test.c +++ b/third_party/chibicc/test/vla_test.c @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "third_party/chibicc/test/test.h" int index1d(int xn, int p[xn], int x) { diff --git a/third_party/chibicc/tokenize.c b/third_party/chibicc/tokenize.c index cc297966a7e..ea12c876599 100644 --- a/third_party/chibicc/tokenize.c +++ b/third_party/chibicc/tokenize.c @@ -2,7 +2,7 @@ #include "libc/log/log.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "third_party/chibicc/chibicc.h" #include "third_party/chibicc/file.h" #include "libc/ctype.h" diff --git a/third_party/compiler_rt/comprt.S b/third_party/compiler_rt/comprt.S index 95060b658cf..d318612046f 100644 --- a/third_party/compiler_rt/comprt.S +++ b/third_party/compiler_rt/comprt.S @@ -1,4 +1,4 @@ -#include "libc/macros.internal.h" +#include "libc/macros.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 b79113311cf..28f516f0e58 100644 --- a/third_party/dlmalloc/dlmalloc.c +++ b/third_party/dlmalloc/dlmalloc.c @@ -8,7 +8,7 @@ #include "libc/intrin/bsr.h" #include "libc/intrin/likely.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/runtime/internal.h" diff --git a/third_party/dlmalloc/threaded.inc b/third_party/dlmalloc/threaded.inc index 83d608b9bda..2454742cd0b 100644 --- a/third_party/dlmalloc/threaded.inc +++ b/third_party/dlmalloc/threaded.inc @@ -20,7 +20,7 @@ #include "libc/intrin/magicu.h" #include "libc/intrin/strace.h" #include "libc/intrin/weaken.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/rdtscp.h" #include "libc/nexgen32e/x86feature.h" #include "libc/runtime/runtime.h" diff --git a/third_party/gdtoa/misc.c b/third_party/gdtoa/misc.c index 75d3883d848..845f73223e8 100644 --- a/third_party/gdtoa/misc.c +++ b/third_party/gdtoa/misc.c @@ -30,7 +30,7 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/thread/thread.h" #include "libc/thread/tls.h" diff --git a/third_party/linenoise/linenoise.c b/third_party/linenoise/linenoise.c index 94ecebb90f7..972044bb154 100644 --- a/third_party/linenoise/linenoise.c +++ b/third_party/linenoise/linenoise.c @@ -144,7 +144,7 @@ #include "libc/intrin/strace.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/rdtsc.h" @@ -155,7 +155,7 @@ #include "libc/stdio/append.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/str/unicode.h" #include "libc/sysv/consts/fileno.h" #include "libc/sysv/consts/map.h" diff --git a/third_party/lua/lrepl.c b/third_party/lua/lrepl.c index c2253c12912..5201f1e7b8f 100644 --- a/third_party/lua/lrepl.c +++ b/third_party/lua/lrepl.c @@ -32,7 +32,7 @@ #include "libc/errno.h" #include "libc/intrin/nomultics.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/third_party/lua/luacallwithtrace.c b/third_party/lua/luacallwithtrace.c index 7dee8c79fdb..5c0ac4d9352 100644 --- a/third_party/lua/luacallwithtrace.c +++ b/third_party/lua/luacallwithtrace.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "third_party/lua/cosmo.h" #include "third_party/lua/lauxlib.h" diff --git a/third_party/lua/lunix.c b/third_party/lua/lunix.c index 8f9e8a966f6..8105cc31353 100644 --- a/third_party/lua/lunix.c +++ b/third_party/lua/lunix.c @@ -49,7 +49,7 @@ #include "libc/intrin/strace.h" #include "libc/limits.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nt/process.h" #include "libc/nt/runtime.h" diff --git a/third_party/maxmind/getmetroname.c b/third_party/maxmind/getmetroname.c index 2326f2ddb96..79a6e1ca7b8 100644 --- a/third_party/maxmind/getmetroname.c +++ b/third_party/maxmind/getmetroname.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "third_party/maxmind/maxminddb.h" const struct thatispacked MetroName { diff --git a/third_party/mbedtls/bigmul.c b/third_party/mbedtls/bigmul.c index 8d84456aeb0..2233ea644c7 100644 --- a/third_party/mbedtls/bigmul.c +++ b/third_party/mbedtls/bigmul.c @@ -17,7 +17,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/backtrace.internal.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/x86feature.h" #include "third_party/mbedtls/bignum.h" diff --git a/third_party/mbedtls/bignum.c b/third_party/mbedtls/bignum.c index 96f0eb1a12b..6bcf0f02999 100644 --- a/third_party/mbedtls/bignum.c +++ b/third_party/mbedtls/bignum.c @@ -19,7 +19,7 @@ #include "libc/serialize.h" #include "libc/intrin/bsf.h" #include "libc/intrin/bswap.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/nexgen32e.h" #include "libc/nexgen32e/x86feature.h" #include "libc/runtime/runtime.h" diff --git a/third_party/mbedtls/bigshift.c b/third_party/mbedtls/bigshift.c index d6be87e91ee..0c056a1450e 100644 --- a/third_party/mbedtls/bigshift.c +++ b/third_party/mbedtls/bigshift.c @@ -15,7 +15,7 @@ │ See the License for the specific language governing permissions and │ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "third_party/mbedtls/bignum.h" #include "third_party/mbedtls/bignum_internal.h" diff --git a/third_party/mbedtls/fastdiv.h b/third_party/mbedtls/fastdiv.h index 16d866a5c9f..df177adfdbf 100644 --- a/third_party/mbedtls/fastdiv.h +++ b/third_party/mbedtls/fastdiv.h @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_FASTDIV_H_ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_FASTDIV_H_ -#include "libc/macros.internal.h" +#include "libc/macros.h" COSMOPOLITAN_C_START_ struct Divisor { diff --git a/third_party/mbedtls/formatclientciphers.c b/third_party/mbedtls/formatclientciphers.c index 3b2b04c3ba9..392373a0c9f 100644 --- a/third_party/mbedtls/formatclientciphers.c +++ b/third_party/mbedtls/formatclientciphers.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/serialize.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/stdio/append.h" #include "third_party/mbedtls/iana.h" diff --git a/third_party/mbedtls/sha1.c b/third_party/mbedtls/sha1.c index 7507a744587..193a4c3a529 100644 --- a/third_party/mbedtls/sha1.c +++ b/third_party/mbedtls/sha1.c @@ -17,7 +17,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/mbedtls/sha1.h" #include "libc/serialize.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/sha.h" #include "libc/nexgen32e/x86feature.h" #include "libc/str/str.h" diff --git a/third_party/mbedtls/sha256.c b/third_party/mbedtls/sha256.c index 03e97901100..6112e6c773e 100644 --- a/third_party/mbedtls/sha256.c +++ b/third_party/mbedtls/sha256.c @@ -17,7 +17,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/mbedtls/sha256.h" #include "libc/dce.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/nexgen32e.h" #include "libc/nexgen32e/sha.h" #include "libc/nexgen32e/x86feature.h" diff --git a/third_party/mbedtls/sha512.c b/third_party/mbedtls/sha512.c index 82469e89319..e4c5519620d 100644 --- a/third_party/mbedtls/sha512.c +++ b/third_party/mbedtls/sha512.c @@ -17,7 +17,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/mbedtls/sha512.h" #include "libc/literal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/nexgen32e.h" #include "libc/nexgen32e/x86feature.h" #include "libc/str/str.h" diff --git a/third_party/mbedtls/sha512t.c b/third_party/mbedtls/sha512t.c index 5e473083146..33180e110a4 100644 --- a/third_party/mbedtls/sha512t.c +++ b/third_party/mbedtls/sha512t.c @@ -15,7 +15,7 @@ │ See the License for the specific language governing permissions and │ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "third_party/mbedtls/platform.h" #include "third_party/mbedtls/sha512.h" diff --git a/third_party/mbedtls/ssl_srv.c b/third_party/mbedtls/ssl_srv.c index 5b2cbe2e86a..b58d403fe02 100644 --- a/third_party/mbedtls/ssl_srv.c +++ b/third_party/mbedtls/ssl_srv.c @@ -16,7 +16,7 @@ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/time.h" #include "third_party/mbedtls/common.h" diff --git a/third_party/mbedtls/test/test.inc b/third_party/mbedtls/test/test.inc index f4a992d4e17..8c10d98da24 100644 --- a/third_party/mbedtls/test/test.inc +++ b/third_party/mbedtls/test/test.inc @@ -2,7 +2,7 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/exit.h" #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/test/lib.h" diff --git a/third_party/musl/strptime.c b/third_party/musl/strptime.c index afbad2570fe..321a14cd945 100644 --- a/third_party/musl/strptime.c +++ b/third_party/musl/strptime.c @@ -26,7 +26,7 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/ctype.h" #include "libc/str/langinfo.h" diff --git a/third_party/nsync/common.c b/third_party/nsync/common.c index 79daaf9b1e5..d5427a3bec2 100644 --- a/third_party/nsync/common.c +++ b/third_party/nsync/common.c @@ -27,8 +27,8 @@ #include "libc/nt/runtime.h" #include "libc/runtime/memtrack.internal.h" #include "libc/runtime/runtime.h" -#include "libc/stdalign.internal.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" +#include "libc/stdalign.h" #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/prot.h" #include "libc/thread/thread.h" diff --git a/third_party/nsync/compat.S b/third_party/nsync/compat.S index bcd4d8cd310..4d8f39d4dd9 100644 --- a/third_party/nsync/compat.S +++ b/third_party/nsync/compat.S @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/timespec.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" nsync_time_now: jmp timespec_real diff --git a/third_party/python/Include/pyctype.h b/third_party/python/Include/pyctype.h index 58ad51ca44c..dabcae58a0f 100644 --- a/third_party/python/Include/pyctype.h +++ b/third_party/python/Include/pyctype.h @@ -1,7 +1,7 @@ #ifndef Py_LIMITED_API #ifndef PYCTYPE_H #define PYCTYPE_H -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #define Py_TOLOWER(c) kToLower[255 & (c)] #define Py_TOUPPER(c) kToUpper[255 & (c)] diff --git a/third_party/python/Modules/_hashmbedtls.c b/third_party/python/Modules/_hashmbedtls.c index 26202c7b5ac..75db2c48202 100644 --- a/third_party/python/Modules/_hashmbedtls.c +++ b/third_party/python/Modules/_hashmbedtls.c @@ -18,7 +18,7 @@ #define PY_SSIZE_T_CLEAN #include "libc/calls/calls.h" #include "libc/log/backtrace.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/third_party/python/Modules/tlsmodule.c b/third_party/python/Modules/tlsmodule.c index 1fca255fadd..6ef1d77624f 100644 --- a/third_party/python/Modules/tlsmodule.c +++ b/third_party/python/Modules/tlsmodule.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/str/str.h" #include "net/https/https.h" diff --git a/third_party/python/Modules/tokenbucket.c b/third_party/python/Modules/tokenbucket.c index 22cd4f05a28..4f9bb7cedd7 100644 --- a/third_party/python/Modules/tokenbucket.c +++ b/third_party/python/Modules/tokenbucket.c @@ -24,7 +24,7 @@ #include "libc/calls/struct/timespec.h" #include "libc/errno.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" #include "libc/sock/struct/sockaddr.h" diff --git a/third_party/python/Python/cosmomodule.c b/third_party/python/Python/cosmomodule.c index fa82214eda8..1ce9343bda7 100644 --- a/third_party/python/Python/cosmomodule.c +++ b/third_party/python/Python/cosmomodule.c @@ -23,7 +23,7 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/popcnt.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" diff --git a/third_party/python/Python/import.c b/third_party/python/Python/import.c index 1ed177be9cd..9b8c1d723fe 100644 --- a/third_party/python/Python/import.c +++ b/third_party/python/Python/import.c @@ -10,7 +10,7 @@ #include "libc/calls/struct/stat.macros.h" #include "libc/fmt/conv.h" #include "libc/fmt/libgen.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/third_party/python/Python/random.c b/third_party/python/Python/random.c index 67390785936..8f3fc9b753d 100644 --- a/third_party/python/Python/random.c +++ b/third_party/python/Python/random.c @@ -9,7 +9,7 @@ #include "libc/calls/weirdtypes.h" #include "libc/errno.h" #include "libc/fmt/conv.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/runtime/runtime.h" #include "libc/stdio/rand.h" diff --git a/third_party/python/pyobj.c b/third_party/python/pyobj.c index 4f9def529cf..927155d3fa4 100644 --- a/third_party/python/pyobj.c +++ b/third_party/python/pyobj.c @@ -24,7 +24,7 @@ #include "libc/fmt/conv.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" @@ -35,7 +35,7 @@ #include "libc/sysv/consts/o.h" #include "libc/time.h" #include "libc/x/x.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "third_party/getopt/getopt.internal.h" #include "third_party/python/Include/abstract.h" #include "third_party/python/Include/bytesobject.h" diff --git a/third_party/python/runpythonmodule.c b/third_party/python/runpythonmodule.c index ba23daa13be..f4c41e38e77 100644 --- a/third_party/python/runpythonmodule.c +++ b/third_party/python/runpythonmodule.c @@ -16,7 +16,7 @@ #include "libc/intrin/weaken.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/third_party/stb/stb_image.c b/third_party/stb/stb_image.c index 60b55072d53..74eca24471a 100644 --- a/third_party/stb/stb_image.c +++ b/third_party/stb/stb_image.c @@ -25,7 +25,7 @@ #include "libc/limits.h" #include "libc/log/gdb.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.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 7fc71a33e1e..43fcb171010 100644 --- a/third_party/stb/stb_image_resize.c +++ b/third_party/stb/stb_image_resize.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/stb/stb_image_resize.h" #include "libc/assert.h" -#include "libc/macros.internal.h" +#include "libc/macros.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 9af55ae3681..573cb893b3e 100644 --- a/third_party/stb/stb_image_write.c +++ b/third_party/stb/stb_image_write.c @@ -21,7 +21,7 @@ #include "libc/assert.h" #include "libc/fmt/conv.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nexgen32e.h" diff --git a/third_party/stb/stb_truetype.c b/third_party/stb/stb_truetype.c index e1449c11b78..ef59f4b6a27 100644 --- a/third_party/stb/stb_truetype.c +++ b/third_party/stb/stb_truetype.c @@ -29,7 +29,7 @@ #include "libc/assert.h" #include "libc/serialize.h" #include "libc/intrin/likely.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/third_party/tree/tree.h b/third_party/tree/tree.h index f44295315d1..473d487ee99 100644 --- a/third_party/tree/tree.h +++ b/third_party/tree/tree.h @@ -20,7 +20,7 @@ #include "libc/calls/struct/stat.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #ifdef __ANDROID #define mbstowcs(w,m,x) mbsrtowcs(w,(const char**)(& #m),x,NULL) diff --git a/third_party/tz/difftime.c b/third_party/tz/difftime.c index 929dd5b14bc..33622f2ffeb 100644 --- a/third_party/tz/difftime.c +++ b/third_party/tz/difftime.c @@ -2,7 +2,7 @@ │ vi: set noet ft=c ts=8 sw=8 fenc=utf-8 :vi │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/weirdtypes.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/time.h" /* Return the difference between two timestamps. */ diff --git a/third_party/xed/x86ild.greg.c b/third_party/xed/x86ild.greg.c index fe70349e235..cf7749fdabf 100644 --- a/third_party/xed/x86ild.greg.c +++ b/third_party/xed/x86ild.greg.c @@ -21,7 +21,7 @@ #include "libc/serialize.h" #include "libc/intrin/bsr.h" #include "libc/log/libfatal.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" #include "third_party/xed/avx512.h" diff --git a/third_party/xxhash/xxhash.h b/third_party/xxhash/xxhash.h index b69ea3bad1e..a5e4fd47148 100644 --- a/third_party/xxhash/xxhash.h +++ b/third_party/xxhash/xxhash.h @@ -1203,7 +1203,7 @@ struct XXH64_state_s { #ifndef XXH_NO_XXH3 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* >= C11 */ -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" # define XXH_ALIGN(n) alignas(n) #elif defined(__cplusplus) && (__cplusplus >= 201103L) /* >= C++11 */ /* In C++ alignas() is a keyword */ diff --git a/third_party/zstd/lib/common/compiler.h b/third_party/zstd/lib/common/compiler.h index f4b6aec758e..e0aee016de1 100644 --- a/third_party/zstd/lib/common/compiler.h +++ b/third_party/zstd/lib/common/compiler.h @@ -288,7 +288,7 @@ # elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 support */ -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" # define ZSTD_ALIGNOF(T) alignof(T) # else diff --git a/third_party/zstd/lib/common/xxhash.h b/third_party/zstd/lib/common/xxhash.h index 6a4ea347b39..fa8d21d69d6 100644 --- a/third_party/zstd/lib/common/xxhash.h +++ b/third_party/zstd/lib/common/xxhash.h @@ -1019,7 +1019,7 @@ struct XXH64_state_s { #ifndef XXH_NO_XXH3 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* >= C11 */ -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" # define XXH_ALIGN(n) alignas(n) #elif defined(__cplusplus) && (__cplusplus >= 201103L) /* >= C++11 */ /* In C++ alignas() is a keyword */ diff --git a/tool/build/apelink.c b/tool/build/apelink.c index 2c707ab6139..c27a3dda2fb 100644 --- a/tool/build/apelink.c +++ b/tool/build/apelink.c @@ -21,7 +21,7 @@ #include "libc/calls/calls.h" #include "libc/ctype.h" #include "libc/dce.h" -#include "libc/dos.internal.h" +#include "libc/dos.h" #include "libc/elf/def.h" #include "libc/elf/elf.h" #include "libc/elf/scalar.h" @@ -30,8 +30,8 @@ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/limits.h" -#include "libc/macho.internal.h" -#include "libc/macros.internal.h" +#include "libc/macho.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nt/pedef.internal.h" #include "libc/nt/struct/imageimportbyname.internal.h" @@ -41,7 +41,7 @@ #include "libc/runtime/runtime.h" #include "libc/runtime/symbols.internal.h" #include "libc/serialize.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/stdckdint.h" #include "libc/stdio/stdio.h" #include "libc/str/blake2.h" @@ -49,7 +49,7 @@ #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/prot.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "third_party/getopt/getopt.internal.h" #include "third_party/zlib/zlib.h" #include "tool/build/lib/lib.h" diff --git a/tool/build/ar.c b/tool/build/ar.c index 616ee56dd0b..640b342e34a 100644 --- a/tool/build/ar.c +++ b/tool/build/ar.c @@ -31,7 +31,7 @@ #include "libc/fmt/magnumstrs.internal.h" #include "libc/intrin/bsr.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/serialize.h" #include "libc/stdckdint.h" diff --git a/tool/build/assimilate.c b/tool/build/assimilate.c index 8c6d4c1cff5..02babe0b5bf 100644 --- a/tool/build/assimilate.c +++ b/tool/build/assimilate.c @@ -25,8 +25,8 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/limits.h" -#include "libc/macho.internal.h" -#include "libc/macros.internal.h" +#include "libc/macho.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/serialize.h" #include "libc/stdckdint.h" diff --git a/tool/build/bigmul.c b/tool/build/bigmul.c index 3329555273d..181f32df4aa 100644 --- a/tool/build/bigmul.c +++ b/tool/build/bigmul.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/fmt/conv.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/stdio/stdio.h" diff --git a/tool/build/compile.c b/tool/build/compile.c index 62c44d41cbf..37406b7919c 100644 --- a/tool/build/compile.c +++ b/tool/build/compile.c @@ -38,7 +38,7 @@ #include "libc/log/appendresourcereport.internal.h" #include "libc/log/color.internal.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/alg.h" #include "libc/mem/gc.h" diff --git a/tool/build/elf2pe.c b/tool/build/elf2pe.c index b1508a92679..485ada10990 100644 --- a/tool/build/elf2pe.c +++ b/tool/build/elf2pe.c @@ -29,7 +29,7 @@ #include "libc/intrin/dll.h" #include "libc/intrin/kprintf.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nt/pedef.internal.h" #include "libc/nt/struct/imagedatadirectory.internal.h" diff --git a/tool/build/fixupobj.c b/tool/build/fixupobj.c index 570cd3e4ca1..09d1625b6a2 100644 --- a/tool/build/fixupobj.c +++ b/tool/build/fixupobj.c @@ -31,12 +31,12 @@ #include "libc/fmt/magnumstrs.internal.h" #include "libc/limits.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/serialize.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/stdckdint.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" @@ -44,7 +44,7 @@ #include "libc/sysv/consts/msync.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/prot.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "third_party/getopt/getopt.internal.h" /** diff --git a/tool/build/helpop.c b/tool/build/helpop.c index 9da096ca6fa..e5e0297c3ac 100644 --- a/tool/build/helpop.c +++ b/tool/build/helpop.c @@ -19,7 +19,7 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/intrin/safemacros.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/tool/build/killall.c b/tool/build/killall.c index 75a41e5c7b4..5ebb613973c 100644 --- a/tool/build/killall.c +++ b/tool/build/killall.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nt/enum/formatmessageflags.h" #include "libc/nt/enum/lang.h" diff --git a/tool/build/lib/buffer.c b/tool/build/lib/buffer.c index 037047f6615..5fe539a56bb 100644 --- a/tool/build/lib/buffer.c +++ b/tool/build/lib/buffer.c @@ -19,7 +19,7 @@ #include "tool/build/lib/buffer.h" #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/arraylist2.internal.h" #include "libc/mem/mem.h" #include "libc/stdio/stdio.h" diff --git a/tool/build/lib/elfwriter.c b/tool/build/lib/elfwriter.c index 46cdd0341cf..32572c773fd 100644 --- a/tool/build/lib/elfwriter.c +++ b/tool/build/lib/elfwriter.c @@ -26,7 +26,7 @@ #include "libc/mem/mem.h" #include "libc/runtime/memtrack.internal.h" #include "libc/runtime/runtime.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/str/str.h" #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/msync.h" diff --git a/tool/build/lib/elfwriter_zip.c b/tool/build/lib/elfwriter_zip.c index 991d7a880d4..88677803828 100644 --- a/tool/build/lib/elfwriter_zip.c +++ b/tool/build/lib/elfwriter_zip.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/dos.internal.h" +#include "libc/dos.h" #include "libc/elf/def.h" #include "libc/fmt/wintime.internal.h" #include "libc/limits.h" @@ -33,7 +33,7 @@ #include "libc/time.h" #include "libc/x/x.h" #include "libc/x/xasprintf.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "net/http/http.h" #include "third_party/zlib/zlib.h" #include "tool/build/lib/elfwriter.h" diff --git a/tool/build/lib/eztls.c b/tool/build/lib/eztls.c index 754d1a53374..0e5de53efa8 100644 --- a/tool/build/lib/eztls.c +++ b/tool/build/lib/eztls.c @@ -24,7 +24,7 @@ #include "libc/fmt/itoa.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/strace.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/sysv/consts/sig.h" #include "libc/thread/thread.h" #include "libc/x/x.h" diff --git a/tool/build/lib/getargs.c b/tool/build/lib/getargs.c index 3e31da96b9b..faf5fe68dbc 100644 --- a/tool/build/lib/getargs.c +++ b/tool/build/lib/getargs.c @@ -21,7 +21,7 @@ #include "libc/calls/calls.h" #include "libc/errno.h" #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/runtime/sysconf.h" #include "libc/stdio/stdio.h" diff --git a/tool/build/lz4toasm.c b/tool/build/lz4toasm.c index b13a1692629..b7a8943aa71 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.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/kompressor.h" @@ -29,7 +29,7 @@ #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/x/x.h" #include "third_party/getopt/getopt.internal.h" @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) { fprintf(fout, "/\t%s -o %s -s %s %s\n" - "#include \"libc/macros.internal.h\"\n" + "#include \"libc/macros.h\"\n" "\n", argv[0], outpath, symbol, lz4path); diff --git a/tool/build/mkdeps.c b/tool/build/mkdeps.c index baa6ba84397..1a17eb9df8c 100644 --- a/tool/build/mkdeps.c +++ b/tool/build/mkdeps.c @@ -24,7 +24,7 @@ #include "libc/fmt/magnumstrs.internal.h" #include "libc/intrin/kprintf.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" @@ -33,7 +33,7 @@ #include "libc/stdio/append.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/prot.h" diff --git a/tool/build/objbincopy.c b/tool/build/objbincopy.c index ce08d0aed92..42427c22663 100644 --- a/tool/build/objbincopy.c +++ b/tool/build/objbincopy.c @@ -21,8 +21,8 @@ #include "libc/elf/elf.h" #include "libc/elf/struct/ehdr.h" #include "libc/intrin/kprintf.h" -#include "libc/macho.internal.h" -#include "libc/macros.internal.h" +#include "libc/macho.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/stdio/rand.h" #include "libc/stdio/stdio.h" diff --git a/tool/build/package.c b/tool/build/package.c index 57b5de82a30..0c88b4c2dc5 100644 --- a/tool/build/package.c +++ b/tool/build/package.c @@ -30,7 +30,7 @@ #include "libc/intrin/bswap.h" #include "libc/intrin/kprintf.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/alg.h" #include "libc/mem/arraylist.internal.h" #include "libc/mem/mem.h" diff --git a/tool/build/pledge.c b/tool/build/pledge.c index f77306629eb..78f5527d5c0 100644 --- a/tool/build/pledge.c +++ b/tool/build/pledge.c @@ -42,7 +42,7 @@ #include "libc/intrin/promises.h" #include "libc/intrin/safemacros.h" #include "libc/limits.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/alloca.h" #include "libc/nexgen32e/kcpuids.h" diff --git a/tool/build/runitd.c b/tool/build/runitd.c index 57787677275..4f512b69aa0 100644 --- a/tool/build/runitd.c +++ b/tool/build/runitd.c @@ -33,7 +33,7 @@ #include "libc/intrin/kprintf.h" #include "libc/log/appendresourcereport.internal.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/leaks.h" #include "libc/mem/mem.h" diff --git a/tool/build/sha256sum.c b/tool/build/sha256sum.c index 36967612731..50f46179174 100644 --- a/tool/build/sha256sum.c +++ b/tool/build/sha256sum.c @@ -25,7 +25,7 @@ #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "third_party/getopt/getopt.internal.h" #include "third_party/mbedtls/sha256.h" diff --git a/tool/build/zipcopy.c b/tool/build/zipcopy.c index 125ab57aeb7..9f3aa8fd0df 100644 --- a/tool/build/zipcopy.c +++ b/tool/build/zipcopy.c @@ -32,7 +32,7 @@ #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/prot.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "third_party/getopt/getopt.internal.h" static int infd; diff --git a/tool/build/zipobj.c b/tool/build/zipobj.c index 37cb3ef89de..007bbfa7a65 100644 --- a/tool/build/zipobj.c +++ b/tool/build/zipobj.c @@ -39,7 +39,7 @@ #include "libc/sysv/consts/s.h" #include "libc/time.h" #include "libc/x/x.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "third_party/getopt/getopt.internal.h" #include "tool/build/lib/elfwriter.h" #include "tool/build/lib/stripcomponents.h" diff --git a/tool/curl/curl.c b/tool/curl/curl.c index c3581295568..c108f0928b8 100644 --- a/tool/curl/curl.c +++ b/tool/curl/curl.c @@ -14,7 +14,7 @@ #include "libc/errno.h" #include "libc/fmt/itoa.h" #include "libc/fmt/magnumstrs.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/tool/decode/elf.c b/tool/decode/elf.c index 4db9e45abad..2d62bab2ec8 100644 --- a/tool/decode/elf.c +++ b/tool/decode/elf.c @@ -29,7 +29,7 @@ #include "libc/intrin/safemacros.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/tool/decode/lib/bitabuilder.c b/tool/decode/lib/bitabuilder.c index 9fa598a817b..f57a2d7cde0 100644 --- a/tool/decode/lib/bitabuilder.c +++ b/tool/decode/lib/bitabuilder.c @@ -20,7 +20,7 @@ #include "libc/assert.h" #include "libc/limits.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/tool/decode/lib/disassemblehex.c b/tool/decode/lib/disassemblehex.c index afa90125995..d9859d890d7 100644 --- a/tool/decode/lib/disassemblehex.c +++ b/tool/decode/lib/disassemblehex.c @@ -19,7 +19,7 @@ #include "tool/decode/lib/disassemblehex.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" static size_t countzeroes(const uint8_t *data, size_t size) { size_t i; diff --git a/tool/decode/lib/machoidnames.c b/tool/decode/lib/machoidnames.c index b2b1c5eccd9..0755f31e3dd 100644 --- a/tool/decode/lib/machoidnames.c +++ b/tool/decode/lib/machoidnames.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "tool/decode/lib/machoidnames.h" -#include "libc/macho.internal.h" +#include "libc/macho.h" const struct IdName kMachoArchitectures[] = { {MAC_CPU_MC680x0, "MAC_CPU_MC680x0"}, // diff --git a/tool/decode/lib/zipnames.c b/tool/decode/lib/zipnames.c index a5d834ff467..ae5ec5bcc5e 100644 --- a/tool/decode/lib/zipnames.c +++ b/tool/decode/lib/zipnames.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "tool/decode/lib/zipnames.h" #include "libc/nt/enum/fileflagandattributes.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" const struct IdName kZipCompressionNames[] = { {kZipCompressionNone, "kZipCompressionNone"}, diff --git a/tool/decode/macho.c b/tool/decode/macho.c index 9f358aaef07..b177d13aa46 100644 --- a/tool/decode/macho.c +++ b/tool/decode/macho.c @@ -22,13 +22,13 @@ #include "libc/fmt/conv.h" #include "libc/fmt/libgen.h" #include "libc/intrin/safemacros.h" -#include "libc/macho.internal.h" +#include "libc/macho.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/prot.h" @@ -48,7 +48,7 @@ static size_t machosize; static void startfile(void) { showtitle("αcτµαlly pδrταblε εxεcµταblε", "tool/decode/macho", NULL, NULL, &kModelineAsm); - printf("#include \"libc/macho.internal.h\"\n\n", path); + printf("#include \"libc/macho.h\"\n\n", path); } static void showmachoheader(void) { diff --git a/tool/decode/unhex.c b/tool/decode/unhex.c index c29e094aa2e..9440d5627a4 100644 --- a/tool/decode/unhex.c +++ b/tool/decode/unhex.c @@ -8,7 +8,7 @@ #include "libc/calls/calls.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * @fileoverview Hex to binary converter program. diff --git a/tool/decode/x86opinfo.c b/tool/decode/x86opinfo.c index 6b741c3049d..ee2d0bb111d 100644 --- a/tool/decode/x86opinfo.c +++ b/tool/decode/x86opinfo.c @@ -18,11 +18,11 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/ctype.h" #include "libc/errno.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/consts/ex.h" #include "libc/sysv/consts/exit.h" #include "third_party/getopt/getopt.internal.h" diff --git a/tool/decode/zip.c b/tool/decode/zip.c index 96a88ab2ec1..1d5d30ede96 100644 --- a/tool/decode/zip.c +++ b/tool/decode/zip.c @@ -39,7 +39,7 @@ #include "libc/sysv/consts/prot.h" #include "libc/time.h" #include "libc/x/xasprintf.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "tool/decode/lib/asmcodegen.h" #include "tool/decode/lib/disassemblehex.h" #include "tool/decode/lib/flagger.h" diff --git a/tool/net/getadaptersaddresses.c b/tool/net/getadaptersaddresses.c index 91ddbfa9498..8dea1ab9796 100644 --- a/tool/net/getadaptersaddresses.c +++ b/tool/net/getadaptersaddresses.c @@ -35,7 +35,7 @@ #include "libc/serialize.h" #include "libc/sock/sock.h" #include "libc/sock/struct/sockaddr6.h" -#include "libc/stdalign.internal.h" +#include "libc/stdalign.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" #include "libc/sysv/consts/af.h" diff --git a/tool/net/lfuncs.c b/tool/net/lfuncs.c index 798099c7db0..01b3ce19a4a 100644 --- a/tool/net/lfuncs.c +++ b/tool/net/lfuncs.c @@ -30,7 +30,7 @@ #include "libc/intrin/popcnt.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" @@ -45,7 +45,7 @@ #include "libc/str/highwayhash64.h" #include "libc/str/str.h" #include "libc/str/strwidth.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/consts/af.h" #include "libc/sysv/consts/ipproto.h" #include "libc/sysv/consts/o.h" diff --git a/tool/net/ljson.c b/tool/net/ljson.c index a3c73616caa..037cd097be7 100644 --- a/tool/net/ljson.c +++ b/tool/net/ljson.c @@ -27,7 +27,7 @@ #include "libc/serialize.h" #include "libc/stdckdint.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/str/utf16.h" #include "libc/sysv/consts/auxv.h" #include "libc/thread/thread.h" diff --git a/tool/net/lre.c b/tool/net/lre.c index e24648e2985..598b5b4b612 100644 --- a/tool/net/lre.c +++ b/tool/net/lre.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "third_party/lua/lauxlib.h" #include "third_party/regex/regex.h" diff --git a/tool/net/redbean.c b/tool/net/redbean.c index 0eec73175be..fe2080c32d9 100644 --- a/tool/net/redbean.c +++ b/tool/net/redbean.c @@ -33,7 +33,7 @@ #include "libc/calls/termios.h" #include "libc/ctype.h" #include "libc/dce.h" -#include "libc/dos.internal.h" +#include "libc/dos.h" #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" @@ -46,7 +46,7 @@ #include "libc/log/appendresourcereport.internal.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/alloca.h" #include "libc/mem/gc.h" @@ -104,7 +104,7 @@ #include "libc/thread/tls.h" #include "libc/x/x.h" #include "libc/x/xasprintf.h" -#include "libc/zip.internal.h" +#include "libc/zip.h" #include "net/http/escape.h" #include "net/http/http.h" #include "net/http/ip.h" diff --git a/tool/net/winbench.c b/tool/net/winbench.c index ea806370981..f54547d9756 100644 --- a/tool/net/winbench.c +++ b/tool/net/winbench.c @@ -16,7 +16,7 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/intrin/kprintf.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nt/accounting.h" #include "libc/nt/enum/wsaid.h" diff --git a/tool/plinko/lib/gc.c b/tool/plinko/lib/gc.c index 08ef948a8f8..33e320eb45f 100644 --- a/tool/plinko/lib/gc.c +++ b/tool/plinko/lib/gc.c @@ -24,7 +24,7 @@ #include "libc/log/check.h" #include "libc/log/countbranch.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "tool/plinko/lib/cons.h" diff --git a/tool/plinko/lib/histo.h b/tool/plinko/lib/histo.h index 4cdc63904b4..10025713e84 100644 --- a/tool/plinko/lib/histo.h +++ b/tool/plinko/lib/histo.h @@ -1,7 +1,7 @@ #ifndef COSMOPOLITAN_TOOL_PLINKO_LIB_HISTO_H_ #define COSMOPOLITAN_TOOL_PLINKO_LIB_HISTO_H_ #include "libc/intrin/bsr.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" COSMOPOLITAN_C_START_ #define HISTO(H, X) \ diff --git a/tool/plinko/lib/iswide.c b/tool/plinko/lib/iswide.c index f458bfad56b..dcad18abf4f 100644 --- a/tool/plinko/lib/iswide.c +++ b/tool/plinko/lib/iswide.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "tool/plinko/lib/char.h" static const unsigned short kWides[][2] = { diff --git a/tool/plinko/lib/plinko.c b/tool/plinko/lib/plinko.c index 181c3b83811..00bb69622cc 100644 --- a/tool/plinko/lib/plinko.c +++ b/tool/plinko/lib/plinko.c @@ -26,7 +26,7 @@ #include "libc/log/countbranch.h" #include "libc/log/countexpr.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/runtime/runtime.h" #include "libc/runtime/stack.h" diff --git a/tool/viz/bin2asm.c b/tool/viz/bin2asm.c index 37496fd933a..99c785e5e6b 100644 --- a/tool/viz/bin2asm.c +++ b/tool/viz/bin2asm.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #define COLS 8 diff --git a/tool/viz/bing.c b/tool/viz/bing.c index 1ded5fa491c..750d0f0324c 100644 --- a/tool/viz/bing.c +++ b/tool/viz/bing.c @@ -22,7 +22,7 @@ #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/sysv/consts/ex.h" #include "libc/sysv/consts/exit.h" #include "libc/sysv/consts/fileno.h" diff --git a/tool/viz/derasterize.c b/tool/viz/derasterize.c index 478ec1dc89e..abd98219751 100644 --- a/tool/viz/derasterize.c +++ b/tool/viz/derasterize.c @@ -25,7 +25,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/tool/viz/dumphexc.c b/tool/viz/dumphexc.c index d7f40a9530f..095b7804d76 100644 --- a/tool/viz/dumphexc.c +++ b/tool/viz/dumphexc.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/stdio/append.h" #include "libc/stdio/hex.internal.h" diff --git a/tool/viz/fontspace.c b/tool/viz/fontspace.c index 875a7364851..7e81629c85e 100644 --- a/tool/viz/fontspace.c +++ b/tool/viz/fontspace.c @@ -24,7 +24,7 @@ #include "libc/intrin/bsr.h" #include "libc/log/libfatal.internal.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/tool/viz/getglyph.c b/tool/viz/getglyph.c index 4a7d30f68ed..4c2a3b5f362 100644 --- a/tool/viz/getglyph.c +++ b/tool/viz/getglyph.c @@ -20,7 +20,7 @@ #include "libc/fmt/conv.h" #include "libc/limits.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/stdio/append.h" diff --git a/tool/viz/lib/bilinearscale.c b/tool/viz/lib/bilinearscale.c index fd58723a9a5..586e848bd63 100644 --- a/tool/viz/lib/bilinearscale.c +++ b/tool/viz/lib/bilinearscale.c @@ -21,7 +21,7 @@ #include "libc/intrin/bsr.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/tool/viz/lib/dither.c b/tool/viz/lib/dither.c index d61a390492c..dcb43ea7d34 100644 --- a/tool/viz/lib/dither.c +++ b/tool/viz/lib/dither.c @@ -20,7 +20,7 @@ #include "libc/intrin/hilbert.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/tool/viz/lib/doublechrominance.S b/tool/viz/lib/doublechrominance.S index b316fb9b17c..0db0eb34374 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.internal.h" +#include "libc/macros.h" // Duplicates chrominance samples horizontally, e.g. // diff --git a/tool/viz/lib/formatstringtable-testlib.h b/tool/viz/lib/formatstringtable-testlib.h index b4eb037c660..1b884965e00 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.internal.h" +#include "libc/macros.h" #include "libc/str/str.h" #include "libc/testlib/testlib.h" #include "tool/viz/lib/formatstringtable.h" diff --git a/tool/viz/lib/gaussian.c b/tool/viz/lib/gaussian.c index fb1cd87a89c..c737b224027 100644 --- a/tool/viz/lib/gaussian.c +++ b/tool/viz/lib/gaussian.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.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 52908f3ab92..0f00469e876 100644 --- a/tool/viz/lib/getxtermcodes.c +++ b/tool/viz/lib/getxtermcodes.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/quant.h" -#include "libc/macros.internal.h" +#include "libc/macros.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 138296e1142..f9f81e9c966 100644 --- a/tool/viz/lib/perlin3.c +++ b/tool/viz/lib/perlin3.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" +#include "libc/macros.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 eec139e4d33..c7958653729 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.internal.h" +#include "libc/macros.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 a6acf15b0fe..1f83878ee7d 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.internal.h" +#include "libc/macros.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 f9419a41e06..85906bf8b7f 100644 --- a/tool/viz/lib/stringbuilder.c +++ b/tool/viz/lib/stringbuilder.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "tool/viz/lib/stringbuilder.h" #include "libc/log/check.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "libc/x/x.h" diff --git a/tool/viz/lib/unsharp.c b/tool/viz/lib/unsharp.c index 8bd6f272c46..4514f8265b2 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.internal.h" +#include "libc/macros.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 f46d95387a5..9a2b7a1164e 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.internal.h" +#include "libc/macros.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 96d7d52ff52..958c5ef1e0a 100644 --- a/tool/viz/lib/ycbcr2rgb3.c +++ b/tool/viz/lib/ycbcr2rgb3.c @@ -33,7 +33,7 @@ #include "libc/intrin/pmulhrsw.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/tool/viz/life.c b/tool/viz/life.c index 8ca83fb8bf4..389132dffb7 100644 --- a/tool/viz/life.c +++ b/tool/viz/life.c @@ -32,7 +32,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nt2sysv.h" #include "libc/nt/comdlg.h" diff --git a/tool/viz/memzoom.c b/tool/viz/memzoom.c index e3f16a046eb..67afb55e277 100644 --- a/tool/viz/memzoom.c +++ b/tool/viz/memzoom.c @@ -36,13 +36,13 @@ #include "libc/intrin/safemacros.h" #include "libc/limits.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" #include "libc/sock/struct/pollfd.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" #include "libc/str/unicode.h" #include "libc/sysv/consts/ex.h" #include "libc/sysv/consts/exit.h" diff --git a/tool/viz/printansi.c b/tool/viz/printansi.c index 849242540ce..900dd8b3af3 100644 --- a/tool/viz/printansi.c +++ b/tool/viz/printansi.c @@ -33,7 +33,7 @@ #include "libc/limits.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/tool/viz/printvideo.c b/tool/viz/printvideo.c index 04c7da6b6c0..c63368f4119 100644 --- a/tool/viz/printvideo.c +++ b/tool/viz/printvideo.c @@ -47,7 +47,7 @@ #include "libc/intrin/xchg.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/math.h" #include "libc/mem/alg.h" #include "libc/mem/arraylist.internal.h" diff --git a/tool/viz/rlimit.c b/tool/viz/rlimit.c index cc7821c3c0e..1e4296b26d6 100644 --- a/tool/viz/rlimit.c +++ b/tool/viz/rlimit.c @@ -13,7 +13,7 @@ #include "libc/intrin/describeflags.h" #include "libc/intrin/strace.h" #include "libc/log/color.internal.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/tool/viz/tailf.c b/tool/viz/tailf.c index ed420d23e30..b2f7bb5d397 100644 --- a/tool/viz/tailf.c +++ b/tool/viz/tailf.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/intrin/safemacros.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" diff --git a/tool/viz/unbing.c b/tool/viz/unbing.c index fc5074eb440..cbf6de954e4 100644 --- a/tool/viz/unbing.c +++ b/tool/viz/unbing.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "libc/str/tab.internal.h" +#include "libc/str/tab.h" /** * @fileoverview UnBing: Glyphs → Binary. diff --git a/tool/viz/virtualquery.c b/tool/viz/virtualquery.c index e1ce16cc1c5..27e0fc9e0bf 100644 --- a/tool/viz/virtualquery.c +++ b/tool/viz/virtualquery.c @@ -20,7 +20,7 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/intrin/describeflags.h" -#include "libc/macros.internal.h" +#include "libc/macros.h" #include "libc/nt/enum/memflags.h" #include "libc/nt/memory.h" #include "libc/nt/struct/memorybasicinformation.h"