From fa20edc44d187848e47aad30b7fa4689ba38dc37 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Tue, 28 Nov 2023 14:24:28 -0800 Subject: [PATCH] Reduce header complexity - Remove most __ASSEMBLER__ __LINKER__ ifdefs - Rename libc/intrin/bits.h to libc/serialize.h - Block pthread cancelation in fchmodat() polyfill - Remove `clang-format off` statements in third_party --- Makefile | 3 + ape/BUILD.mk | 2 - ape/sections.internal.h | 2 - dsp/core/c11.h | 2 - dsp/core/c121.h | 2 - dsp/core/c121s.h | 2 - dsp/core/c1331.h | 2 - dsp/core/c1331s.h | 2 - dsp/core/c161.h | 2 - dsp/core/c161s.h | 2 - dsp/core/c331.h | 2 - dsp/core/gamma.h | 2 - dsp/core/half.h | 2 - dsp/core/illumination.h | 2 - dsp/core/ituround.h | 2 - dsp/core/ks8.h | 2 - dsp/core/kss8.h | 2 - dsp/core/q.h | 2 - dsp/core/scalevolume.c | 1 - dsp/core/twixt8.h | 2 - dsp/mpeg/blockset.h | 2 - dsp/mpeg/buffer.h | 2 - dsp/mpeg/demux.h | 2 - dsp/mpeg/idct.h | 2 - dsp/mpeg/mpeg.h | 2 - dsp/mpeg/video.h | 2 - dsp/scale/cdecimate2xuint8x8.h | 2 - dsp/scale/scale.h | 2 - dsp/tty/internal.h | 2 - dsp/tty/itoa8.c | 1 - dsp/tty/itoa8.h | 2 - dsp/tty/quant.h | 3 - dsp/tty/tty.h | 2 - dsp/tty/ttyraster.c | 1 - dsp/tty/ttyrgb.h | 2 - dsp/tty/windex.h | 2 - dsp/tty/xtermname.h | 2 - examples/nesemu1.cc | 1 - examples/package/lib/myprint.h | 2 - libc/ar.h | 2 - libc/calls/asan.internal.h | 2 - libc/calls/blockcancel.internal.h | 2 - libc/calls/cachestat.h | 2 - libc/calls/calls.h | 2 - libc/calls/cp.internal.h | 2 - libc/calls/fchmodat.c | 3 + libc/calls/finddebugbinary.c | 2 +- libc/calls/getprogramexecutablename.greg.c | 2 +- libc/calls/getrandom.c | 1 - libc/calls/groups.internal.h | 2 - libc/calls/internal.h | 2 - libc/calls/ioctl.c | 4 +- libc/calls/ipc.h | 2 - libc/calls/isapemagic.c | 4 +- libc/calls/landlock.h | 2 - libc/calls/makedev.h | 2 - libc/calls/mkdtemp.c | 2 +- libc/calls/mount.h | 2 - libc/calls/openatemp.c | 2 +- libc/calls/openbsd.internal.h | 2 - libc/calls/pledge.h | 2 - libc/calls/pledge.internal.h | 2 - libc/calls/poll-nt.c | 1 - libc/calls/prctl.internal.h | 2 - libc/calls/sched-sysv.internal.h | 2 - libc/calls/sig.internal.h | 2 - libc/calls/sigaction.c | 1 - libc/calls/sigtimedwait.h | 2 - libc/calls/sigtimedwait.internal.h | 2 - libc/calls/state.internal.h | 2 - libc/calls/struct/aarch64.internal.h | 2 - libc/calls/struct/bpf.internal.h | 2 - libc/calls/struct/cpuset.h | 2 - libc/calls/struct/dirent.h | 2 - libc/calls/struct/fd.internal.h | 2 - libc/calls/struct/filter.internal.h | 2 - libc/calls/struct/flock.h | 2 - libc/calls/struct/flock.internal.h | 2 - libc/calls/struct/framebuffercolormap.h | 2 - .../calls/struct/framebufferfixedscreeninfo.h | 2 - .../struct/framebuffervirtualscreeninfo.h | 2 - libc/calls/struct/fsid.h | 2 - libc/calls/struct/iovec.h | 2 - libc/calls/struct/iovec.internal.h | 2 - libc/calls/struct/itimerval.h | 2 - libc/calls/struct/itimerval.internal.h | 2 - libc/calls/struct/metasigaltstack.h | 2 - libc/calls/struct/metastat.internal.h | 2 - libc/calls/struct/metatermios.internal.h | 2 - libc/calls/struct/rlimit.h | 2 - libc/calls/struct/rlimit.internal.h | 2 - libc/calls/struct/rusage.h | 2 - libc/calls/struct/rusage.internal.h | 2 - libc/calls/struct/sched_param.h | 2 - libc/calls/struct/sched_param.internal.h | 2 - libc/calls/struct/seccomp.internal.h | 2 - libc/calls/struct/sigaction.h | 2 - libc/calls/struct/sigaction.internal.h | 2 - libc/calls/struct/sigaltstack.h | 2 - libc/calls/struct/sigaltstack.internal.h | 2 - libc/calls/struct/siginfo-freebsd.internal.h | 2 - libc/calls/struct/siginfo-meta.internal.h | 2 - libc/calls/struct/siginfo-netbsd.internal.h | 2 - libc/calls/struct/siginfo-openbsd.internal.h | 2 - libc/calls/struct/siginfo-xnu.internal.h | 2 - libc/calls/struct/siginfo.h | 2 - libc/calls/struct/siginfo.internal.h | 2 - libc/calls/struct/sigset.h | 2 - libc/calls/struct/sigset.internal.h | 2 - libc/calls/struct/sigval.h | 2 - libc/calls/struct/sigval.internal.h | 2 - libc/calls/struct/stat.h | 2 - libc/calls/struct/stat.internal.h | 2 - libc/calls/struct/statfs-freebsd.internal.h | 2 - libc/calls/struct/statfs-linux.internal.h | 2 - libc/calls/struct/statfs-meta.internal.h | 2 - libc/calls/struct/statfs-netbsd.internal.h | 2 - libc/calls/struct/statfs-openbsd.internal.h | 2 - libc/calls/struct/statfs-xnu.internal.h | 2 - libc/calls/struct/statfs.h | 2 - libc/calls/struct/statfs.internal.h | 2 - libc/calls/struct/statvfs.h | 2 - libc/calls/struct/sysinfo.h | 2 - libc/calls/struct/sysinfo.internal.h | 2 - libc/calls/struct/termios.h | 2 - libc/calls/struct/termios.internal.h | 2 - libc/calls/struct/timespec.internal.h | 2 - libc/calls/struct/timeval.h | 2 - libc/calls/struct/timeval.internal.h | 2 - libc/calls/struct/tms.h | 2 - libc/calls/struct/ucontext-freebsd.internal.h | 2 - libc/calls/struct/ucontext-netbsd.internal.h | 2 - libc/calls/struct/ucontext-openbsd.internal.h | 2 - libc/calls/struct/ucontext.internal.h | 2 - libc/calls/struct/user_regs_struct.h | 2 - libc/calls/struct/utsname-linux.internal.h | 2 - libc/calls/struct/utsname.h | 2 - libc/calls/struct/winsize.h | 2 - libc/calls/struct/winsize.internal.h | 2 - libc/calls/syscall-nt.internal.h | 2 - libc/calls/syscall-sysv.internal.h | 2 - libc/calls/syscall_support-nt.internal.h | 2 - libc/calls/syscall_support-sysv.internal.h | 2 - libc/calls/termios.h | 2 - libc/calls/typedef/u.h | 2 - libc/calls/ucontext.h | 2 - libc/calls/vdsofunc.greg.c | 1 - libc/calls/weirdtypes.h | 2 - libc/calls/wincrash.internal.h | 2 - libc/calls/winexec.c | 1 - libc/complex.h | 2 - libc/cosmo.h | 2 - libc/crt/crt.S | 1 - libc/dlopen/dlfcn.h | 2 - libc/dlopen/dlopen.c | 2 +- libc/dns/consts.h | 2 - libc/dns/dns.h | 2 - libc/dns/dnsheader.c | 2 +- libc/dns/dnsheader.h | 2 - libc/dns/dnsquestion.h | 2 - libc/dns/ent.h | 2 - libc/dns/gethoststxt.c | 1 - libc/dns/hoststxt.h | 2 - libc/dns/prototxt.h | 2 - libc/dns/resolvconf.h | 2 - libc/dns/resolvedns.c | 2 +- libc/dns/resolvednsreverse.c | 2 +- libc/dns/resolvehostsreverse.c | 2 +- libc/dns/servicestxt.h | 2 - libc/elf/elf.h | 2 - libc/elf/iself64binary.c | 2 +- libc/elf/struct/auxv.h | 2 - libc/elf/struct/chdr.h | 2 - libc/elf/struct/dyn.h | 2 - libc/elf/struct/ehdr.h | 2 - libc/elf/struct/lib.h | 2 - libc/elf/struct/move.h | 2 - libc/elf/struct/nhdr.h | 2 - libc/elf/struct/phdr.h | 2 - libc/elf/struct/rel.h | 2 - libc/elf/struct/rela.h | 2 - libc/elf/struct/shdr.h | 2 - libc/elf/struct/sym.h | 2 - libc/elf/struct/syminfo.h | 2 - libc/elf/struct/verdaux.h | 2 - libc/elf/struct/verdef.h | 2 - libc/elf/struct/vernaux.h | 2 - libc/elf/struct/verneed.h | 2 - libc/elf/tinyelf.internal.h | 4 +- libc/errno.h | 2 - libc/fmt/bing.internal.h | 2 - libc/fmt/conv.h | 2 - libc/fmt/divmod10.internal.h | 2 - libc/fmt/itoa.h | 2 - libc/fmt/leb128.h | 2 - libc/fmt/libgen.h | 2 - libc/fmt/wintime.internal.h | 2 - libc/intrin/asan.c | 2 +- libc/intrin/asan.internal.h | 2 - libc/intrin/asmflag.h | 2 - libc/intrin/atomic.h | 2 - libc/intrin/bitreverse.c | 52 ------ libc/intrin/bitreverse32.c | 31 ---- libc/intrin/bitreverse64.c | 31 ---- libc/intrin/bsf.h | 2 - libc/intrin/bsr.h | 2 - libc/intrin/bswap.h | 2 - libc/intrin/cmpxchg.h | 2 - libc/intrin/countbits.c | 1 - libc/intrin/cxaatexit.internal.h | 2 - libc/intrin/describebacktrace.internal.h | 2 - libc/intrin/describeflags.internal.h | 2 - libc/intrin/describentoverlapped.internal.h | 2 - libc/intrin/directmap.internal.h | 2 - libc/intrin/dll.h | 2 - libc/intrin/dos2errno.internal.h | 2 - libc/intrin/extend.internal.h | 2 - libc/intrin/getauxval.internal.h | 2 - libc/intrin/getenv.internal.h | 2 - libc/intrin/hilbert.h | 2 - libc/intrin/kprintf.greg.c | 2 +- libc/intrin/leaky.internal.h | 2 - libc/intrin/likely.h | 2 - libc/intrin/macros.h | 2 - libc/intrin/memtrack.greg.c | 1 - libc/intrin/nomultics.internal.h | 2 - libc/intrin/packsswb.h | 2 - libc/intrin/packuswb.h | 2 - libc/intrin/paddw.h | 2 - libc/intrin/palignr.h | 2 - libc/intrin/pandn.h | 2 - libc/intrin/pcmpgtb.h | 2 - libc/intrin/pcmpgtw.h | 2 - libc/intrin/pmaddubsw.h | 2 - libc/intrin/pmovmskb.h | 2 - libc/intrin/pmulhrsw.h | 2 - libc/intrin/popcnt.h | 2 - libc/intrin/promises.internal.h | 2 - libc/intrin/psraw.h | 2 - libc/intrin/punpckhbw.h | 2 - libc/intrin/punpckhwd.h | 2 - libc/intrin/punpcklbw.h | 2 - libc/intrin/punpcklwd.h | 2 - libc/intrin/pushpop.internal.h | 2 - libc/intrin/repmovsb.h | 2 - libc/intrin/repstosb.h | 2 - libc/intrin/safemacros.internal.h | 2 - libc/intrin/segmentation.h | 2 - libc/intrin/setjmp.internal.h | 2 - libc/intrin/strnlen.c | 1 - libc/intrin/ulock.h | 2 - libc/intrin/weaken.h | 2 - libc/intrin/xchg.internal.h | 2 - libc/irq/acpi-xsdt.c | 13 +- libc/irq/acpi.internal.h | 29 ++-- libc/isystem/linux/types.h | 2 - libc/isystem/tgmath.h | 2 - libc/log/appendresourcereport.c | 2 +- libc/log/appendresourcereport.internal.h | 2 - libc/log/backtrace.internal.h | 2 - libc/log/bsd.h | 2 - libc/log/check.h | 2 - libc/log/color.internal.h | 2 - libc/log/countbranch.h | 2 - libc/log/countexpr.h | 2 - libc/log/gdb.h | 2 - libc/log/getcallername.internal.h | 2 - libc/log/internal.h | 2 - libc/log/leaks.c | 1 - libc/log/libfatal.internal.h | 2 - libc/log/log.h | 2 - libc/log/traceme.h | 2 - libc/log/vflogf.c | 1 - libc/log/watch.c | 2 +- libc/mach.internal.h | 2 - libc/math.h | 2 - libc/mem/alg.h | 2 - libc/mem/arraylist.internal.h | 3 - libc/mem/arraylist2.internal.h | 2 - libc/mem/bisect.internal.h | 2 - libc/mem/critbit0.h | 2 - libc/mem/gc.h | 2 - libc/mem/gc.internal.h | 2 - libc/mem/hook.internal.h | 2 - libc/mem/internal.h | 2 - libc/mem/mem.h | 2 - libc/mem/realpath.c | 2 +- libc/mem/reverse.internal.h | 2 - libc/mem/shuffle.internal.h | 2 - libc/mem/sortedints.internal.h | 2 - libc/nexgen32e/bench.h | 2 - libc/nexgen32e/cachesize.h | 2 - libc/nexgen32e/cpuid4.internal.h | 2 - libc/nexgen32e/crc32.h | 2 - libc/nexgen32e/ffs.h | 2 - libc/nexgen32e/gc.internal.h | 2 - libc/nexgen32e/hascharacter.internal.h | 2 - libc/nexgen32e/kompressor.h | 2 - libc/nexgen32e/lz4.h | 6 +- libc/nexgen32e/nexgen32e.h | 2 - libc/nexgen32e/nt2sysv.h | 2 - libc/nexgen32e/rdtsc.h | 2 - libc/nexgen32e/rdtscp.h | 2 - libc/nexgen32e/sha.h | 2 - libc/nexgen32e/stackframe.h | 2 - libc/nexgen32e/trampoline.h | 2 - libc/nexgen32e/vendor.internal.h | 2 - libc/nexgen32e/vidya.internal.h | 2 - libc/nt/accounting.h | 2 - libc/nt/automation.h | 2 - libc/nt/comdlg.h | 2 - libc/nt/comms.h | 2 - libc/nt/console.h | 2 - libc/nt/createfile.h | 2 - libc/nt/debug.h | 2 - libc/nt/dll.h | 2 - libc/nt/efi.h | 2 - libc/nt/enum/computernameformat.h | 2 - libc/nt/enum/cw.h | 2 - libc/nt/enum/fileinfobyhandleclass.h | 2 - libc/nt/enum/fillattribute.h | 2 - libc/nt/enum/idc.h | 2 - libc/nt/enum/importobjectnametype.h | 2 - libc/nt/enum/importobjecttype.h | 2 - libc/nt/enum/kwaitreason.h | 2 - libc/nt/enum/loadlibrarysearch.h | 2 - libc/nt/enum/mb.h | 2 - libc/nt/enum/sectioninherit.h | 2 - libc/nt/enum/statfs.h | 2 - libc/nt/enum/threadaccess.h | 2 - libc/nt/enum/threadinfoclass.h | 2 - libc/nt/enum/version.h | 2 - libc/nt/enum/wsaid.h | 2 - libc/nt/events.h | 2 - libc/nt/files.h | 2 - libc/nt/iocp.h | 2 - libc/nt/ipc.h | 2 - libc/nt/iphlpapi.h | 2 - libc/nt/memory.h | 2 - libc/nt/messagebox.h | 2 - libc/nt/nt/debug.h | 2 - libc/nt/nt/file.h | 2 - libc/nt/nt/ipc.h | 2 - libc/nt/nt/key.h | 2 - libc/nt/nt/loader.h | 2 - libc/nt/nt/memory.h | 2 - libc/nt/nt/process.h | 2 - libc/nt/nt/sections.h | 2 - libc/nt/nt/signing.h | 2 - libc/nt/nt/thread.h | 2 - libc/nt/nt/time.h | 2 - libc/nt/ntdll.h | 2 - libc/nt/paint.h | 2 - libc/nt/pdh.h | 2 - libc/nt/privilege.h | 2 - libc/nt/process.h | 2 - libc/nt/registry.h | 2 - libc/nt/runtime.h | 2 - libc/nt/signals.h | 2 - libc/nt/startupinfo.h | 2 - libc/nt/struct/acl.h | 2 - libc/nt/struct/afd.h | 2 - libc/nt/struct/ansistring.h | 2 - libc/nt/struct/byhandlefileinformation.h | 2 - libc/nt/struct/charinfo.h | 2 - libc/nt/struct/clientid.h | 2 - libc/nt/struct/consolecursorinfo.h | 2 - libc/nt/struct/consolescreenbufferinfo.h | 2 - libc/nt/struct/consolescreenbufferinfoex.h | 2 - libc/nt/struct/consoleselectioninfo.h | 2 - libc/nt/struct/context.h | 2 - libc/nt/struct/coord.h | 2 - libc/nt/struct/criticalsection.h | 2 - libc/nt/struct/criticalsectiondebug.h | 2 - libc/nt/struct/drawtextparams.h | 2 - libc/nt/struct/editmenu.h | 2 - libc/nt/struct/exceptionframe.h | 2 - libc/nt/struct/fdset.h | 2 - libc/nt/struct/fileaccessinformation.h | 2 - libc/nt/struct/filealignmentinformation.h | 2 - libc/nt/struct/fileallinformation.h | 2 - libc/nt/struct/fileallocationinformation.h | 2 - libc/nt/struct/fileattributetaginformation.h | 2 - libc/nt/struct/filebasicinfo.h | 2 - libc/nt/struct/filebasicinformation.h | 2 - libc/nt/struct/filebothdirectoryinformation.h | 2 - libc/nt/struct/filecompressioninfo.h | 2 - libc/nt/struct/filedirectoryinformation.h | 2 - libc/nt/struct/filedispositioninformation.h | 2 - libc/nt/struct/fileeainformation.h | 2 - libc/nt/struct/fileendoffileinformation.h | 2 - libc/nt/struct/filefsfullsizeinformation.h | 2 - libc/nt/struct/filefulldirectoryinformation.h | 2 - libc/nt/struct/filefulleainformation.h | 2 - libc/nt/struct/fileinternalinformation.h | 2 - libc/nt/struct/filemailslotqueryinformation.h | 2 - libc/nt/struct/filemailslotsetinformation.h | 2 - libc/nt/struct/filemodeinformation.h | 2 - libc/nt/struct/filenameinformation.h | 2 - libc/nt/struct/filenamesinformation.h | 2 - libc/nt/struct/filenetworkopeninformation.h | 2 - libc/nt/struct/filepipelocalinformation.h | 2 - libc/nt/struct/filepositioninformation.h | 2 - libc/nt/struct/filerenameinformation.h | 2 - libc/nt/struct/filesegmentelement.h | 2 - libc/nt/struct/filestandardinformation.h | 2 - libc/nt/struct/filestreaminformation.h | 2 - libc/nt/struct/filetime.h | 2 - libc/nt/struct/filezerodatainformation.h | 2 - libc/nt/struct/fpodata.h | 2 - libc/nt/struct/genericmapping.h | 2 - libc/nt/struct/guid.h | 2 - .../imagearchivememberheader.internal.h | 2 - libc/nt/struct/imageauxsymbol.internal.h | 2 - libc/nt/struct/imageauxsymbolex.internal.h | 2 - .../struct/imageauxsymboltokendef.internal.h | 2 - libc/nt/struct/imagebaserelocation.internal.h | 2 - .../struct/imageboundforwarderref.internal.h | 2 - .../imageboundimportdescriptor.internal.h | 2 - .../imageceruntimefunctionentry.internal.h | 2 - .../struct/imagecoffsymbolsheader.internal.h | 2 - libc/nt/struct/imagedatadirectory.internal.h | 2 - libc/nt/struct/imagedebugdirectory.internal.h | 2 - libc/nt/struct/imagedebugmisc.internal.h | 2 - .../imagedelayloaddescriptor.internal.h | 2 - libc/nt/struct/imagedosheader.internal.h | 2 - .../struct/imagedynamicrelocation.internal.h | 2 - .../imagedynamicrelocationtable.internal.h | 2 - .../imagedynamicrelocationv2.internal.h | 2 - libc/nt/struct/imageenclaveconfig.internal.h | 2 - libc/nt/struct/imageenclaveimport.internal.h | 2 - ...epiloguedynamicrelocationheader.internal.h | 2 - .../nt/struct/imageexportdirectory.internal.h | 2 - libc/nt/struct/imagefileheader.internal.h | 2 - libc/nt/struct/imagehotpatchbase.internal.h | 2 - libc/nt/struct/imagehotpatchhashes.internal.h | 2 - libc/nt/struct/imagehotpatchinfo.internal.h | 2 - libc/nt/struct/imageimportbyname.internal.h | 2 - .../struct/imageimportdescriptor.internal.h | 2 - libc/nt/struct/imagelinenumber.internal.h | 2 - .../imageloadconfigcodeintegrity.internal.h | 2 - .../imageloadconfigdirectory.internal.h | 2 - libc/nt/struct/imagentheaders.internal.h | 2 - libc/nt/struct/imageoptionalheader.internal.h | 2 - ...prologuedynamicrelocationheader.internal.h | 2 - libc/nt/struct/imagerelocation.internal.h | 2 - .../struct/imageresourcedataentry.internal.h | 2 - .../struct/imageresourcedirectory.internal.h | 2 - .../imageresourcedirectoryentry.internal.h | 2 - .../struct/imageresourcedirstring.internal.h | 2 - .../struct/imageromoptionalheader.internal.h | 2 - .../imageruntimefunctionentry.internal.h | 2 - libc/nt/struct/imagesectionheader.internal.h | 2 - .../imageseparatedebugheader.internal.h | 2 - libc/nt/struct/imagesymbol.internal.h | 2 - libc/nt/struct/imagesymbolex.internal.h | 2 - libc/nt/struct/imagethunkdata.internal.h | 2 - libc/nt/struct/imagetlsdirectory.internal.h | 2 - libc/nt/struct/importobjectheader.internal.h | 2 - libc/nt/struct/inputrecord.h | 2 - libc/nt/struct/iocounters.h | 2 - libc/nt/struct/iostatusblock.h | 2 - libc/nt/struct/iovec.h | 2 - libc/nt/struct/ipadapteraddresses.h | 2 - libc/nt/struct/kernelusertimes.h | 2 - libc/nt/struct/ldr.h | 2 - libc/nt/struct/ldrdatatableentry.h | 2 - libc/nt/struct/linger.h | 2 - libc/nt/struct/linkedlist.h | 2 - libc/nt/struct/luid.h | 2 - libc/nt/struct/luidandattributes.h | 2 - libc/nt/struct/memorybasicinformation.h | 2 - libc/nt/struct/memoryrangeentry.h | 2 - libc/nt/struct/memorystatusex.h | 2 - libc/nt/struct/msg.h | 2 - libc/nt/struct/nonpageddebuginfo.h | 2 - libc/nt/struct/ntexceptionpointers.h | 2 - libc/nt/struct/ntexceptionrecord.h | 2 - libc/nt/struct/objectallinformation.h | 2 - libc/nt/struct/objectattributes.h | 2 - libc/nt/struct/objectbasicinformation.h | 2 - libc/nt/struct/objectnameinformation.h | 2 - libc/nt/struct/objecttypeinformation.h | 2 - libc/nt/struct/openfilename.h | 2 - libc/nt/struct/osversioninfo.h | 2 - libc/nt/struct/overlapped.h | 2 - libc/nt/struct/overlappedentry.h | 2 - libc/nt/struct/paintstruct.h | 2 - libc/nt/struct/pdhfmtcountervalue.h | 2 - libc/nt/struct/peb.h | 2 - libc/nt/struct/point.h | 2 - libc/nt/struct/pollfd.h | 2 - libc/nt/struct/privilegeset.h | 2 - libc/nt/struct/processbasicinformation.h | 2 - libc/nt/struct/processentry32.h | 2 - libc/nt/struct/processinformation.h | 2 - libc/nt/struct/processmemorycounters.h | 2 - libc/nt/struct/rect.h | 2 - libc/nt/struct/reparsedatabuffer.h | 2 - libc/nt/struct/rtluserprocessinformation.h | 2 - libc/nt/struct/rtluserprocessparameters.h | 2 - libc/nt/struct/sectionimageinformation.h | 2 - libc/nt/struct/securityattributes.h | 2 - libc/nt/struct/securitydescriptor.h | 2 - libc/nt/struct/size.h | 2 - libc/nt/struct/smallrect.h | 2 - libc/nt/struct/startupinfo.h | 2 - libc/nt/struct/startupinfoex.h | 2 - libc/nt/struct/systembasicinformation.h | 2 - libc/nt/struct/systemexceptioninformation.h | 2 - libc/nt/struct/systemhandleentry.h | 2 - libc/nt/struct/systemhandleinformation.h | 2 - libc/nt/struct/systeminfo.h | 2 - libc/nt/struct/systeminterruptinformation.h | 2 - libc/nt/struct/systemlookasideinformation.h | 2 - libc/nt/struct/systemperformanceinformation.h | 2 - libc/nt/struct/systemprocessinformation.h | 2 - libc/nt/struct/systemprocessorinformation.h | 2 - .../systemprocessorperformanceinformation.h | 2 - .../struct/systemregistryquotainformation.h | 2 - libc/nt/struct/systemthreads.h | 2 - libc/nt/struct/systemtime.h | 2 - libc/nt/struct/systemtimeofdayinformation.h | 2 - libc/nt/struct/teb.h | 2 - libc/nt/struct/timeval.h | 2 - libc/nt/struct/tokenprivileges.h | 2 - libc/nt/struct/unicodestring.h | 2 - libc/nt/struct/userstack.h | 2 - libc/nt/struct/valent.h | 2 - libc/nt/struct/vmcounters.h | 2 - libc/nt/struct/win32fileattributedata.h | 2 - libc/nt/struct/win32finddata.h | 2 - libc/nt/struct/windowplacement.h | 2 - libc/nt/struct/wndclass.h | 2 - libc/nt/struct/wndclassex.h | 2 - libc/nt/synchronization.h | 2 - libc/nt/system.h | 2 - libc/nt/systeminfo.h | 2 - libc/nt/thread.h | 2 - libc/nt/thunk/msabi.h | 2 - libc/nt/typedef/exceptionhandler.h | 2 - libc/nt/typedef/handlerroutine.h | 2 - libc/nt/typedef/hookproc.h | 2 - libc/nt/typedef/imagetlscallback.h | 2 - libc/nt/typedef/ioapcroutine.h | 2 - libc/nt/typedef/pknormalroutine.h | 2 - libc/nt/typedef/timerproc.h | 2 - libc/nt/typedef/wambda.h | 2 - libc/nt/typedef/wndenumproc.h | 2 - libc/nt/typedef/wndproc.h | 2 - libc/nt/version.h | 2 - libc/nt/windows.h | 2 - libc/nt/winsock.h | 2 - libc/proc/cocmd.c | 2 +- libc/proc/describefds.internal.h | 2 - libc/proc/execve-sysv.c | 1 - libc/proc/execve.internal.h | 2 - libc/proc/ntspawn.h | 2 - libc/proc/posix_spawn.h | 2 - libc/proc/posix_spawn.internal.h | 2 - libc/proc/proc.internal.h | 2 - libc/runtime/clktck.h | 2 - libc/runtime/efimain.greg.c | 1 - libc/runtime/fenv.h | 2 - libc/runtime/getdosenviron.c | 1 - libc/runtime/getsymboltable.c | 1 - libc/runtime/grow.c | 1 - libc/runtime/init.S | 1 - libc/runtime/internal.h | 2 - libc/runtime/memtrack.internal.h | 2 - libc/runtime/metalprintf.internal.h | 2 - libc/runtime/mman.internal.h | 28 +-- libc/runtime/mmap.c | 1 - libc/runtime/morph_tls.c | 2 +- libc/runtime/opensymboltable.greg.c | 1 - libc/runtime/pathconf.h | 2 - libc/runtime/runtime.h | 2 - libc/runtime/stack.h | 2 - libc/runtime/symbols.internal.h | 2 - libc/runtime/sysconf.h | 2 - libc/runtime/syslib.internal.h | 2 - libc/runtime/unwind.h | 2 - libc/runtime/utmp.h | 2 - libc/runtime/utmpx.h | 2 - libc/runtime/winargs.internal.h | 2 - libc/runtime/winmain.greg.c | 2 +- libc/runtime/zipos-get.c | 1 + libc/runtime/zipos-open.c | 1 + libc/runtime/zipos-read.c | 2 + libc/runtime/zipos.internal.h | 2 - libc/{intrin/bits.h => serialize.h} | 57 +++--- libc/sock/alg.h | 2 - libc/sock/epoll.h | 2 - libc/sock/gethostips.c | 2 +- libc/sock/goodsocket.internal.h | 2 - libc/sock/ifaddrs.h | 2 - libc/sock/inet_pton.c | 6 +- libc/sock/internal.h | 2 - libc/sock/ipclassify.internal.h | 2 - libc/sock/select.h | 2 - libc/sock/select.internal.h | 2 - libc/sock/sendfile.internal.h | 2 - libc/sock/sock.h | 2 - libc/sock/struct/arphdr.h | 2 - libc/sock/struct/arpreq.h | 2 - libc/sock/struct/cmsghdr.h | 2 - libc/sock/struct/cmsghdr.internal.h | 2 - libc/sock/struct/ether_header.h | 2 - libc/sock/struct/ifconf.h | 2 - libc/sock/struct/ifreq.h | 2 - libc/sock/struct/in6_pktinfo.h | 2 - libc/sock/struct/in_pktinfo.h | 2 - libc/sock/struct/ip_mreq.h | 2 - libc/sock/struct/linger.h | 2 - libc/sock/struct/msghdr.h | 2 - libc/sock/struct/msghdr.internal.h | 2 - libc/sock/struct/pollfd.h | 2 - libc/sock/struct/pollfd.internal.h | 2 - libc/sock/struct/sockaddr.h | 2 - libc/sock/struct/sockaddr.internal.h | 2 - libc/sock/struct/sockaddr6-bsd.internal.h | 2 - libc/sock/struct/sockaddr6.h | 2 - libc/sock/syscall_fd.internal.h | 2 - libc/sock/syslog.h | 2 - libc/sock/wsaid.internal.h | 2 - libc/stdckdint.h | 2 - libc/stdio/append.h | 2 - libc/stdio/appendw.c | 2 +- libc/stdio/dprintf.h | 2 - libc/stdio/fflush.internal.h | 2 - libc/stdio/fflush_unlocked.c | 1 - libc/stdio/fmt.c | 2 +- libc/stdio/ftw.h | 2 - libc/stdio/hex.internal.h | 2 - libc/stdio/iconv.h | 2 - libc/stdio/internal.h | 2 - libc/stdio/lcg.internal.h | 2 - libc/stdio/rand.h | 2 - libc/stdio/stdio.h | 2 - libc/stdio/stdio_ext.h | 2 - libc/stdio/strlist.internal.h | 2 - libc/stdio/syscall.h | 2 - libc/stdio/sysparam.h | 2 - libc/stdlib.h | 2 - libc/str/blake2.h | 2 - libc/str/crc32c.c | 1 - libc/str/getcachesize.c | 1 - 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/getzipcfileoffset.c | 2 +- libc/str/getzipcfiletimestamps.c | 28 +-- libc/str/getzipcfileuncompressedsize.c | 2 +- libc/str/getzipeocd.c | 14 +- libc/str/getziplfilecompressedsize.c | 2 +- libc/str/getziplfileuncompressedsize.c | 2 +- libc/str/highwayhash64.c | 2 +- libc/str/highwayhash64.h | 2 - libc/str/iszipeocd32.c | 2 +- libc/str/iszipeocd64.c | 2 +- libc/str/kx86processormodels.c | 1 - libc/str/langinfo.h | 2 - libc/str/locale.h | 2 - libc/str/lz4cpy.c | 2 +- libc/str/lz4len.c | 1 - libc/str/mb.internal.h | 2 - libc/str/memcasecmp.c | 2 +- libc/str/memccpy.c | 1 - libc/str/nltypes.h | 2 - libc/str/slice.h | 2 - libc/str/strwidth.h | 2 - libc/str/tpdecodecb.internal.h | 2 - libc/str/unicode.h | 2 - libc/str/utf16.h | 2 - libc/str/wctype.c | 2 +- libc/str/wcwidth_osx.internal.h | 2 - libc/sysv/consts/af.h | 2 - libc/sysv/consts/at.h | 2 - libc/sysv/consts/auxv.h | 2 - libc/sysv/consts/baud.internal.h | 2 - libc/sysv/consts/clock.h | 2 - libc/sysv/consts/close.h | 2 - libc/sysv/consts/epoll.h | 2 - libc/sysv/consts/f.h | 2 - libc/sysv/consts/falloc.h | 2 - libc/sysv/consts/fbio.h | 2 - libc/sysv/consts/fd.h | 2 - libc/sysv/consts/fio.h | 2 - libc/sysv/consts/futex.h | 2 - libc/sysv/consts/icmp6.h | 2 - libc/sysv/consts/iff.h | 2 - libc/sysv/consts/io.h | 2 - libc/sysv/consts/iov.h | 2 - libc/sysv/consts/ip.h | 2 - libc/sysv/consts/ipport.h | 2 - libc/sysv/consts/ipv6.h | 2 - libc/sysv/consts/kd.h | 2 - libc/sysv/consts/kern.h | 2 - libc/sysv/consts/limits.h | 2 - libc/sysv/consts/lio.h | 2 - libc/sysv/consts/lock.h | 2 - libc/sysv/consts/loglevel.h | 2 - libc/sysv/consts/madv.h | 2 - libc/sysv/consts/mcast.h | 2 - libc/sysv/consts/mlock.h | 2 - libc/sysv/consts/modem.h | 2 - libc/sysv/consts/mount.h | 2 - libc/sysv/consts/msg.h | 2 - libc/sysv/consts/msync.h | 2 - libc/sysv/consts/o.h | 2 - libc/sysv/consts/ok.h | 2 - libc/sysv/consts/pf.h | 2 - libc/sysv/consts/poll.h | 2 - libc/sysv/consts/posix.h | 2 - libc/sysv/consts/prio.h | 2 - libc/sysv/consts/ptrace.h | 2 - libc/sysv/consts/pty.h | 2 - libc/sysv/consts/read.h | 2 - libc/sysv/consts/reboot.h | 2 - libc/sysv/consts/rlim.h | 2 - libc/sysv/consts/rlimit.h | 2 - libc/sysv/consts/rusage.h | 2 - libc/sysv/consts/sa.h | 2 - libc/sysv/consts/sched.h | 2 - libc/sysv/consts/scm.h | 2 - libc/sysv/consts/seek.h | 2 - libc/sysv/consts/sf.h | 2 - libc/sysv/consts/shm.h | 2 - libc/sysv/consts/shut.h | 2 - libc/sysv/consts/sicode.h | 2 - libc/sysv/consts/sig.h | 2 - libc/sysv/consts/sio.h | 2 - libc/sysv/consts/so.h | 2 - libc/sysv/consts/sock.h | 2 - libc/sysv/consts/sol.h | 2 - libc/sysv/consts/splice.h | 2 - libc/sysv/consts/ss.h | 2 - libc/sysv/consts/st.h | 2 - libc/sysv/consts/tcp.h | 2 - libc/sysv/consts/termios.h | 2 - libc/sysv/consts/uc.h | 2 - libc/sysv/consts/unmount.h | 2 - libc/sysv/consts/utime.h | 2 - libc/sysv/consts/w.h | 2 - libc/sysv/consts/waitid.h | 2 - libc/sysv/errfuns.h | 2 - libc/sysv/systemfive.S | 6 +- libc/temp.h | 2 - libc/testlib/aspect.internal.h | 2 - libc/testlib/bench.h | 2 - libc/testlib/blocktronics.h | 2 - libc/testlib/ezbench.h | 2 - libc/testlib/fastrandomstring.h | 2 - libc/testlib/formatstr.c | 2 +- libc/testlib/hyperion.h | 2 - libc/testlib/moby.h | 2 - libc/testlib/subprocess.h | 2 - libc/testlib/testlib.h | 2 - libc/testlib/viewables.h | 2 - libc/thread/freebsd.internal.h | 2 - libc/thread/itimer.internal.h | 2 - libc/thread/openbsd.internal.h | 2 - libc/thread/posixthread.internal.h | 11 +- libc/thread/pt.internal.h | 12 ++ libc/thread/pthread_create.c | 1 - libc/thread/semaphore.h | 2 - libc/thread/thread2.h | 2 - libc/thread/tls2.internal.h | 2 - libc/thread/xnu.internal.h | 2 - libc/time/clockstonanos.internal.h | 2 - libc/time/localtime.c | 2 +- libc/time/struct/timezone.h | 2 - libc/time/struct/tm.h | 2 - libc/time/struct/utimbuf.h | 2 - libc/time/struct/utimbuf.internal.h | 2 - libc/time/time.h | 2 - libc/time/tz.internal.h | 2 - libc/tinymath/atan_common.internal.h | 2 - libc/tinymath/atan_data.internal.h | 2 - libc/tinymath/atanf_common.internal.h | 2 - libc/tinymath/atanf_data.internal.h | 2 - libc/tinymath/complex.internal.h | 2 - libc/tinymath/emod.h | 2 - libc/tinymath/emodl.h | 2 - libc/tinymath/exp2f_data.internal.h | 2 - libc/tinymath/exp_data.internal.h | 2 - libc/tinymath/expo.internal.h | 2 - libc/tinymath/feval.internal.h | 2 - libc/tinymath/freebsd.internal.h | 2 - libc/tinymath/horner.internal.h | 2 - libc/tinymath/hornerf.internal.h | 2 - libc/tinymath/internal.h | 2 - libc/tinymath/invtrigl.internal.h | 2 - libc/tinymath/kernel.internal.h | 2 - libc/tinymath/ldshape.internal.h | 2 - libc/tinymath/log1pf_data.internal.h | 2 - libc/tinymath/log2_data.internal.h | 2 - libc/tinymath/log2f_data.internal.h | 2 - libc/tinymath/log_data.internal.h | 2 - libc/tinymath/logf_data.internal.h | 2 - libc/tinymath/magicu.h | 2 - libc/tinymath/pow_data.internal.h | 2 - libc/tinymath/powf_data.internal.h | 2 - libc/tinymath/sincosf.internal.h | 2 - libc/vga/tty.greg.c | 1 - libc/vga/vga-init.greg.c | 1 + libc/vga/vga.internal.h | 13 +- libc/x/utf16to8.c | 2 +- libc/x/x.h | 2 - libc/x/xasprintf.h | 2 - libc/x/xgetline.h | 2 - libc/x/xiso8601.h | 2 - libc/x/xsigaction.h | 2 - libc/x/xspawn.h | 2 - libc/zip.internal.h | 162 ++++++++++++------ net/finger/describesyn.c | 2 +- net/finger/finger.h | 2 - net/http/escape.h | 2 - net/http/findcontenttype.c | 2 +- net/http/http.h | 2 - net/http/ip.h | 2 - net/http/isnocompressext.c | 2 +- net/http/parsehttpdatetime.c | 2 +- net/http/parsehttpmessage.c | 2 +- net/http/tokenbucket.h | 2 - net/http/url.h | 2 - net/https/certhasip.c | 2 +- net/https/https.h | 2 - net/turfwar/blackhole.c | 2 +- net/turfwar/blackholed.c | 2 +- net/turfwar/turfwar.c | 4 +- test/dsp/tty/ttymove_test.c | 1 - test/libc/calls/getcwd_test.c | 2 +- test/libc/calls/getrandom_test.c | 2 +- test/libc/calls/ioctl_test.c | 1 - test/libc/fmt/strerror_r_test.c | 1 - test/libc/intrin/bitreverse_test.c | 43 ----- test/libc/intrin/countbits_test.c | 1 - test/libc/intrin/kprintf_test.c | 2 +- test/libc/intrin/lockipc_test.c | 1 - test/libc/intrin/strchr_test.c | 1 - test/libc/intrin/strcmp_test.c | 1 - test/libc/intrin/strlen_test.c | 1 - test/libc/mem/critbit0_test.c | 1 - test/libc/mem/malloc_test.c | 1 - test/libc/mem/qsort_test.c | 1 - test/libc/mem/strdup_test.c | 1 - test/libc/nexgen32e/memmove_test.c | 1 - test/libc/runtime/mmap_test.c | 1 - test/libc/stdio/fgetwc_test.c | 1 - test/libc/stdio/getdelim_test.c | 1 - test/libc/stdio/joinstrlist_test.c | 2 +- test/libc/stdio/mt19937_test.c | 1 - test/libc/stdio/rand_test.c | 4 +- test/libc/stdio/rngset_test.c | 2 +- test/libc/stdio/sprintf_s_test.c | 1 - test/libc/stdio/sscanf_test.c | 1 - test/libc/stdio/vappendf_test.c | 2 +- test/libc/str/crc32c_test.c | 1 - test/libc/str/crc32z_test.c | 1 - test/libc/str/memcpy_test.c | 1 - test/libc/str/memfrob_test.c | 1 - test/libc/str/memmem_test.c | 1 - test/libc/str/str_test.c | 1 - test/libc/str/strcasestr_test.c | 1 - test/libc/str/strstr_test.c | 1 - test/libc/str/tprecode8to16_test.c | 1 - test/libc/str/wcwidth_test.c | 1 - test/libc/xed/lib.h | 2 - test/net/http/parsehttpmessage_test.c | 1 - test/net/https/mbedtls_test.c | 1 - test/tool/build/lib/interner_test.c | 1 - third_party/{sqlite3 => }/.clang-format | 0 third_party/aarch64/acc_prof.internal.h | 1 - third_party/aarch64/arm_acle.internal.h | 1 - third_party/aarch64/arm_bf16.internal.h | 1 - third_party/aarch64/arm_fp16.internal.h | 1 - third_party/aarch64/arm_neon.internal.h | 1 - third_party/aarch64/arm_sve.internal.h | 1 - third_party/aarch64/openacc.internal.h | 1 - third_party/aarch64/upgrade.sh | 1 - third_party/argon2/argon2.c | 1 - third_party/argon2/argon2.h | 2 - third_party/argon2/blake2-impl.h | 1 - third_party/argon2/blake2.h | 2 - third_party/argon2/blake2b.c | 3 +- third_party/argon2/blamka-round-ref.h | 1 - third_party/argon2/core.c | 1 - third_party/argon2/core.h | 2 - third_party/argon2/encoding.c | 1 - third_party/argon2/encoding.h | 2 - third_party/argon2/ref.c | 1 - third_party/awk/awk.h | 3 - third_party/awk/awkgram.tab.c | 1 - third_party/awk/awkgram.tab.h | 2 - third_party/awk/b.c | 1 - third_party/awk/cmd.h | 2 - third_party/awk/lex.c | 1 - third_party/awk/lib.c | 1 - third_party/awk/main.c | 1 - third_party/awk/maketab.c | 1 - third_party/awk/parse.c | 1 - third_party/awk/proctab.c | 1 - third_party/awk/run.c | 1 - third_party/awk/tran.c | 1 - third_party/bzip2/blocksort.c | 1 - third_party/bzip2/bzip2.c | 1 - third_party/bzip2/bzip2recover.c | 1 - third_party/bzip2/bzlib.c | 1 - third_party/bzip2/bzlib.h | 2 - third_party/bzip2/bzlib_private.inc | 1 - third_party/bzip2/compress.c | 1 - third_party/bzip2/decompress.c | 1 - third_party/bzip2/huffman.c | 1 - third_party/bzip2/randtable.c | 1 - third_party/bzip2/spewG.c | 1 - third_party/chibicc/as.c | 2 +- third_party/chibicc/chibicc.h | 2 - third_party/chibicc/dox2.c | 1 - third_party/chibicc/file.h | 2 - third_party/chibicc/kw.h | 2 - third_party/chibicc/kw.inc | 1 - third_party/chibicc/pybind.c | 2 +- third_party/chibicc/test/macro_test.c | 5 +- third_party/compiler_rt/absvdi2.c | 1 - third_party/compiler_rt/absvsi2.c | 1 - third_party/compiler_rt/absvti2.c | 1 - third_party/compiler_rt/adddf3.c | 1 - third_party/compiler_rt/addsf3.c | 1 - third_party/compiler_rt/addtf3.c | 1 - third_party/compiler_rt/ashldi3.c | 1 - third_party/compiler_rt/ashrdi3.c | 1 - third_party/compiler_rt/ashrti3.c | 1 - third_party/compiler_rt/assembly.h | 1 - third_party/compiler_rt/bswapdi2.c | 1 - third_party/compiler_rt/bswapsi2.c | 1 - third_party/compiler_rt/clzdi2.c | 1 - third_party/compiler_rt/clzsi2.c | 1 - third_party/compiler_rt/clzti2.c | 1 - third_party/compiler_rt/cmpdi2.c | 1 - third_party/compiler_rt/cmpti2.c | 1 - third_party/compiler_rt/comparedf2.c | 1 - third_party/compiler_rt/comparesf2.c | 1 - third_party/compiler_rt/ctzdi2.c | 1 - third_party/compiler_rt/ctzsi2.c | 1 - third_party/compiler_rt/ctzti2.c | 1 - third_party/compiler_rt/divdc3.c | 1 - third_party/compiler_rt/divdf3.c | 1 - third_party/compiler_rt/divdi3.c | 1 - third_party/compiler_rt/divmoddi4.c | 1 - third_party/compiler_rt/divmodsi4.c | 1 - third_party/compiler_rt/divsc3.c | 1 - third_party/compiler_rt/divsf3.c | 1 - third_party/compiler_rt/divsi3.c | 1 - third_party/compiler_rt/divtc3.c | 1 - third_party/compiler_rt/divtf3.c | 1 - third_party/compiler_rt/divxc3.c | 1 - third_party/compiler_rt/extenddftf2.c | 1 - third_party/compiler_rt/extendhfsf2.c | 1 - third_party/compiler_rt/extendsfdf2.c | 1 - third_party/compiler_rt/extendsftf2.c | 1 - third_party/compiler_rt/ffsdi2.c | 1 - third_party/compiler_rt/ffssi2.c | 1 - third_party/compiler_rt/ffsti2.c | 1 - third_party/compiler_rt/fixdfdi.c | 1 - third_party/compiler_rt/fixdfsi.c | 1 - third_party/compiler_rt/fixdfti.c | 1 - third_party/compiler_rt/fixsfdi.c | 1 - third_party/compiler_rt/fixsfsi.c | 1 - third_party/compiler_rt/fixsfti.c | 1 - third_party/compiler_rt/fixtfdi.c | 1 - third_party/compiler_rt/fixtfsi.c | 1 - third_party/compiler_rt/fixtfti.c | 1 - third_party/compiler_rt/fixunsdfdi.c | 1 - third_party/compiler_rt/fixunsdfsi.c | 1 - third_party/compiler_rt/fixunsdfti.c | 1 - third_party/compiler_rt/fixunssfdi.c | 1 - third_party/compiler_rt/fixunssfsi.c | 1 - third_party/compiler_rt/fixunssfti.c | 1 - third_party/compiler_rt/fixunstfdi.c | 1 - third_party/compiler_rt/fixunstfsi.c | 1 - third_party/compiler_rt/fixunstfti.c | 1 - third_party/compiler_rt/fixunsxfdi.c | 1 - third_party/compiler_rt/fixunsxfsi.c | 1 - third_party/compiler_rt/fixunsxfti.c | 1 - third_party/compiler_rt/fixxfdi.c | 1 - third_party/compiler_rt/fixxfti.c | 1 - third_party/compiler_rt/floatdidf.c | 1 - third_party/compiler_rt/floatdisf.c | 1 - third_party/compiler_rt/floatditf.c | 1 - third_party/compiler_rt/floatdixf.c | 1 - third_party/compiler_rt/floatsidf.c | 1 - third_party/compiler_rt/floatsisf.c | 1 - third_party/compiler_rt/floatsitf.c | 1 - third_party/compiler_rt/floattidf.c | 1 - third_party/compiler_rt/floattisf.c | 1 - third_party/compiler_rt/floattitf.c | 1 - third_party/compiler_rt/floattixf.c | 1 - third_party/compiler_rt/floatundidf.c | 1 - third_party/compiler_rt/floatundisf.c | 1 - third_party/compiler_rt/floatunditf.c | 1 - third_party/compiler_rt/floatundixf.c | 1 - third_party/compiler_rt/floatunsidf.c | 1 - third_party/compiler_rt/floatunsisf.c | 1 - third_party/compiler_rt/floatunsitf.c | 1 - third_party/compiler_rt/floatuntidf.c | 1 - third_party/compiler_rt/floatuntisf.c | 1 - third_party/compiler_rt/floatuntitf.c | 1 - third_party/compiler_rt/floatuntixf.c | 1 - third_party/compiler_rt/fp_add_impl.inc | 1 - third_party/compiler_rt/fp_extend_common.inc | 1 - third_party/compiler_rt/fp_extend_impl.inc | 1 - third_party/compiler_rt/fp_fixint_impl.inc | 1 - third_party/compiler_rt/fp_fixuint_impl.inc | 1 - third_party/compiler_rt/fp_lib.inc | 1 - third_party/compiler_rt/fp_mul_impl.inc | 1 - third_party/compiler_rt/fp_trunc.inc | 1 - third_party/compiler_rt/fp_trunc_common.inc | 1 - third_party/compiler_rt/fp_trunc_impl.inc | 1 - third_party/compiler_rt/ilogbl.c | 1 - third_party/compiler_rt/int_endianness.h | 1 - third_party/compiler_rt/int_lib.h | 1 - third_party/compiler_rt/int_math.h | 1 - third_party/compiler_rt/int_types.h | 1 - third_party/compiler_rt/int_util.h | 1 - third_party/compiler_rt/logbl.c | 1 - third_party/compiler_rt/lshrdi3.c | 1 - third_party/compiler_rt/mingw_fixfloat.c | 1 - third_party/compiler_rt/moddi3.c | 1 - third_party/compiler_rt/modsi3.c | 1 - third_party/compiler_rt/modti3.c | 1 - third_party/compiler_rt/muldc3.c | 1 - third_party/compiler_rt/muldf3.c | 1 - third_party/compiler_rt/muldi3.c | 1 - third_party/compiler_rt/mulsc3.c | 1 - third_party/compiler_rt/mulsf3.c | 1 - third_party/compiler_rt/multi3.c | 1 - third_party/compiler_rt/mulxc3.c | 1 - third_party/compiler_rt/negdf2.c | 1 - third_party/compiler_rt/negdi2.c | 1 - third_party/compiler_rt/negsf2.c | 1 - third_party/compiler_rt/negti2.c | 1 - third_party/compiler_rt/nexgen32e/floatdidf.c | 1 - third_party/compiler_rt/nexgen32e/floatdisf.c | 1 - third_party/compiler_rt/nexgen32e/floatdixf.c | 1 - third_party/compiler_rt/os_version_check.c | 1 - third_party/compiler_rt/paritydi2.c | 1 - third_party/compiler_rt/paritysi2.c | 1 - third_party/compiler_rt/parityti2.c | 1 - third_party/compiler_rt/popcountdi2.c | 1 - third_party/compiler_rt/popcountsi2.c | 1 - third_party/compiler_rt/popcountti2.c | 1 - third_party/compiler_rt/powidf2.c | 1 - third_party/compiler_rt/powisf2.c | 1 - third_party/compiler_rt/powitf2.c | 1 - third_party/compiler_rt/powixf2.c | 1 - third_party/compiler_rt/subdf3.c | 1 - third_party/compiler_rt/subsf3.c | 1 - third_party/compiler_rt/subtf3.c | 1 - third_party/compiler_rt/truncdfhf2.c | 1 - third_party/compiler_rt/truncdfsf2.c | 1 - third_party/compiler_rt/truncsfhf2.c | 1 - third_party/compiler_rt/trunctfdf2.c | 1 - third_party/compiler_rt/trunctfsf2.c | 1 - third_party/compiler_rt/ucmpdi2.c | 1 - third_party/compiler_rt/ucmpti2.c | 1 - third_party/compiler_rt/udivdi3.c | 1 - third_party/compiler_rt/udivmoddi4.c | 1 - third_party/compiler_rt/udivmodsi4.c | 1 - third_party/compiler_rt/udivsi3.c | 1 - third_party/compiler_rt/umoddi3.c | 1 - third_party/compiler_rt/umodsi3.c | 1 - third_party/compiler_rt/umodti3.c | 1 - third_party/ctags/COPYING | 1 - third_party/ctags/README.cosmo | 1 - third_party/ctags/ant.c | 1 - third_party/ctags/args.c | 1 - third_party/ctags/args.h | 1 - third_party/ctags/asm.c | 1 - third_party/ctags/asp.c | 1 - third_party/ctags/awk.c | 1 - third_party/ctags/basic.c | 1 - third_party/ctags/beta.c | 1 - third_party/ctags/c.c | 1 - third_party/ctags/cobol.c | 1 - third_party/ctags/config.h | 1 - third_party/ctags/ctags.h | 1 - third_party/ctags/debug.c | 1 - third_party/ctags/debug.h | 1 - third_party/ctags/dosbatch.c | 1 - third_party/ctags/eiffel.c | 1 - third_party/ctags/entry.c | 1 - third_party/ctags/entry.h | 1 - third_party/ctags/erlang.c | 1 - third_party/ctags/flex.c | 1 - third_party/ctags/fortran.c | 1 - third_party/ctags/general.h | 1 - third_party/ctags/get.c | 1 - third_party/ctags/get.h | 1 - third_party/ctags/go.c | 1 - third_party/ctags/html.c | 1 - third_party/ctags/jscript.c | 1 - third_party/ctags/keyword.c | 1 - third_party/ctags/keyword.h | 1 - third_party/ctags/lisp.c | 1 - third_party/ctags/lregex.c | 1 - third_party/ctags/lua.c | 1 - third_party/ctags/main.c | 1 - third_party/ctags/main.h | 1 - third_party/ctags/make.c | 1 - third_party/ctags/matlab.c | 1 - third_party/ctags/objc.c | 1 - third_party/ctags/ocaml.c | 1 - third_party/ctags/options.c | 1 - third_party/ctags/options.h | 1 - third_party/ctags/parse.c | 1 - third_party/ctags/parse.h | 1 - third_party/ctags/parsers.h | 1 - third_party/ctags/pascal.c | 1 - third_party/ctags/perl.c | 1 - third_party/ctags/php.c | 1 - third_party/ctags/python.c | 1 - third_party/ctags/read.c | 1 - third_party/ctags/read.h | 1 - third_party/ctags/readtags.c | 1 - third_party/ctags/readtags.h | 1 - third_party/ctags/rexx.c | 1 - third_party/ctags/routines.c | 1 - third_party/ctags/routines.h | 1 - third_party/ctags/ruby.c | 1 - third_party/ctags/scheme.c | 1 - third_party/ctags/sh.c | 1 - third_party/ctags/slang.c | 1 - third_party/ctags/sml.c | 1 - third_party/ctags/sort.c | 1 - third_party/ctags/sort.h | 1 - third_party/ctags/sql.c | 1 - third_party/ctags/strlist.c | 1 - third_party/ctags/strlist.h | 1 - third_party/ctags/tcl.c | 1 - third_party/ctags/tex.c | 1 - third_party/ctags/verilog.c | 1 - third_party/ctags/vhdl.c | 1 - third_party/ctags/vim.c | 1 - third_party/ctags/vstring.c | 1 - third_party/ctags/vstring.h | 1 - third_party/ctags/yacc.c | 1 - third_party/dlmalloc/binmaps.inc | 1 - third_party/dlmalloc/chunks.inc | 1 - third_party/dlmalloc/debugging.inc | 1 - third_party/dlmalloc/debuglib.inc | 1 - third_party/dlmalloc/directmap.inc | 1 - third_party/dlmalloc/dlmalloc.c | 1 - third_party/dlmalloc/dlmalloc.h | 2 - third_party/dlmalloc/global.inc | 1 - third_party/dlmalloc/headfoot.inc | 1 - third_party/dlmalloc/hooks.inc | 1 - third_party/dlmalloc/indexing.inc | 1 - third_party/dlmalloc/init.inc | 1 - third_party/dlmalloc/locks.inc | 1 - third_party/dlmalloc/management.inc | 1 - third_party/dlmalloc/mspaces.inc | 1 - third_party/dlmalloc/platform.inc | 1 - third_party/dlmalloc/runtimechecks.inc | 1 - third_party/dlmalloc/smallbins.inc | 1 - third_party/dlmalloc/statistics.inc | 1 - third_party/dlmalloc/system.inc | 1 - third_party/dlmalloc/trees.inc | 1 - third_party/dlmalloc/vespene.internal.h | 2 - third_party/double-conversion/bignum-dtoa.cc | 1 - third_party/double-conversion/bignum-dtoa.h | 1 - third_party/double-conversion/bignum.cc | 1 - third_party/double-conversion/bignum.h | 1 - .../double-conversion/cached-powers.cc | 1 - third_party/double-conversion/cached-powers.h | 1 - third_party/double-conversion/diy-fp.h | 1 - .../double-conversion/double-to-string.cc | 1 - .../double-conversion/double-to-string.h | 1 - third_party/double-conversion/fast-dtoa.cc | 1 - third_party/double-conversion/fast-dtoa.h | 1 - third_party/double-conversion/fixed-dtoa.cc | 1 - third_party/double-conversion/fixed-dtoa.h | 1 - third_party/double-conversion/ieee.h | 1 - .../double-conversion/string-to-double.cc | 1 - third_party/double-conversion/strtod.cc | 1 - third_party/double-conversion/strtod.h | 1 - third_party/double-conversion/test/cctest.cc | 1 - third_party/double-conversion/test/cctest.h | 1 - third_party/double-conversion/test/checks.h | 1 - .../double-conversion/test/gay-fixed.cc | 1 - .../double-conversion/test/gay-precision.cc | 1 - .../test/gay-shortest-single.cc | 1 - .../double-conversion/test/gay-shortest.cc | 1 - .../test/test-bignum-dtoa.cc | 1 - .../double-conversion/test/test-bignum.cc | 1 - .../test/test-conversions.cc | 1 - .../double-conversion/test/test-diy-fp.cc | 1 - .../double-conversion/test/test-dtoa.cc | 1 - .../double-conversion/test/test-fast-dtoa.cc | 1 - .../double-conversion/test/test-fixed-dtoa.cc | 1 - .../double-conversion/test/test-ieee.cc | 1 - .../double-conversion/test/test-strtod.cc | 1 - third_party/double-conversion/utils.h | 1 - third_party/double-conversion/wrapper.cc | 2 +- third_party/double-conversion/wrapper.h | 2 - third_party/finger/display.c | 1 - third_party/finger/finger.c | 1 - third_party/finger/finger.h | 1 - third_party/finger/lprint.c | 1 - third_party/finger/net.c | 1 - third_party/finger/sprint.c | 1 - third_party/finger/util.c | 1 - third_party/gdtoa/dmisc.c | 1 - third_party/gdtoa/dtoa.c | 1 - third_party/gdtoa/g_Qfmt_p.c | 1 - third_party/gdtoa/g__fmt.c | 1 - third_party/gdtoa/g_ddfmt.c | 1 - third_party/gdtoa/g_ddfmt_p.c | 1 - third_party/gdtoa/g_dfmt.c | 1 - third_party/gdtoa/g_dfmt_p.c | 1 - third_party/gdtoa/g_ffmt.c | 1 - third_party/gdtoa/g_ffmt_p.c | 1 - third_party/gdtoa/g_xfmt.c | 1 - third_party/gdtoa/g_xfmt_p.c | 1 - third_party/gdtoa/gdtoa.c | 1 - third_party/gdtoa/gdtoa.h | 2 - third_party/gdtoa/gdtoa_fltrnds.inc | 1 - third_party/gdtoa/gethex.c | 1 - third_party/gdtoa/gmisc.c | 1 - third_party/gdtoa/hexnan.c | 1 - third_party/gdtoa/misc.c | 1 - third_party/gdtoa/smisc.c | 1 - third_party/gdtoa/strtoId.c | 1 - third_party/gdtoa/strtoIdd.c | 1 - third_party/gdtoa/strtoIf.c | 1 - third_party/gdtoa/strtoIg.c | 1 - third_party/gdtoa/strtoIx.c | 1 - third_party/gdtoa/strtod.c | 1 - third_party/gdtoa/strtodI.c | 1 - third_party/gdtoa/strtodg.c | 1 - third_party/gdtoa/strtof.c | 1 - third_party/gdtoa/strtopd.c | 1 - third_party/gdtoa/strtopdd.c | 1 - third_party/gdtoa/strtopf.c | 1 - third_party/gdtoa/strtopx.c | 1 - third_party/gdtoa/strtord.c | 1 - third_party/gdtoa/strtordd.c | 1 - third_party/gdtoa/strtorf.c | 1 - third_party/gdtoa/strtorx.c | 1 - third_party/gdtoa/sum.c | 1 - third_party/gdtoa/ulp.c | 1 - third_party/getopt/getopt.internal.h | 2 - third_party/getopt/getsubopt.c | 1 - third_party/getopt/long.c | 1 - third_party/getopt/long1.h | 2 - third_party/getopt/long2.h | 2 - third_party/ggml/common.cc | 1 - third_party/ggml/common.h | 3 - third_party/ggml/fp16.c | 1 - third_party/ggml/fp16.h | 2 - third_party/ggml/fp16.internal.h | 3 - third_party/ggml/ggjt.v1.c | 1 - third_party/ggml/ggjt.v1.internal.h | 3 - third_party/ggml/ggjt.v1.q4_0.c | 1 - third_party/ggml/ggjt.v1.q4_0.h | 2 - third_party/ggml/ggjt.v1.q4_1.c | 1 - third_party/ggml/ggjt.v1.q4_1.h | 2 - third_party/ggml/ggjt.v1.q4_2.c | 1 - third_party/ggml/ggjt.v1.q4_2.h | 2 - third_party/ggml/ggjt.v1.q5_0.c | 1 - third_party/ggml/ggjt.v1.q5_0.h | 2 - third_party/ggml/ggjt.v1.q5_1.c | 1 - third_party/ggml/ggjt.v1.q5_1.h | 2 - third_party/ggml/ggjt.v1.q8_0.c | 1 - third_party/ggml/ggjt.v1.q8_0.h | 2 - third_party/ggml/ggjt.v1.q8_1.c | 1 - third_party/ggml/ggjt.v1.q8_1.h | 2 - third_party/ggml/ggjt.v2.c | 1 - third_party/ggml/ggjt.v2.internal.h | 2 - third_party/ggml/ggjt.v2.q4_0.c | 1 - third_party/ggml/ggjt.v2.q4_0.h | 2 - third_party/ggml/ggjt.v2.q4_1.c | 1 - third_party/ggml/ggjt.v2.q4_1.h | 2 - third_party/ggml/ggjt.v2.q5_0.c | 1 - third_party/ggml/ggjt.v2.q5_0.h | 2 - third_party/ggml/ggjt.v2.q5_1.c | 1 - third_party/ggml/ggjt.v2.q5_1.h | 2 - third_party/ggml/ggjt.v2.q8_0.c | 1 - third_party/ggml/ggjt.v2.q8_0.h | 2 - third_party/ggml/ggjt.v2.q8_1.c | 1 - third_party/ggml/ggjt.v2.q8_1.h | 2 - third_party/ggml/ggml.c | 1 - third_party/ggml/ggml.h | 3 - third_party/ggml/llama.cc | 2 - third_party/ggml/llama.h | 2 - third_party/ggml/llama_util.h | 1 - third_party/ggml/main.cc | 3 +- third_party/ggml/perplexity.cc | 1 - third_party/ggml/quantize.cc | 1 - third_party/hiredis/alloc.c | 1 - third_party/hiredis/alloc.h | 1 - third_party/hiredis/async.c | 1 - third_party/hiredis/async.h | 1 - third_party/hiredis/async_private.inc | 1 - third_party/hiredis/dict.c | 1 - third_party/hiredis/dict.h | 1 - third_party/hiredis/hiredis.c | 1 - third_party/hiredis/hiredis.h | 1 - third_party/hiredis/net.c | 1 - third_party/hiredis/net.h | 1 - third_party/hiredis/read.c | 1 - third_party/hiredis/read.h | 1 - third_party/hiredis/sds.c | 1 - third_party/hiredis/sds.h | 1 - third_party/hiredis/sdsalloc.h | 1 - third_party/intel/adxintrin.internal.h | 1 - third_party/intel/ammintrin.internal.h | 1 - third_party/intel/amxbf16intrin.internal.h | 1 - third_party/intel/amxint8intrin.internal.h | 1 - third_party/intel/amxtileintrin.internal.h | 1 - third_party/intel/avx2intrin.internal.h | 1 - .../intel/avx5124fmapsintrin.internal.h | 1 - .../intel/avx5124vnniwintrin.internal.h | 1 - third_party/intel/avx512bf16intrin.internal.h | 1 - .../intel/avx512bf16vlintrin.internal.h | 1 - .../intel/avx512bitalgintrin.internal.h | 1 - third_party/intel/avx512bwintrin.internal.h | 1 - third_party/intel/avx512cdintrin.internal.h | 1 - third_party/intel/avx512dqintrin.internal.h | 1 - third_party/intel/avx512erintrin.internal.h | 1 - third_party/intel/avx512fintrin.internal.h | 1 - third_party/intel/avx512ifmaintrin.internal.h | 1 - .../intel/avx512ifmavlintrin.internal.h | 1 - third_party/intel/avx512pfintrin.internal.h | 1 - .../intel/avx512vbmi2intrin.internal.h | 1 - .../intel/avx512vbmi2vlintrin.internal.h | 1 - third_party/intel/avx512vbmiintrin.internal.h | 1 - .../intel/avx512vbmivlintrin.internal.h | 1 - third_party/intel/avx512vlbwintrin.internal.h | 1 - third_party/intel/avx512vldqintrin.internal.h | 1 - third_party/intel/avx512vlintrin.internal.h | 1 - third_party/intel/avx512vnniintrin.internal.h | 1 - .../intel/avx512vnnivlintrin.internal.h | 1 - .../intel/avx512vp2intersectintrin.internal.h | 1 - .../avx512vp2intersectvlintrin.internal.h | 1 - .../intel/avx512vpopcntdqintrin.internal.h | 1 - .../intel/avx512vpopcntdqvlintrin.internal.h | 1 - third_party/intel/avxintrin.internal.h | 1 - third_party/intel/avxvnniintrin.internal.h | 1 - third_party/intel/bmi2intrin.internal.h | 1 - third_party/intel/bmiintrin.internal.h | 1 - third_party/intel/cetintrin.internal.h | 1 - third_party/intel/cldemoteintrin.internal.h | 1 - third_party/intel/clflushoptintrin.internal.h | 1 - third_party/intel/clwbintrin.internal.h | 1 - third_party/intel/clzerointrin.internal.h | 1 - third_party/intel/cpuid.internal.h | 1 - third_party/intel/emmintrin.internal.h | 1 - third_party/intel/enqcmdintrin.internal.h | 1 - third_party/intel/f16cintrin.internal.h | 1 - third_party/intel/fma4intrin.internal.h | 1 - third_party/intel/fmaintrin.internal.h | 1 - third_party/intel/fxsrintrin.internal.h | 1 - third_party/intel/gfniintrin.internal.h | 1 - third_party/intel/hresetintrin.internal.h | 1 - third_party/intel/ia32intrin.internal.h | 1 - third_party/intel/immintrin.internal.h | 1 - third_party/intel/keylockerintrin.internal.h | 1 - third_party/intel/lwpintrin.internal.h | 1 - third_party/intel/lzcntintrin.internal.h | 1 - third_party/intel/mm3dnow.internal.h | 1 - third_party/intel/mm_malloc.internal.h | 1 - third_party/intel/mmintrin.internal.h | 1 - third_party/intel/movdirintrin.internal.h | 1 - third_party/intel/mwaitxintrin.internal.h | 1 - third_party/intel/nmmintrin.internal.h | 1 - third_party/intel/pconfigintrin.internal.h | 1 - third_party/intel/pkuintrin.internal.h | 1 - third_party/intel/pmmintrin.internal.h | 1 - third_party/intel/popcntintrin.internal.h | 1 - third_party/intel/prfchwintrin.internal.h | 1 - third_party/intel/rdseedintrin.internal.h | 1 - third_party/intel/rtmintrin.internal.h | 1 - third_party/intel/serializeintrin.internal.h | 1 - third_party/intel/sgxintrin.internal.h | 1 - third_party/intel/shaintrin.internal.h | 1 - third_party/intel/smmintrin.internal.h | 1 - third_party/intel/tbmintrin.internal.h | 1 - third_party/intel/tmmintrin.internal.h | 1 - third_party/intel/tsxldtrkintrin.internal.h | 1 - third_party/intel/uintrintrin.internal.h | 1 - third_party/intel/upgrade.sh | 1 - third_party/intel/vaesintrin.internal.h | 1 - third_party/intel/vpclmulqdqintrin.internal.h | 1 - third_party/intel/waitpkgintrin.internal.h | 1 - third_party/intel/wbnoinvdintrin.internal.h | 1 - third_party/intel/wmmintrin.internal.h | 1 - third_party/intel/x86gprintrin.internal.h | 1 - third_party/intel/x86intrin.internal.h | 1 - third_party/intel/xmmintrin.internal.h | 1 - third_party/intel/xopintrin.internal.h | 1 - third_party/intel/xsavecintrin.internal.h | 1 - third_party/intel/xsaveintrin.internal.h | 1 - third_party/intel/xsaveoptintrin.internal.h | 1 - third_party/intel/xsavesintrin.internal.h | 1 - third_party/intel/xtestintrin.internal.h | 1 - third_party/libcxx/.clang-format | 13 -- third_party/libcxx/__sso_allocator | 1 - third_party/libcxx/__std_stream | 1 - third_party/libcxx/algorithm.cc | 1 - third_party/libcxx/any | 1 - third_party/libcxx/atomic | 1 - third_party/libcxx/ccomplex | 1 - third_party/libcxx/cfenv | 1 - third_party/libcxx/cfloat | 1 - third_party/libcxx/chrono.cc | 1 - third_party/libcxx/cinttypes | 1 - third_party/libcxx/ciso646 | 1 - third_party/libcxx/clocale | 1 - third_party/libcxx/codecvt | 1 - third_party/libcxx/compare | 1 - third_party/libcxx/complex | 1 - third_party/libcxx/condition_variable | 1 - third_party/libcxx/condition_variable.cc | 1 - .../libcxx/condition_variable_destructor.cc | 1 - third_party/libcxx/csetjmp | 1 - third_party/libcxx/csignal | 1 - third_party/libcxx/cstdbool | 1 - third_party/libcxx/ctgmath | 1 - third_party/libcxx/directory_iterator.cc | 1 - third_party/libcxx/execution | 1 - third_party/libcxx/experimental/__config | 1 - third_party/libcxx/filesystem | 1 - third_party/libcxx/filesystem_common.hh | 1 - third_party/libcxx/forward_list | 1 - third_party/libcxx/fstream | 1 - third_party/libcxx/functional.cc | 1 - third_party/libcxx/future | 1 - third_party/libcxx/future.cc | 1 - third_party/libcxx/hash.cc | 1 - third_party/libcxx/include/atomic_support.hh | 1 - third_party/libcxx/include/config_elast.hh | 1 - third_party/libcxx/iomanip | 1 - third_party/libcxx/ios.cc | 1 - third_party/libcxx/iostream | 1 - third_party/libcxx/iostream.cc | 1 - third_party/libcxx/locale1.cc | 1 - third_party/libcxx/locale2.cc | 1 - third_party/libcxx/locale3.cc | 1 - third_party/libcxx/locale4.cc | 1 - third_party/libcxx/memory.cc | 1 - third_party/libcxx/mutex | 1 - third_party/libcxx/mutex.cc | 1 - third_party/libcxx/operations.cc | 1 - third_party/libcxx/optional.cc | 1 - third_party/libcxx/regex | 1 - third_party/libcxx/regex.cc | 1 - third_party/libcxx/scoped_allocator | 1 - third_party/libcxx/shared_mutex | 1 - third_party/libcxx/shared_mutex.cc | 1 - third_party/libcxx/span | 1 - third_party/libcxx/stack | 1 - third_party/libcxx/string.cc | 1 - third_party/libcxx/strstream | 1 - third_party/libcxx/strstream.cc | 1 - third_party/libcxx/thread | 1 - third_party/libcxx/thread.cc | 1 - third_party/libcxx/typeindex | 1 - third_party/libcxx/valarray | 1 - third_party/libcxx/valarray.cc | 1 - third_party/libcxx/variant | 1 - third_party/linenoise/linenoise.c | 2 +- third_party/linenoise/linenoise.h | 2 - third_party/lua/cosmo.h | 2 - third_party/lua/lapi.c | 1 - third_party/lua/lapi.h | 1 - third_party/lua/lauxlib.c | 1 - third_party/lua/lauxlib.h | 1 - third_party/lua/lbaselib.c | 1 - third_party/lua/lcode.c | 1 - third_party/lua/lcode.h | 1 - third_party/lua/lcorolib.c | 1 - third_party/lua/ldblib.c | 1 - third_party/lua/ldebug.c | 1 - third_party/lua/ldebug.h | 1 - third_party/lua/ldo.c | 1 - third_party/lua/ldo.h | 1 - third_party/lua/ldump.c | 1 - third_party/lua/lfunc.c | 1 - third_party/lua/lfunc.h | 1 - third_party/lua/lgc.c | 1 - third_party/lua/lgc.h | 1 - third_party/lua/linit.c | 1 - third_party/lua/liolib.c | 1 - third_party/lua/llex.c | 1 - third_party/lua/llex.h | 1 - third_party/lua/llimits.h | 1 - third_party/lua/lmathlib.c | 1 - third_party/lua/lmem.c | 1 - third_party/lua/lmem.h | 1 - third_party/lua/loadlib.c | 1 - third_party/lua/lobject.c | 1 - third_party/lua/lobject.h | 1 - third_party/lua/lopcodes.c | 1 - third_party/lua/lopcodes.h | 1 - third_party/lua/loslib.c | 1 - third_party/lua/lparser.c | 1 - third_party/lua/lparser.h | 1 - third_party/lua/lrepl.c | 1 - third_party/lua/lrepl.h | 2 - third_party/lua/lstate.c | 1 - third_party/lua/lstate.h | 1 - third_party/lua/lstring.c | 1 - third_party/lua/lstring.h | 1 - third_party/lua/lstrlib.c | 1 - third_party/lua/ltable.c | 1 - third_party/lua/ltable.h | 1 - third_party/lua/ltablib.c | 1 - third_party/lua/ltests.c | 1 - third_party/lua/ltests.h | 1 - third_party/lua/ltm.c | 1 - third_party/lua/ltm.h | 1 - third_party/lua/lua.h | 3 - third_party/lua/lua.main.c | 1 - third_party/lua/luac.main.c | 1 - third_party/lua/luaconf.h | 1 - third_party/lua/luaencodejsondata.c | 2 +- third_party/lua/luaencodeluadata.c | 3 +- third_party/lua/lualib.h | 1 - third_party/lua/lundump.c | 1 - third_party/lua/lundump.h | 1 - third_party/lua/lunix.c | 2 +- third_party/lua/lunix.h | 2 - third_party/lua/lutf8lib.c | 1 - third_party/lua/lvm.c | 1 - third_party/lua/lvm.h | 1 - third_party/lua/lzio.c | 1 - third_party/lua/lzio.h | 1 - third_party/lua/tms.h | 2 - third_party/lua/visitor.h | 2 - third_party/lz4cli/bench.c | 1 - third_party/lz4cli/bench.h | 1 - third_party/lz4cli/datagen.c | 1 - third_party/lz4cli/datagen.h | 1 - third_party/lz4cli/lz4.c | 1 - third_party/lz4cli/lz4.h | 1 - third_party/lz4cli/lz4cli.c | 1 - third_party/lz4cli/lz4frame.c | 1 - third_party/lz4cli/lz4frame.h | 1 - third_party/lz4cli/lz4hc.c | 1 - third_party/lz4cli/lz4hc.h | 1 - third_party/lz4cli/lz4io.c | 1 - third_party/lz4cli/lz4io.h | 1 - third_party/lz4cli/platform.h | 1 - third_party/lz4cli/util.h | 1 - third_party/lz4cli/xxhash.c | 1 - third_party/lz4cli/xxhash.h | 1 - third_party/make/alloca.h | 1 - third_party/make/ar.c | 1 - third_party/make/arscan.c | 1 - third_party/make/basename-lgpl.c | 2 - third_party/make/commands.c | 1 - third_party/make/commands.h | 1 - third_party/make/concat-filename.c | 1 - third_party/make/concat-filename.h | 1 - third_party/make/debug.h | 1 - third_party/make/default.c | 1 - third_party/make/dep.h | 1 - third_party/make/dir.c | 1 - third_party/make/dirname-lgpl.c | 2 - third_party/make/dirname.h | 1 - third_party/make/error.c | 1 - third_party/make/error.h | 1 - third_party/make/exitfail.c | 1 - third_party/make/exitfail.h | 1 - third_party/make/expand.c | 1 - third_party/make/fcntl.c | 1 - third_party/make/fcntl.h | 1 - third_party/make/fd-hook.c | 2 - third_party/make/fd-hook.h | 1 - third_party/make/file.c | 1 - third_party/make/filedef.h | 1 - third_party/make/filename.h | 1 - third_party/make/findprog-in.c | 1 - third_party/make/findprog.h | 1 - third_party/make/function.c | 1 - third_party/make/getopt.c | 1 - third_party/make/getopt.h | 1 - third_party/make/getopt1.c | 1 - third_party/make/getprogname.c | 1 - third_party/make/getprogname.h | 1 - third_party/make/gettext.h | 1 - third_party/make/gnumake.h | 1 - third_party/make/guile.c | 1 - third_party/make/hash.c | 3 +- third_party/make/hash.h | 1 - third_party/make/implicit.c | 1 - third_party/make/intprops.h | 1 - third_party/make/job.c | 3 +- third_party/make/job.h | 1 - third_party/make/load.c | 1 - third_party/make/loadapi.c | 1 - third_party/make/main.c | 1 - third_party/make/makeint.inc | 1 - third_party/make/misc.c | 1 - third_party/make/os.h | 1 - third_party/make/output.c | 1 - third_party/make/output.h | 1 - third_party/make/posixos.c | 1 - third_party/make/read.c | 1 - third_party/make/remake.c | 1 - third_party/make/remote-stub.c | 1 - third_party/make/rule.c | 1 - third_party/make/rule.h | 1 - third_party/make/stddef.h | 1 - third_party/make/stdint.h | 1 - third_party/make/stdio.h | 1 - third_party/make/stdlib.h | 1 - third_party/make/strcache.c | 1 - third_party/make/stripslash.c | 1 - third_party/make/unistd.c | 1 - third_party/make/unistd.h | 1 - third_party/make/variable.c | 1 - third_party/make/variable.h | 1 - third_party/make/version.c | 1 - third_party/make/vpath.c | 1 - third_party/make/xalloc-die.c | 1 - third_party/make/xalloc-oversized.h | 1 - third_party/make/xalloc.h | 1 - third_party/make/xconcat-filename.c | 1 - third_party/make/xmalloc.c | 1 - third_party/maxmind/maxminddb.c | 2 +- third_party/maxmind/maxminddb.h | 2 - third_party/mbedtls/aes.c | 3 +- third_party/mbedtls/aes.h | 1 - third_party/mbedtls/aesce.c | 1 - third_party/mbedtls/aesce.h | 2 - third_party/mbedtls/aesni.c | 3 +- third_party/mbedtls/aesni.h | 1 - third_party/mbedtls/asn1.h | 1 - third_party/mbedtls/asn1parse.c | 1 - third_party/mbedtls/asn1write.c | 1 - third_party/mbedtls/asn1write.h | 1 - third_party/mbedtls/base64.c | 1 - third_party/mbedtls/base64.h | 1 - third_party/mbedtls/bigmul.c | 2 - third_party/mbedtls/bigmul4.c | 1 - third_party/mbedtls/bignum.c | 3 +- third_party/mbedtls/bignum.h | 1 - third_party/mbedtls/bignum_internal.h | 2 - third_party/mbedtls/bigshift.c | 1 - third_party/mbedtls/blake2b256.c | 1 - third_party/mbedtls/ccm.c | 1 - third_party/mbedtls/ccm.h | 2 - third_party/mbedtls/certs.c | 1 - third_party/mbedtls/certs.h | 1 - third_party/mbedtls/chacha20.c | 5 +- third_party/mbedtls/chacha20.h | 1 - third_party/mbedtls/chachapoly.c | 1 - third_party/mbedtls/chachapoly.h | 1 - third_party/mbedtls/check.inc | 1 - third_party/mbedtls/cipher.c | 1 - third_party/mbedtls/cipher.h | 1 - third_party/mbedtls/cipher_internal.h | 1 - third_party/mbedtls/cipher_wrap.c | 1 - third_party/mbedtls/ctr_drbg.c | 1 - third_party/mbedtls/ctr_drbg.h | 1 - third_party/mbedtls/debug.c | 1 - third_party/mbedtls/des.c | 1 - third_party/mbedtls/des.h | 1 - third_party/mbedtls/dhm.c | 1 - third_party/mbedtls/dhm.h | 1 - third_party/mbedtls/ecdh.c | 1 - third_party/mbedtls/ecdh.h | 1 - third_party/mbedtls/ecdh_everest.c | 1 - third_party/mbedtls/ecdsa.c | 1 - third_party/mbedtls/ecdsa.h | 1 - third_party/mbedtls/ecp.c | 1 - third_party/mbedtls/ecp.h | 1 - third_party/mbedtls/ecp256.c | 1 - third_party/mbedtls/ecp384.c | 1 - third_party/mbedtls/ecp_curves.c | 1 - third_party/mbedtls/ecp_internal.h | 1 - third_party/mbedtls/ecpshl.c | 1 - third_party/mbedtls/entropy.c | 1 - third_party/mbedtls/entropy.h | 1 - third_party/mbedtls/entropy_poll.h | 1 - third_party/mbedtls/error.c | 1 - third_party/mbedtls/error.h | 1 - third_party/mbedtls/everest.c | 2 +- third_party/mbedtls/everest.h | 2 - third_party/mbedtls/fastdiv.h | 2 - third_party/mbedtls/formatclientciphers.c | 2 +- third_party/mbedtls/gcm.c | 3 +- third_party/mbedtls/gcm.h | 1 - third_party/mbedtls/hkdf.c | 1 - third_party/mbedtls/hkdf.h | 3 - third_party/mbedtls/hmac_drbg.c | 1 - third_party/mbedtls/hmac_drbg.h | 1 - third_party/mbedtls/iana.h | 2 - third_party/mbedtls/md.c | 1 - third_party/mbedtls/md.h | 1 - third_party/mbedtls/md5.c | 5 +- third_party/mbedtls/md5.h | 1 - third_party/mbedtls/md5t.c | 1 - third_party/mbedtls/memory_buffer_alloc.c | 1 - third_party/mbedtls/memory_buffer_alloc.h | 1 - third_party/mbedtls/net_sockets.h | 3 - third_party/mbedtls/nist_kw.c | 1 - third_party/mbedtls/nist_kw.h | 1 - third_party/mbedtls/oid.c | 1 - third_party/mbedtls/oid.h | 1 - third_party/mbedtls/pem.c | 1 - third_party/mbedtls/pem.h | 1 - third_party/mbedtls/pk.c | 1 - third_party/mbedtls/pk.h | 1 - third_party/mbedtls/pk_internal.h | 1 - third_party/mbedtls/pk_wrap.c | 1 - third_party/mbedtls/pkcs5.c | 1 - third_party/mbedtls/pkcs5.h | 1 - third_party/mbedtls/pkparse.c | 1 - third_party/mbedtls/pkwrite.c | 1 - third_party/mbedtls/poly1305.c | 5 +- third_party/mbedtls/poly1305.h | 1 - third_party/mbedtls/rsa.c | 1 - third_party/mbedtls/rsa.h | 3 - third_party/mbedtls/rsa_internal.c | 1 - third_party/mbedtls/rsa_internal.h | 1 - third_party/mbedtls/san.c | 2 +- third_party/mbedtls/select.h | 2 - third_party/mbedtls/sha1.c | 3 +- third_party/mbedtls/sha1.h | 1 - third_party/mbedtls/sha1t.c | 1 - third_party/mbedtls/sha256.c | 1 - third_party/mbedtls/sha256.h | 1 - third_party/mbedtls/sha256t.c | 1 - third_party/mbedtls/sha512.c | 1 - third_party/mbedtls/sha512.h | 1 - third_party/mbedtls/sha512t.c | 1 - third_party/mbedtls/ssl.h | 1 - third_party/mbedtls/ssl_cache.c | 1 - third_party/mbedtls/ssl_cache.h | 1 - third_party/mbedtls/ssl_ciphersuites.c | 1 - third_party/mbedtls/ssl_ciphersuites.h | 1 - third_party/mbedtls/ssl_cli.c | 1 - third_party/mbedtls/ssl_cookie.c | 1 - third_party/mbedtls/ssl_cookie.h | 1 - third_party/mbedtls/ssl_internal.h | 1 - third_party/mbedtls/ssl_invasive.h | 2 - third_party/mbedtls/ssl_msg.c | 1 - third_party/mbedtls/ssl_srv.c | 1 - third_party/mbedtls/ssl_ticket.c | 1 - third_party/mbedtls/ssl_ticket.h | 1 - third_party/mbedtls/ssl_tls.c | 1 - third_party/mbedtls/ssl_tls13_keys.c | 1 - third_party/mbedtls/test/everest_unravaged.c | 3 +- third_party/mbedtls/test/lib.c | 2 +- third_party/mbedtls/test/lib.h | 2 - third_party/mbedtls/test/test_suite_aes.cbc.c | 1 - third_party/mbedtls/test/test_suite_aes.cfb.c | 1 - third_party/mbedtls/test/test_suite_aes.ecb.c | 1 - third_party/mbedtls/test/test_suite_aes.ofb.c | 1 - .../mbedtls/test/test_suite_aes.rest.c | 1 - third_party/mbedtls/test/test_suite_aes.xts.c | 1 - .../mbedtls/test/test_suite_asn1parse.c | 1 - .../mbedtls/test/test_suite_asn1write.c | 1 - third_party/mbedtls/test/test_suite_base64.c | 1 - .../mbedtls/test/test_suite_blowfish.c | 1 - third_party/mbedtls/test/test_suite_ccm.c | 1 - .../mbedtls/test/test_suite_chacha20.c | 1 - .../mbedtls/test/test_suite_chachapoly.c | 1 - .../mbedtls/test/test_suite_cipher.aes.c | 1 - .../mbedtls/test/test_suite_cipher.blowfish.c | 1 - .../mbedtls/test/test_suite_cipher.ccm.c | 1 - .../mbedtls/test/test_suite_cipher.chacha20.c | 1 - .../test/test_suite_cipher.chachapoly.c | 1 - .../mbedtls/test/test_suite_cipher.des.c | 1 - .../mbedtls/test/test_suite_cipher.gcm.c | 1 - .../mbedtls/test/test_suite_cipher.misc.c | 1 - .../mbedtls/test/test_suite_cipher.nist_kw.c | 1 - .../mbedtls/test/test_suite_cipher.null.c | 1 - .../mbedtls/test/test_suite_cipher.padding.c | 1 - .../mbedtls/test/test_suite_ctr_drbg.c | 1 - third_party/mbedtls/test/test_suite_des.c | 1 - third_party/mbedtls/test/test_suite_dhm.c | 1 - third_party/mbedtls/test/test_suite_ecdh.c | 1 - third_party/mbedtls/test/test_suite_ecdsa.c | 1 - third_party/mbedtls/test/test_suite_ecp.c | 1 - third_party/mbedtls/test/test_suite_entropy.c | 1 - third_party/mbedtls/test/test_suite_error.c | 1 - .../mbedtls/test/test_suite_gcm.aes128_de.c | 1 - .../mbedtls/test/test_suite_gcm.aes128_en.c | 1 - .../mbedtls/test/test_suite_gcm.aes192_de.c | 1 - .../mbedtls/test/test_suite_gcm.aes192_en.c | 1 - .../mbedtls/test/test_suite_gcm.aes256_de.c | 1 - .../mbedtls/test/test_suite_gcm.aes256_en.c | 1 - .../mbedtls/test/test_suite_gcm.misc.c | 1 - third_party/mbedtls/test/test_suite_hkdf.c | 1 - .../mbedtls/test/test_suite_hmac_drbg.misc.c | 1 - .../test/test_suite_hmac_drbg.no_reseed.c | 1 - .../mbedtls/test/test_suite_hmac_drbg.nopr.c | 1 - .../mbedtls/test/test_suite_hmac_drbg.pr.c | 1 - third_party/mbedtls/test/test_suite_md.c | 1 - third_party/mbedtls/test/test_suite_mdx.c | 1 - .../test/test_suite_memory_buffer_alloc.c | 1 - third_party/mbedtls/test/test_suite_mpi.c | 1 - third_party/mbedtls/test/test_suite_net.c | 1 - third_party/mbedtls/test/test_suite_nist_kw.c | 1 - third_party/mbedtls/test/test_suite_oid.c | 1 - third_party/mbedtls/test/test_suite_pem.c | 1 - third_party/mbedtls/test/test_suite_pk.c | 1 - .../mbedtls/test/test_suite_pkcs1_v15.c | 1 - .../mbedtls/test/test_suite_pkcs1_v21.c | 1 - third_party/mbedtls/test/test_suite_pkcs5.c | 1 - third_party/mbedtls/test/test_suite_pkparse.c | 1 - third_party/mbedtls/test/test_suite_pkwrite.c | 1 - .../mbedtls/test/test_suite_poly1305.c | 1 - third_party/mbedtls/test/test_suite_random.c | 1 - third_party/mbedtls/test/test_suite_rsa.c | 1 - third_party/mbedtls/test/test_suite_shax.c | 1 - third_party/mbedtls/test/test_suite_ssl.c | 1 - third_party/mbedtls/test/test_suite_timing.c | 1 - third_party/mbedtls/test/test_suite_version.c | 1 - .../mbedtls/test/test_suite_x509parse.c | 1 - .../mbedtls/test/test_suite_x509write.c | 1 - third_party/mbedtls/version.h | 1 - third_party/mbedtls/x509.c | 1 - third_party/mbedtls/x509.h | 1 - third_party/mbedtls/x509_create.c | 1 - third_party/mbedtls/x509_crl.c | 1 - third_party/mbedtls/x509_crl.h | 1 - third_party/mbedtls/x509_crt.c | 5 +- third_party/mbedtls/x509_crt.h | 1 - third_party/mbedtls/x509_csr.c | 1 - third_party/mbedtls/x509_csr.h | 1 - third_party/mbedtls/x509write_crt.c | 1 - third_party/mbedtls/x509write_csr.c | 1 - third_party/musl/crypt.c | 1 - third_party/musl/crypt.h | 2 - third_party/musl/crypt.internal.h | 2 - third_party/musl/crypt_blowfish.c | 1 - third_party/musl/crypt_des.c | 1 - third_party/musl/crypt_des.internal.h | 1 - third_party/musl/crypt_md5.c | 1 - third_party/musl/crypt_r.c | 1 - third_party/musl/crypt_sha256.c | 1 - third_party/musl/crypt_sha512.c | 1 - third_party/musl/encrypt.c | 1 - third_party/musl/fnmatch.h | 2 - third_party/musl/glob.h | 2 - third_party/musl/hsearch.c | 1 - third_party/musl/insque.c | 1 - third_party/musl/lockf.c | 1 - third_party/musl/lockf.h | 2 - third_party/musl/lsearch.c | 1 - third_party/musl/mntent.c | 1 - third_party/musl/mntent.h | 2 - third_party/musl/passwd.h | 2 - third_party/musl/pwd.c | 1 - third_party/musl/rand48.c | 1 - third_party/musl/rand48.h | 2 - third_party/musl/search.h | 1 - third_party/musl/strfmon.c | 1 - third_party/musl/tdelete.c | 1 - third_party/musl/tdestroy.c | 1 - third_party/musl/tempnam.c | 1 - third_party/musl/tempnam.h | 2 - third_party/musl/tfind.c | 1 - third_party/musl/tsearch.c | 1 - third_party/musl/twalk.c | 1 - third_party/nsync/array.internal.h | 1 - third_party/nsync/atomic.h | 2 - third_party/nsync/atomic.internal.h | 2 - third_party/nsync/common.c | 1 - third_party/nsync/common.internal.h | 2 - third_party/nsync/counter.h | 2 - third_party/nsync/cv.h | 2 - third_party/nsync/debug.h | 2 - third_party/nsync/futex.c | 1 - third_party/nsync/futex.internal.h | 2 - third_party/nsync/heap.internal.h | 1 - third_party/nsync/mem/array.c | 1 - third_party/nsync/mem/nsync_counter.c | 1 - third_party/nsync/mem/nsync_cv.c | 1 - third_party/nsync/mem/nsync_debug.c | 1 - third_party/nsync/mem/nsync_mu_wait.c | 1 - third_party/nsync/mem/nsync_note.c | 1 - third_party/nsync/mem/nsync_once.c | 1 - third_party/nsync/mem/nsync_sem_wait.c | 1 - third_party/nsync/mem/nsync_wait.c | 1 - third_party/nsync/mu.c | 1 - third_party/nsync/mu.h | 2 - third_party/nsync/mu_semaphore.c | 1 - third_party/nsync/mu_semaphore.h | 2 - third_party/nsync/mu_semaphore.internal.h | 2 - third_party/nsync/mu_semaphore_futex.c | 1 - third_party/nsync/mu_semaphore_gcd.c | 1 - third_party/nsync/mu_semaphore_sem.c | 1 - third_party/nsync/mu_wait.h | 2 - third_party/nsync/note.h | 2 - third_party/nsync/once.h | 2 - third_party/nsync/panic.c | 1 - third_party/nsync/races.internal.h | 2 - third_party/nsync/testing/atm_log.c | 1 - third_party/nsync/testing/closure.c | 1 - third_party/nsync/testing/closure.h | 1 - third_party/nsync/testing/counter_test.c | 1 - .../testing/cv_mu_timeout_stress_test_.c | 1 - third_party/nsync/testing/cv_test.c | 1 - .../nsync/testing/cv_wait_example_test.c | 1 - third_party/nsync/testing/dll_test.c | 1 - .../nsync/testing/mu_starvation_test.c | 1 - third_party/nsync/testing/mu_test.c | 1 - .../nsync/testing/mu_wait_example_test.c | 1 - third_party/nsync/testing/mu_wait_test.c | 1 - third_party/nsync/testing/note_test.c | 1 - third_party/nsync/testing/once_test.c | 1 - third_party/nsync/testing/pingpong_test.c | 1 - third_party/nsync/testing/smprintf.c | 1 - third_party/nsync/testing/start_thread.c | 1 - third_party/nsync/testing/testing.c | 1 - third_party/nsync/testing/testing.h | 1 - third_party/nsync/testing/time_extra.c | 1 - third_party/nsync/testing/wait_test.c | 1 - third_party/nsync/time.h | 2 - third_party/nsync/wait_s.internal.h | 2 - third_party/nsync/waiter.h | 2 - third_party/nsync/yield.c | 1 - third_party/puff/puff.c | 1 - third_party/puff/puff.h | 2 - third_party/python/Include/Python-ast.h | 3 - third_party/python/Include/Python.h | 1 - third_party/python/Include/accu.h | 1 - third_party/python/Include/asdl.h | 1 - third_party/python/Include/ast.h | 1 - third_party/python/Include/bitset.h | 1 - third_party/python/Include/bltinmodule.h | 1 - third_party/python/Include/boolobject.h | 1 - third_party/python/Include/bytearrayobject.h | 1 - third_party/python/Include/bytes_methods.h | 1 - third_party/python/Include/bytesobject.h | 1 - third_party/python/Include/cellobject.h | 1 - third_party/python/Include/ceval.h | 1 - third_party/python/Include/classobject.h | 1 - third_party/python/Include/codecs.h | 1 - third_party/python/Include/compile.h | 1 - third_party/python/Include/complexobject.h | 1 - third_party/python/Include/datetime.h | 1 - third_party/python/Include/descrobject.h | 1 - third_party/python/Include/dictobject.h | 1 - third_party/python/Include/dtoa.h | 1 - .../python/Include/dynamic_annotations.h | 1 - third_party/python/Include/enumobject.h | 1 - third_party/python/Include/errcode.h | 1 - third_party/python/Include/eval.h | 1 - third_party/python/Include/ezprint.h | 2 - third_party/python/Include/fileobject.h | 1 - third_party/python/Include/fileutils.h | 1 - third_party/python/Include/floatobject.h | 1 - third_party/python/Include/frameobject.h | 1 - third_party/python/Include/funcobject.h | 1 - third_party/python/Include/genobject.h | 1 - third_party/python/Include/graminit.h | 1 - third_party/python/Include/grammar.h | 1 - third_party/python/Include/import.h | 1 - third_party/python/Include/intrcheck.h | 1 - third_party/python/Include/iterobject.h | 1 - third_party/python/Include/listobject.h | 1 - third_party/python/Include/longintrepr.h | 1 - third_party/python/Include/longobject.h | 1 - third_party/python/Include/marshal.h | 1 - third_party/python/Include/memoryobject.h | 1 - third_party/python/Include/metagrammar.h | 1 - third_party/python/Include/methodobject.h | 1 - third_party/python/Include/modsupport.h | 1 - third_party/python/Include/moduleobject.h | 1 - third_party/python/Include/namespaceobject.h | 1 - third_party/python/Include/node.h | 1 - third_party/python/Include/object.h | 1 - third_party/python/Include/objimpl.h | 1 - third_party/python/Include/odictobject.h | 1 - third_party/python/Include/opcode.h | 1 - third_party/python/Include/osmodule.h | 1 - third_party/python/Include/parsetok.h | 1 - third_party/python/Include/patchlevel.h | 1 - third_party/python/Include/pgen.h | 1 - third_party/python/Include/pgenheaders.h | 1 - third_party/python/Include/py_curses.h | 1 - third_party/python/Include/pyarena.h | 1 - third_party/python/Include/pyatomic.h | 1 - third_party/python/Include/pycapsule.h | 1 - third_party/python/Include/pydebug.h | 1 - third_party/python/Include/pyerrors.h | 1 - third_party/python/Include/pyexpat.h | 3 - third_party/python/Include/pyfpe.h | 1 - third_party/python/Include/pygetopt.h | 1 - third_party/python/Include/pyhash.h | 1 - third_party/python/Include/pylifecycle.h | 1 - third_party/python/Include/pymacro.h | 1 - third_party/python/Include/pymath.h | 1 - third_party/python/Include/pymem.h | 1 - third_party/python/Include/pyport.h | 1 - third_party/python/Include/pystate.h | 1 - third_party/python/Include/pystrcmp.h | 1 - third_party/python/Include/pystrhex.h | 1 - third_party/python/Include/pystrtod.h | 1 - third_party/python/Include/pythonrun.h | 1 - third_party/python/Include/pythread.h | 1 - third_party/python/Include/rangeobject.h | 1 - third_party/python/Include/setobject.h | 1 - third_party/python/Include/sliceobject.h | 1 - third_party/python/Include/structmember.h | 1 - third_party/python/Include/structseq.h | 1 - third_party/python/Include/symtable.h | 1 - third_party/python/Include/sysmodule.h | 1 - third_party/python/Include/token.h | 1 - third_party/python/Include/traceback.h | 1 - third_party/python/Include/tupleobject.h | 1 - third_party/python/Include/typeslots.h | 1 - third_party/python/Include/ucnhash.h | 1 - third_party/python/Include/unicodeobject.h | 1 - third_party/python/Include/weakrefobject.h | 1 - third_party/python/Modules/_asynciomodule.c | 1 - third_party/python/Modules/_bisectmodule.c | 1 - third_party/python/Modules/_bz2module.c | 1 - third_party/python/Modules/_codecsmodule.c | 1 - .../python/Modules/_collectionsmodule.c | 1 - third_party/python/Modules/_cryptmodule.c | 1 - third_party/python/Modules/_csv.c | 1 - third_party/python/Modules/_datetimemodule.c | 1 - third_party/python/Modules/_dbmmodule.c | 1 - .../python/Modules/_decimal/_decimal.c | 1 - .../python/Modules/_decimal/docstrings.h | 1 - .../Modules/_decimal/libmpdec/basearith.c | 1 - .../Modules/_decimal/libmpdec/basearith.h | 1 - .../python/Modules/_decimal/libmpdec/bits.h | 1 - .../Modules/_decimal/libmpdec/constants.c | 1 - .../Modules/_decimal/libmpdec/constants.h | 1 - .../Modules/_decimal/libmpdec/context.c | 1 - .../Modules/_decimal/libmpdec/convolute.c | 1 - .../python/Modules/_decimal/libmpdec/crt.c | 1 - .../python/Modules/_decimal/libmpdec/crt.h | 1 - .../Modules/_decimal/libmpdec/difradix2.c | 1 - .../python/Modules/_decimal/libmpdec/fnt.c | 1 - .../Modules/_decimal/libmpdec/fourstep.c | 1 - .../python/Modules/_decimal/libmpdec/io.c | 1 - .../python/Modules/_decimal/libmpdec/io.h | 1 - .../python/Modules/_decimal/libmpdec/memory.c | 1 - .../Modules/_decimal/libmpdec/mpdecimal.c | 1 - .../Modules/_decimal/libmpdec/mpdecimal.h | 1 - .../Modules/_decimal/libmpdec/numbertheory.c | 1 - .../Modules/_decimal/libmpdec/sixstep.c | 1 - .../Modules/_decimal/libmpdec/sixstep.h | 1 - .../Modules/_decimal/libmpdec/transpose.c | 1 - .../Modules/_decimal/libmpdec/transpose.h | 1 - .../Modules/_decimal/libmpdec/typearith.h | 1 - .../Modules/_decimal/libmpdec/umodarith.h | 1 - third_party/python/Modules/_elementtree.c | 1 - third_party/python/Modules/_functoolsmodule.c | 1 - third_party/python/Modules/_gdbmmodule.c | 1 - third_party/python/Modules/_hashmbedtls.c | 1 - third_party/python/Modules/_heapqmodule.c | 1 - third_party/python/Modules/_io/_iomodule.c | 1 - third_party/python/Modules/_io/_iomodule.h | 3 - third_party/python/Modules/_io/bufferedio.c | 1 - third_party/python/Modules/_io/bytesio.c | 1 - .../python/Modules/_io/clinic/_iomodule.inc | 1 - .../python/Modules/_io/clinic/bufferedio.inc | 1 - .../python/Modules/_io/clinic/bytesio.inc | 1 - .../python/Modules/_io/clinic/fileio.inc | 1 - .../python/Modules/_io/clinic/iobase.inc | 1 - .../python/Modules/_io/clinic/stringio.inc | 1 - .../python/Modules/_io/clinic/textio.inc | 1 - .../Modules/_io/clinic/winconsoleio.inc | 1 - third_party/python/Modules/_io/fileio.c | 1 - third_party/python/Modules/_io/iobase.c | 1 - third_party/python/Modules/_io/stringio.c | 1 - third_party/python/Modules/_io/textio.c | 1 - third_party/python/Modules/_io/winconsoleio.c | 1 - third_party/python/Modules/_json.c | 1 - third_party/python/Modules/_localemodule.c | 1 - third_party/python/Modules/_lsprof.c | 1 - third_party/python/Modules/_lzmamodule.c | 1 - third_party/python/Modules/_math.c | 1 - third_party/python/Modules/_math.h | 2 - .../_multiprocessing/multiprocessing.c | 1 - .../_multiprocessing/multiprocessing.h | 1 - .../Modules/_multiprocessing/semaphore.c | 1 - third_party/python/Modules/_opcode.c | 1 - third_party/python/Modules/_operator.c | 1 - third_party/python/Modules/_pickle.c | 1 - third_party/python/Modules/_posixsubprocess.c | 1 - third_party/python/Modules/_randommodule.c | 2 - third_party/python/Modules/_sqlite/cache.c | 1 - third_party/python/Modules/_sqlite/cache.h | 1 - .../python/Modules/_sqlite/connection.c | 1 - .../python/Modules/_sqlite/connection.h | 1 - third_party/python/Modules/_sqlite/cursor.c | 1 - third_party/python/Modules/_sqlite/cursor.h | 1 - .../python/Modules/_sqlite/microprotocols.c | 1 - .../python/Modules/_sqlite/microprotocols.h | 1 - third_party/python/Modules/_sqlite/module.c | 1 - third_party/python/Modules/_sqlite/module.h | 1 - .../python/Modules/_sqlite/prepare_protocol.c | 1 - .../python/Modules/_sqlite/prepare_protocol.h | 1 - third_party/python/Modules/_sqlite/row.c | 1 - third_party/python/Modules/_sqlite/row.h | 1 - .../python/Modules/_sqlite/statement.c | 1 - .../python/Modules/_sqlite/statement.h | 1 - third_party/python/Modules/_sqlite/util.c | 1 - third_party/python/Modules/_sqlite/util.h | 1 - third_party/python/Modules/_sre.c | 2 - third_party/python/Modules/_stat.c | 1 - third_party/python/Modules/_struct.c | 1 - third_party/python/Modules/_testbuffer.c | 1 - third_party/python/Modules/_testcapimodule.c | 1 - third_party/python/Modules/_testmultiphase.c | 1 - third_party/python/Modules/_threadmodule.c | 1 - third_party/python/Modules/_tracemalloc.c | 1 - third_party/python/Modules/_weakref.c | 1 - third_party/python/Modules/_winapi.c | 1 - third_party/python/Modules/arraymodule.c | 1 - third_party/python/Modules/atexitmodule.c | 1 - third_party/python/Modules/audioop.c | 1 - third_party/python/Modules/bextra.h | 2 - third_party/python/Modules/binascii.c | 1 - .../python/Modules/cjkcodecs/__big5_decmap.c | 1 - .../python/Modules/cjkcodecs/__big5_encmap.c | 1 - .../cjkcodecs/__big5hkscs_bmp_encmap.c | 1 - .../Modules/cjkcodecs/__big5hkscs_decmap.c | 1 - .../cjkcodecs/__big5hkscs_nonbmp_encmap.c | 1 - .../Modules/cjkcodecs/__cp932ext_decmap.c | 1 - .../Modules/cjkcodecs/__cp932ext_encmap.c | 1 - .../python/Modules/cjkcodecs/__cp949_encmap.c | 1 - .../Modules/cjkcodecs/__cp949ext_decmap.c | 1 - .../Modules/cjkcodecs/__cp950ext_decmap.c | 1 - .../Modules/cjkcodecs/__cp950ext_encmap.c | 1 - .../Modules/cjkcodecs/__gb18030ext_decmap.c | 1 - .../Modules/cjkcodecs/__gb18030ext_encmap.c | 1 - .../Modules/cjkcodecs/__gb2312_decmap.c | 1 - .../Modules/cjkcodecs/__gbcommon_encmap.c | 1 - .../Modules/cjkcodecs/__gbkext_decmap.c | 1 - .../Modules/cjkcodecs/__jisx0208_decmap.c | 1 - .../Modules/cjkcodecs/__jisx0212_decmap.c | 1 - .../cjkcodecs/__jisx0213_1_bmp_decmap.c | 1 - .../cjkcodecs/__jisx0213_1_emp_decmap.c | 1 - .../cjkcodecs/__jisx0213_2_bmp_decmap.c | 1 - .../cjkcodecs/__jisx0213_2_emp_decmap.c | 1 - .../Modules/cjkcodecs/__jisx0213_bmp_encmap.c | 1 - .../Modules/cjkcodecs/__jisx0213_emp_encmap.c | 1 - .../cjkcodecs/__jisx0213_pair_decmap.c | 1 - .../Modules/cjkcodecs/__jisxcommon_encmap.c | 1 - .../Modules/cjkcodecs/__ksx1001_decmap.c | 1 - .../python/Modules/cjkcodecs/_codecs_cn.c | 1 - .../python/Modules/cjkcodecs/_codecs_hk.c | 1 - .../Modules/cjkcodecs/_codecs_iso2022.c | 1 - .../python/Modules/cjkcodecs/_codecs_jp.c | 1 - .../python/Modules/cjkcodecs/_codecs_kr.c | 1 - .../python/Modules/cjkcodecs/_codecs_tw.c | 1 - .../python/Modules/cjkcodecs/alg_jisx0201.inc | 1 - .../python/Modules/cjkcodecs/big5_decmap.c | 1 - .../python/Modules/cjkcodecs/big5_encmap.c | 1 - .../Modules/cjkcodecs/big5hkscs_bmp_encmap.c | 1 - .../Modules/cjkcodecs/big5hkscs_decmap.c | 1 - .../cjkcodecs/big5hkscs_nonbmp_encmap.c | 1 - .../python/Modules/cjkcodecs/cjkcodecs.h | 1 - .../cjkcodecs/clinic/multibytecodec.inc | 1 - .../Modules/cjkcodecs/cp932ext_decmap.c | 1 - .../Modules/cjkcodecs/cp932ext_encmap.c | 1 - .../python/Modules/cjkcodecs/cp949_encmap.c | 1 - .../Modules/cjkcodecs/cp949ext_decmap.c | 1 - .../Modules/cjkcodecs/cp950ext_decmap.c | 1 - .../Modules/cjkcodecs/cp950ext_encmap.c | 1 - .../Modules/cjkcodecs/emu_jisx0213_2000.inc | 1 - .../Modules/cjkcodecs/gb18030ext_decmap.c | 1 - .../Modules/cjkcodecs/gb18030ext_encmap.c | 1 - .../python/Modules/cjkcodecs/gb2312_decmap.c | 1 - .../Modules/cjkcodecs/gbcommon_encmap.c | 1 - .../python/Modules/cjkcodecs/gbkext_decmap.c | 1 - .../Modules/cjkcodecs/jisx0208_decmap.c | 1 - .../Modules/cjkcodecs/jisx0212_decmap.c | 1 - .../Modules/cjkcodecs/jisx0213_1_bmp_decmap.c | 1 - .../Modules/cjkcodecs/jisx0213_1_emp_decmap.c | 1 - .../Modules/cjkcodecs/jisx0213_2_bmp_decmap.c | 1 - .../Modules/cjkcodecs/jisx0213_2_emp_decmap.c | 1 - .../Modules/cjkcodecs/jisx0213_bmp_encmap.c | 1 - .../Modules/cjkcodecs/jisx0213_emp_encmap.c | 1 - .../Modules/cjkcodecs/jisx0213_pair_decmap.c | 1 - .../Modules/cjkcodecs/jisx0213_pair_encmap.c | 1 - .../Modules/cjkcodecs/jisxcommon_encmap.c | 1 - .../python/Modules/cjkcodecs/ksx1001_decmap.c | 1 - .../python/Modules/cjkcodecs/multibytecodec.c | 1 - .../python/Modules/cjkcodecs/multibytecodec.h | 1 - .../Modules/cjkcodecs/somanyencodings.h | 2 - .../python/Modules/cjkcodecs/xloadzd.h | 2 - .../python/Modules/clinic/_asynciomodule.inc | 1 - .../python/Modules/clinic/_bz2module.inc | 1 - .../python/Modules/clinic/_codecsmodule.inc | 1 - .../python/Modules/clinic/_cryptmodule.inc | 1 - .../python/Modules/clinic/_cursesmodule.inc | 1 - .../python/Modules/clinic/_datetimemodule.inc | 1 - .../python/Modules/clinic/_dbmmodule.inc | 1 - .../python/Modules/clinic/_elementtree.inc | 1 - .../python/Modules/clinic/_gdbmmodule.inc | 1 - .../python/Modules/clinic/_lzmamodule.inc | 1 - third_party/python/Modules/clinic/_opcode.inc | 1 - third_party/python/Modules/clinic/_pickle.inc | 1 - third_party/python/Modules/clinic/_sre.inc | 1 - third_party/python/Modules/clinic/_ssl.inc | 1 - third_party/python/Modules/clinic/_struct.inc | 1 - .../python/Modules/clinic/_tkinter.inc | 1 - .../python/Modules/clinic/_weakref.inc | 1 - third_party/python/Modules/clinic/_winapi.inc | 1 - .../python/Modules/clinic/arraymodule.inc | 1 - third_party/python/Modules/clinic/audioop.inc | 1 - .../python/Modules/clinic/binascii.inc | 1 - .../python/Modules/clinic/cmathmodule.inc | 1 - .../python/Modules/clinic/fcntlmodule.inc | 1 - .../python/Modules/clinic/grpmodule.inc | 1 - .../python/Modules/clinic/posixmodule.inc | 1 - .../python/Modules/clinic/pwdmodule.inc | 1 - third_party/python/Modules/clinic/pyexpat.inc | 1 - .../python/Modules/clinic/signalmodule.inc | 1 - .../python/Modules/clinic/spwdmodule.inc | 1 - .../python/Modules/clinic/unicodedata.inc | 1 - .../python/Modules/clinic/zlibmodule.inc | 1 - third_party/python/Modules/cmathmodule.c | 1 - third_party/python/Modules/config.c | 1 - third_party/python/Modules/errnomodule.c | 1 - third_party/python/Modules/expat/ascii.inc | 1 - third_party/python/Modules/expat/asciitab.inc | 1 - .../python/Modules/expat/expat_external.h | 1 - .../python/Modules/expat/iasciitab.inc | 1 - third_party/python/Modules/expat/internal.inc | 1 - .../python/Modules/expat/latin1tab.inc | 1 - third_party/python/Modules/expat/nametab.inc | 1 - third_party/python/Modules/expat/pyexpatns.h | 1 - third_party/python/Modules/expat/siphash.inc | 2 - third_party/python/Modules/expat/utf8tab.inc | 1 - third_party/python/Modules/expat/xmlparse.c | 1 - third_party/python/Modules/expat/xmlrole.c | 1 - third_party/python/Modules/expat/xmlrole.h | 1 - third_party/python/Modules/expat/xmltok.c | 1 - third_party/python/Modules/expat/xmltok.h | 1 - .../python/Modules/expat/xmltok_impl.h.inc | 1 - .../python/Modules/expat/xmltok_impl.inc | 1 - .../python/Modules/expat/xmltok_ns.inc | 1 - third_party/python/Modules/faulthandler.c | 1 - third_party/python/Modules/fcntlmodule.c | 1 - third_party/python/Modules/fpectlmodule.c | 1 - third_party/python/Modules/fpetestmodule.c | 1 - third_party/python/Modules/fspath.c | 1 - third_party/python/Modules/gcmodule.c | 1 - third_party/python/Modules/getbuildinfo.c | 1 - third_party/python/Modules/getpath.c | 1 - third_party/python/Modules/grpmodule.c | 1 - third_party/python/Modules/hashlib.h | 1 - third_party/python/Modules/hashtable.c | 1 - third_party/python/Modules/hashtable.h | 1 - third_party/python/Modules/itertoolsmodule.c | 1 - third_party/python/Modules/main.c | 1 - third_party/python/Modules/mathmodule.c | 1 - third_party/python/Modules/mmapmodule.c | 1 - third_party/python/Modules/ossaudiodev.c | 1 - third_party/python/Modules/overlapped.c | 1 - third_party/python/Modules/parsermodule.c | 1 - third_party/python/Modules/posixmodule.c | 1 - third_party/python/Modules/pwdmodule.c | 1 - third_party/python/Modules/pyexpat.c | 1 - third_party/python/Modules/resource.c | 1 - third_party/python/Modules/rotatingtree.c | 1 - third_party/python/Modules/rotatingtree.h | 3 - third_party/python/Modules/selectmodule.c | 1 - third_party/python/Modules/signalmodule.c | 1 - third_party/python/Modules/socketmodule.c | 1 - third_party/python/Modules/socketmodule.h | 1 - third_party/python/Modules/spwdmodule.c | 1 - third_party/python/Modules/sre_constants.h | 3 - third_party/python/Modules/sre_lib.inc | 1 - third_party/python/Modules/symtablemodule.c | 1 - third_party/python/Modules/syslogmodule.c | 1 - third_party/python/Modules/termios.c | 1 - third_party/python/Modules/testcapi_long.inc | 1 - third_party/python/Modules/timemodule.c | 1 - third_party/python/Modules/tkinter.h | 1 - third_party/python/Modules/tlsmodule.c | 1 - third_party/python/Modules/tokenbucket.c | 3 +- third_party/python/Modules/unicodedata.c | 1 - third_party/python/Modules/unicodedata.h | 3 - .../python/Modules/unicodedata_3.2.0.c | 1 - .../python/Modules/unicodedata_aliases.c | 1 - .../Modules/unicodedata_bidirectionalnames.c | 1 - .../Modules/unicodedata_categorynames.c | 1 - .../python/Modules/unicodedata_codehash.c | 1 - third_party/python/Modules/unicodedata_comp.c | 1 - .../python/Modules/unicodedata_decomp.c | 1 - .../python/Modules/unicodedata_decompprefix.c | 1 - .../Modules/unicodedata_eastasianwidthnames.c | 1 - .../python/Modules/unicodedata_extendedcase.c | 1 - .../python/Modules/unicodedata_findnfcindex.c | 1 - .../python/Modules/unicodedata_getcode.c | 1 - .../Modules/unicodedata_getdecomprecord.c | 2 - .../python/Modules/unicodedata_getrecord.c | 1 - .../python/Modules/unicodedata_islinebreak.c | 1 - .../python/Modules/unicodedata_isnormalized.c | 1 - .../Modules/unicodedata_isunifiedideograph.c | 1 - .../python/Modules/unicodedata_iswhitespace.c | 1 - .../python/Modules/unicodedata_lexicon.c | 1 - .../Modules/unicodedata_namedsequences.c | 1 - .../python/Modules/unicodedata_nfcfirst.c | 1 - .../python/Modules/unicodedata_nfclast.c | 1 - .../python/Modules/unicodedata_nfcnfkc.c | 1 - .../python/Modules/unicodedata_nfdnfkd.c | 1 - .../python/Modules/unicodedata_phrasebook.c | 1 - .../python/Modules/unicodedata_records.c | 1 - .../python/Modules/unicodedata_tonumeric.c | 1 - .../python/Modules/unicodedata_typerecords.c | 1 - third_party/python/Modules/unicodedata_ucd.c | 1 - third_party/python/Modules/winreparse.h | 2 - third_party/python/Modules/xxlimited.c | 1 - third_party/python/Modules/xxmodule.c | 1 - third_party/python/Modules/xxsubtype.c | 1 - third_party/python/Modules/zipimport.c | 3 +- third_party/python/Modules/zlibmodule.c | 1 - third_party/python/Objects/abstract.c | 1 - third_party/python/Objects/accu.c | 1 - third_party/python/Objects/boolobject.c | 1 - third_party/python/Objects/bytearrayobject.c | 1 - third_party/python/Objects/bytes_methods.c | 1 - third_party/python/Objects/bytesobject.c | 1 - third_party/python/Objects/call.c | 1 - third_party/python/Objects/capsule.c | 1 - third_party/python/Objects/cellobject.c | 1 - third_party/python/Objects/classobject.c | 1 - .../python/Objects/clinic/bytearrayobject.inc | 1 - .../python/Objects/clinic/bytesobject.inc | 1 - .../python/Objects/clinic/dictobject.inc | 1 - .../python/Objects/clinic/unicodeobject.inc | 1 - third_party/python/Objects/codeobject.c | 1 - third_party/python/Objects/complexobject.c | 1 - third_party/python/Objects/descrobject.c | 1 - third_party/python/Objects/dict-common.h | 1 - third_party/python/Objects/dictobject.c | 1 - third_party/python/Objects/enumobject.c | 1 - third_party/python/Objects/exceptions.c | 1 - third_party/python/Objects/fileobject.c | 1 - third_party/python/Objects/floatobject.c | 1 - third_party/python/Objects/frameobject.c | 1 - third_party/python/Objects/fromfd.c | 1 - third_party/python/Objects/funcobject.c | 1 - third_party/python/Objects/genobject.c | 1 - third_party/python/Objects/iterobject.c | 1 - third_party/python/Objects/listobject.c | 1 - third_party/python/Objects/longobject.c | 1 - third_party/python/Objects/memoryobject.c | 1 - third_party/python/Objects/methodobject.c | 1 - third_party/python/Objects/moduleobject.c | 1 - third_party/python/Objects/namespaceobject.c | 1 - third_party/python/Objects/object.c | 1 - third_party/python/Objects/obmalloc.c | 3 +- third_party/python/Objects/odictobject.c | 1 - third_party/python/Objects/rangeobject.c | 1 - third_party/python/Objects/setobject.c | 1 - third_party/python/Objects/sliceobject.c | 1 - .../python/Objects/stringlib/asciilib.inc | 1 - .../python/Objects/stringlib/codecs.inc | 1 - .../python/Objects/stringlib/count.inc | 1 - .../python/Objects/stringlib/ctype.inc | 1 - third_party/python/Objects/stringlib/eq.inc | 1 - .../python/Objects/stringlib/fastsearch.inc | 1 - third_party/python/Objects/stringlib/find.inc | 1 - .../Objects/stringlib/find_max_char.inc | 1 - third_party/python/Objects/stringlib/join.inc | 1 - .../python/Objects/stringlib/localeutil.inc | 1 - .../python/Objects/stringlib/partition.inc | 1 - .../python/Objects/stringlib/replace.inc | 1 - .../python/Objects/stringlib/split.inc | 1 - .../python/Objects/stringlib/stringdefs.inc | 1 - .../python/Objects/stringlib/transmogrify.inc | 1 - .../python/Objects/stringlib/ucs1lib.inc | 1 - .../python/Objects/stringlib/ucs2lib.inc | 1 - .../python/Objects/stringlib/ucs4lib.inc | 1 - .../Objects/stringlib/unicode_format.inc | 1 - third_party/python/Objects/structseq.c | 1 - third_party/python/Objects/tupleobject.c | 1 - third_party/python/Objects/typeobject.c | 1 - third_party/python/Objects/typeslots.inc | 1 - third_party/python/Objects/unicodectype.c | 1 - .../python/Objects/unicodeobject-deadcode.c | 1 - third_party/python/Objects/unicodeobject.c | 1 - third_party/python/Objects/weakrefobject.c | 1 - third_party/python/PC/clinic/winreg.inc | 1 - third_party/python/PC/clinic/winsound.inc | 1 - third_party/python/PC/dl_nt.c | 1 - third_party/python/PC/getpathp.c | 1 - third_party/python/PC/launcher.c | 1 - third_party/python/PC/winreg.c | 1 - third_party/python/PC/winsound.c | 1 - third_party/python/Parser/acceler.c | 1 - third_party/python/Parser/asdl_c.py | 2 - third_party/python/Parser/bitset.c | 1 - third_party/python/Parser/firstsets.c | 1 - third_party/python/Parser/grammar.c | 1 - third_party/python/Parser/grammar1.c | 1 - third_party/python/Parser/listnode.c | 1 - third_party/python/Parser/metagrammar.c | 1 - third_party/python/Parser/myreadline.c | 1 - third_party/python/Parser/node.c | 1 - third_party/python/Parser/parser.c | 1 - third_party/python/Parser/parser.h | 1 - third_party/python/Parser/parsetok.c | 1 - third_party/python/Parser/pgen.c | 1 - third_party/python/Parser/pgenmain.c | 1 - third_party/python/Parser/printgrammar.c | 1 - third_party/python/Parser/tokenizer.c | 1 - third_party/python/Parser/tokenizer.h | 1 - third_party/python/Python/Python-ast.c | 1 - third_party/python/Python/_warnings.c | 1 - third_party/python/Python/asdl.c | 1 - third_party/python/Python/ast.c | 1 - third_party/python/Python/atexit.c | 1 - third_party/python/Python/bltinmodule.c | 1 - third_party/python/Python/ceval.c | 1 - third_party/python/Python/ceval_gil.inc | 1 - .../python/Python/clinic/bltinmodule.inc | 1 - third_party/python/Python/clinic/import.inc | 1 - third_party/python/Python/codecs.c | 1 - third_party/python/Python/compile.c | 1 - third_party/python/Python/condvar.h | 1 - third_party/python/Python/cosmomodule.c | 1 - third_party/python/Python/dtoa.c | 1 - .../python/Python/dynamic_annotations.c | 1 - third_party/python/Python/dynload_dl.c | 1 - third_party/python/Python/dynload_shlib.c | 1 - third_party/python/Python/dynload_stub.c | 1 - third_party/python/Python/dynload_win.c | 1 - third_party/python/Python/errors.c | 1 - third_party/python/Python/fatality.c | 1 - third_party/python/Python/fdisinteractive.c | 1 - third_party/python/Python/fileutils.c | 1 - third_party/python/Python/finalize.c | 1 - third_party/python/Python/flags.c | 1 - third_party/python/Python/flushstdfiles.c | 1 - third_party/python/Python/formatter_unicode.c | 1 - third_party/python/Python/frozen.c | 1 - third_party/python/Python/frozenmain.c | 1 - third_party/python/Python/future.c | 1 - third_party/python/Python/getargs.c | 1 - third_party/python/Python/getcompiler.c | 1 - third_party/python/Python/getcopyright.c | 1 - third_party/python/Python/getopt.c | 2 - third_party/python/Python/getplatform.c | 1 - third_party/python/Python/getsig.c | 1 - third_party/python/Python/getversion.c | 1 - third_party/python/Python/graminit.c | 1 - third_party/python/Python/import.c | 3 +- third_party/python/Python/importdl.c | 1 - third_party/python/Python/initfsencoding.c | 1 - third_party/python/Python/initimport.c | 1 - third_party/python/Python/initmain.c | 1 - third_party/python/Python/initsigs.c | 1 - third_party/python/Python/initsite.c | 1 - third_party/python/Python/initstdio.c | 1 - third_party/python/Python/marshal.c | 1 - third_party/python/Python/modsupport.c | 1 - third_party/python/Python/mysnprintf.c | 1 - third_party/python/Python/mystrtoul.c | 1 - third_party/python/Python/opcode_targets.inc | 1 - third_party/python/Python/peephole.c | 1 - third_party/python/Python/progname.c | 1 - third_party/python/Python/pyarena.c | 1 - third_party/python/Python/pyfpe.c | 1 - third_party/python/Python/pyhash.c | 1 - third_party/python/Python/pylifecycle.c | 1 - third_party/python/Python/pymath.c | 1 - third_party/python/Python/pystate.c | 1 - third_party/python/Python/pystrcmp.c | 1 - third_party/python/Python/pystrhex.c | 1 - third_party/python/Python/pystrtod.c | 1 - third_party/python/Python/pythonhome.c | 1 - third_party/python/Python/pythonrun.c | 1 - third_party/python/Python/pytime.c | 1 - third_party/python/Python/random.c | 1 - third_party/python/Python/recursive.c | 1 - third_party/python/Python/restoresigs.c | 1 - third_party/python/Python/sigcheck.c | 1 - third_party/python/Python/structmember.c | 1 - third_party/python/Python/symtable.c | 1 - third_party/python/Python/sysmodule.c | 1 - third_party/python/Python/thread.c | 1 - third_party/python/Python/thread_pthread.inc | 1 - third_party/python/Python/traceback.c | 1 - .../python/Python/wordcode_helpers.inc | 1 - third_party/python/Python/xedmodule.c | 1 - third_party/python/Python/xtermmodule.c | 1 - .../python/Tools/unicode/makecjkcodecs.c | 2 - .../python/Tools/unicode/makeunicodedata.py | 1 - third_party/python/freeze.c | 2 - third_party/python/launch.c | 1 - third_party/python/pycomp.c | 3 +- third_party/python/pyobj.c | 3 +- third_party/python/python.c | 1 - third_party/python/pythontester.c | 1 - third_party/python/repl.c | 1 - third_party/python/runpythonmodule.c | 2 - third_party/python/runpythonmodule.h | 2 - third_party/quickjs/array.c | 1 - third_party/quickjs/atof.c | 1 - third_party/quickjs/atom.c | 1 - third_party/quickjs/atomics.c | 1 - third_party/quickjs/bigdecimal.c | 1 - third_party/quickjs/bigint.c | 1 - third_party/quickjs/byte.c | 1 - third_party/quickjs/call.c | 1 - third_party/quickjs/cutils.c | 1 - third_party/quickjs/cutils.h | 3 - third_party/quickjs/date.c | 1 - third_party/quickjs/dbuf.c | 1 - third_party/quickjs/diglet.h | 2 - third_party/quickjs/eq.c | 1 - third_party/quickjs/err.c | 1 - third_party/quickjs/float.c | 1 - third_party/quickjs/gc.c | 1 - third_party/quickjs/gen.c | 1 - third_party/quickjs/internal.h | 3 - third_party/quickjs/iter.c | 1 - third_party/quickjs/json.c | 1 - third_party/quickjs/leb128.c | 1 - third_party/quickjs/leb128.h | 2 - third_party/quickjs/libbf.c | 1 - third_party/quickjs/libbf.h | 3 - third_party/quickjs/libregexp-opcode.inc | 1 - third_party/quickjs/libregexp.c | 1 - third_party/quickjs/libregexp.h | 3 - third_party/quickjs/libunicode-table.inc | 1 - third_party/quickjs/libunicode.c | 1 - third_party/quickjs/libunicode.h | 3 - third_party/quickjs/list.h | 3 - third_party/quickjs/map.c | 1 - third_party/quickjs/math.c | 1 - third_party/quickjs/mem.c | 1 - third_party/quickjs/object.c | 1 - third_party/quickjs/parse.c | 1 - third_party/quickjs/prim.c | 1 - third_party/quickjs/promise.c | 1 - third_party/quickjs/proxy.c | 1 - third_party/quickjs/qjs.c | 1 - third_party/quickjs/qjsc.c | 1 - third_party/quickjs/quickjs-libc.c | 1 - third_party/quickjs/quickjs-libc.h | 3 - third_party/quickjs/quickjs-opcode.inc | 1 - third_party/quickjs/quickjs.c | 1 - third_party/quickjs/quickjs.h | 3 - third_party/quickjs/reflect.c | 1 - third_party/quickjs/regexp.c | 1 - third_party/quickjs/run-test262.c | 1 - third_party/quickjs/shape.c | 1 - third_party/quickjs/str.c | 1 - third_party/quickjs/strbuf.c | 1 - third_party/quickjs/tok.c | 1 - third_party/quickjs/typedarray.c | 1 - third_party/quickjs/unicode_gen.c | 1 - third_party/quickjs/uri.c | 1 - third_party/quickjs/usage.c | 1 - third_party/radpajama/common-gptneox.cc | 1 - third_party/radpajama/common-gptneox.h | 3 - third_party/radpajama/copy-gptneox.cc | 1 - third_party/radpajama/gptneox-util.h | 1 - third_party/radpajama/gptneox.cc | 3 +- third_party/radpajama/gptneox.h | 1 - third_party/radpajama/main-redpajama-chat.cc | 1 - third_party/radpajama/main-redpajama.cc | 1 - third_party/radpajama/quantize-gptneox.cc | 1 - .../scripts/convert_gptneox_to_ggml.py | 1 - .../install-RedPajama-INCITE-Base-3B-v1.sh | 1 - .../install-RedPajama-INCITE-Chat-3B-v1.sh | 1 - ...install-RedPajama-INCITE-Instruct-3B-v1.sh | 1 - .../radpajama/scripts/quantize-gptneox.py | 1 - third_party/regex/regex.h | 2 - third_party/sed/cmd.h | 2 - third_party/sed/compile.c | 1 - third_party/sed/defs.h | 3 - third_party/sed/extern.h | 3 - third_party/sed/main.c | 1 - third_party/sed/misc.c | 1 - third_party/sed/process.c | 1 - third_party/smallz4/smallz4.hh | 2 +- third_party/sqlite3/appendvfs.c | 1 - third_party/sqlite3/btree.c | 1 - third_party/sqlite3/build.c | 1 - third_party/sqlite3/completion.c | 1 - third_party/sqlite3/ctime.c | 1 - third_party/sqlite3/dbdata.c | 1 - third_party/sqlite3/decimal.c | 1 - third_party/sqlite3/extensions.h | 2 - third_party/sqlite3/fileio.c | 1 - third_party/sqlite3/fts5.c | 1 - third_party/sqlite3/func.c | 1 - third_party/sqlite3/geopoly.inc | 1 - third_party/sqlite3/ieee754.c | 1 - third_party/sqlite3/json.c | 1 - third_party/sqlite3/main.c | 1 - third_party/sqlite3/memtrace.c | 1 - third_party/sqlite3/mutex.internal.h | 2 - third_party/sqlite3/os_unix.c | 1 - third_party/sqlite3/pcache1.c | 1 - third_party/sqlite3/rtree.c | 1 - third_party/sqlite3/series.c | 1 - third_party/sqlite3/shathree.c | 1 - third_party/sqlite3/shell.c | 1 - third_party/sqlite3/sqlar.c | 1 - third_party/sqlite3/sqlite3expert.c | 1 - third_party/sqlite3/sqlite3expert.h | 2 - third_party/sqlite3/sqlite3rbu.c | 1 - third_party/sqlite3/sqlite3session.c | 1 - third_party/sqlite3/sqliteInt.h | 1 - third_party/sqlite3/uint.c | 1 - third_party/sqlite3/zipfile.c | 1 - third_party/stb/stb_image.c | 17 +- third_party/stb/stb_image.h | 2 - third_party/stb/stb_image_resize.h | 2 - third_party/stb/stb_image_write.h | 2 - third_party/stb/stb_rect_pack.c | 1 - third_party/stb/stb_rect_pack.h | 2 - third_party/stb/stb_truetype.c | 3 +- third_party/stb/stb_truetype.h | 2 - third_party/stb/stb_vorbis.c | 36 ++-- third_party/stb/stb_vorbis.h | 2 - third_party/tidy/README.cosmo | 1 - third_party/tidy/access.c | 1 - third_party/tidy/access.h | 1 - third_party/tidy/alloc.c | 2 - third_party/tidy/attrdict.c | 1 - third_party/tidy/attrdict.h | 1 - third_party/tidy/attrs.c | 1 - third_party/tidy/attrs.h | 1 - third_party/tidy/buffio.c | 1 - third_party/tidy/charsets.c | 1 - third_party/tidy/charsets.h | 1 - third_party/tidy/clean.c | 1 - third_party/tidy/clean.h | 1 - third_party/tidy/config.c | 1 - third_party/tidy/config.h | 1 - third_party/tidy/entities.c | 1 - third_party/tidy/entities.h | 1 - third_party/tidy/fileio.c | 1 - third_party/tidy/fileio.h | 1 - third_party/tidy/forward.h | 1 - third_party/tidy/gdoc.c | 1 - third_party/tidy/gdoc.h | 1 - third_party/tidy/istack.c | 1 - third_party/tidy/language.c | 1 - third_party/tidy/language.h | 1 - third_party/tidy/language_en.inc | 1 - third_party/tidy/lexer.c | 1 - third_party/tidy/lexer.h | 1 - third_party/tidy/mappedio.c | 1 - third_party/tidy/mappedio.h | 1 - third_party/tidy/message.c | 1 - third_party/tidy/message.h | 1 - third_party/tidy/messageobj.c | 1 - third_party/tidy/messageobj.h | 1 - third_party/tidy/parser.c | 1 - third_party/tidy/parser.h | 1 - third_party/tidy/pprint.c | 1 - third_party/tidy/pprint.h | 1 - third_party/tidy/sprtf.c | 1 - third_party/tidy/sprtf.h | 1 - third_party/tidy/streamio.c | 1 - third_party/tidy/streamio.h | 1 - third_party/tidy/tagask.c | 1 - third_party/tidy/tags.c | 1 - third_party/tidy/tags.h | 1 - third_party/tidy/tidy-int.h | 1 - third_party/tidy/tidy.c | 1 - third_party/tidy/tidy.h | 1 - third_party/tidy/tidybuffio.h | 1 - third_party/tidy/tidyenum.h | 1 - third_party/tidy/tidylib.c | 1 - third_party/tidy/tmbstr.c | 1 - third_party/tidy/tmbstr.h | 1 - third_party/tidy/utf8.c | 1 - third_party/tidy/utf8.h | 1 - third_party/tidy/version.inc | 1 - third_party/tr/cmd.h | 2 - third_party/tr/extern.h | 2 - third_party/tr/next.c | 1 - third_party/tr/tr.c | 1 - third_party/tree/color.c | 1 - third_party/tree/file.c | 1 - third_party/tree/filter.c | 1 - third_party/tree/hash.c | 1 - third_party/tree/html.c | 1 - third_party/tree/info.c | 1 - third_party/tree/json.c | 1 - third_party/tree/list.c | 1 - third_party/tree/tree.c | 1 - third_party/tree/tree.h | 1 - third_party/tree/unix.c | 1 - third_party/tree/xml.c | 1 - third_party/unzip/README.cosmo | 1 - third_party/unzip/api.c | 1 - third_party/unzip/apihelp.c | 1 - third_party/unzip/consts.h | 1 - third_party/unzip/crc32.c | 1 - third_party/unzip/crc32.h | 1 - third_party/unzip/crypt.c | 1 - third_party/unzip/crypt.h | 1 - third_party/unzip/ebcdic.h | 1 - third_party/unzip/envargs.c | 1 - third_party/unzip/explode.c | 1 - third_party/unzip/extract.c | 1 - third_party/unzip/fileio.c | 1 - third_party/unzip/globals.c | 1 - third_party/unzip/globals.h | 1 - third_party/unzip/inflate.c | 1 - third_party/unzip/inflate.h | 1 - third_party/unzip/list.c | 1 - third_party/unzip/match.c | 1 - third_party/unzip/process.c | 1 - third_party/unzip/timezone.c | 1 - third_party/unzip/timezone.h | 1 - third_party/unzip/ttyio.c | 1 - third_party/unzip/ttyio.h | 1 - third_party/unzip/ubz2err.c | 1 - third_party/unzip/unix.c | 1 - third_party/unzip/unreduce.c | 1 - third_party/unzip/unshrink.c | 1 - third_party/unzip/unxcfg.h | 1 - third_party/unzip/unzip.c | 1 - third_party/unzip/unzip.h | 1 - third_party/unzip/unzpriv.h | 1 - third_party/unzip/unzvers.h | 1 - third_party/unzip/zip.h | 1 - third_party/unzip/zipinfo.c | 1 - third_party/vqsort/vqsort.h | 2 - third_party/xed/avx512.h | 2 - third_party/xed/private.h | 2 - third_party/xed/x86.h | 2 - third_party/xed/x86features.c | 4 +- third_party/xed/x86ild.greg.c | 2 +- third_party/xed/x86isa.h | 2 - third_party/xxhash/LICENSE | 1 - third_party/xxhash/cli/COPYING | 1 - third_party/xxhash/cli/README.md | 1 - third_party/xxhash/cli/xsum_arch.h | 1 - third_party/xxhash/cli/xsum_bench.c | 1 - third_party/xxhash/cli/xsum_bench.h | 1 - third_party/xxhash/cli/xsum_config.h | 1 - third_party/xxhash/cli/xsum_os_specific.c | 1 - third_party/xxhash/cli/xsum_os_specific.h | 1 - third_party/xxhash/cli/xsum_output.c | 1 - third_party/xxhash/cli/xsum_output.h | 1 - third_party/xxhash/cli/xsum_sanity_check.c | 1 - third_party/xxhash/cli/xsum_sanity_check.h | 1 - third_party/xxhash/cli/xxhsum.1 | 1 - third_party/xxhash/cli/xxhsum.1.md | 1 - third_party/xxhash/cli/xxhsum.c | 1 - third_party/xxhash/tests/Makefile | 1 - .../xxhash/tests/bench/.clang_complete | 1 - third_party/xxhash/tests/bench/.gitignore | 1 - third_party/xxhash/tests/bench/LICENSE | 1 - third_party/xxhash/tests/bench/Makefile | 1 - third_party/xxhash/tests/bench/benchHash.c | 1 - third_party/xxhash/tests/bench/benchHash.h | 1 - third_party/xxhash/tests/bench/benchfn.c | 1 - third_party/xxhash/tests/bench/benchfn.h | 1 - third_party/xxhash/tests/bench/bhDisplay.c | 1 - third_party/xxhash/tests/bench/bhDisplay.h | 1 - third_party/xxhash/tests/bench/hashes.h | 1 - third_party/xxhash/tests/bench/main.c | 1 - third_party/xxhash/tests/bench/timefn.c | 1 - third_party/xxhash/tests/bench/timefn.h | 1 - third_party/xxhash/tests/cli-comment-line.sh | 1 - .../xxhash/tests/collisions/.gitignore | 1 - third_party/xxhash/tests/collisions/LICENSE | 1 - third_party/xxhash/tests/collisions/Makefile | 1 - third_party/xxhash/tests/collisions/README.md | 1 - .../tests/collisions/allcodecs/README.md | 1 - .../xxhash/tests/collisions/allcodecs/dummy.c | 1 - .../xxhash/tests/collisions/allcodecs/dummy.h | 1 - third_party/xxhash/tests/collisions/hashes.h | 1 - third_party/xxhash/tests/collisions/main.c | 1 - third_party/xxhash/tests/collisions/pool.c | 1 - third_party/xxhash/tests/collisions/pool.h | 1 - third_party/xxhash/tests/collisions/sort.cc | 1 - third_party/xxhash/tests/collisions/sort.hh | 1 - .../xxhash/tests/collisions/threading.c | 1 - .../xxhash/tests/collisions/threading.h | 1 - third_party/xxhash/tests/filename-escape.sh | 1 - .../xxhash/tests/generate_unicode_test.c | 1 - third_party/xxhash/tests/multiInclude.c | 1 - third_party/xxhash/tests/ppc_define.c | 1 - third_party/xxhash/tests/sanity_test.c | 1 - .../xxhash/tests/sanity_test_vectors.h | 1 - .../tests/sanity_test_vectors_generator.c | 1 - third_party/xxhash/tests/unicode_lint.sh | 1 - third_party/xxhash/xxh3.h | 1 - third_party/xxhash/xxh_x86dispatch.c | 1 - third_party/xxhash/xxh_x86dispatch.h | 1 - third_party/xxhash/xxhash.c | 1 - third_party/xxhash/xxhash.h | 1 - third_party/zip/api.h | 1 - third_party/zip/crc32.c | 1 - third_party/zip/crc32.h | 1 - third_party/zip/crypt.c | 1 - third_party/zip/crypt.h | 1 - third_party/zip/deflate.c | 1 - third_party/zip/fileio.c | 1 - third_party/zip/globals.c | 1 - third_party/zip/osdep.h | 1 - third_party/zip/revision.h | 1 - third_party/zip/tailor.h | 1 - third_party/zip/timezone.c | 1 - third_party/zip/timezone.h | 1 - third_party/zip/trees.c | 1 - third_party/zip/ttyio.c | 1 - third_party/zip/ttyio.h | 1 - third_party/zip/unix.c | 1 - third_party/zip/util.c | 1 - third_party/zip/zbz2err.c | 1 - third_party/zip/zip.c | 1 - third_party/zip/zip.h | 1 - third_party/zip/zipcloak.c | 1 - third_party/zip/ziperr.h | 1 - third_party/zip/zipfile.c | 1 - third_party/zip/zipnote.c | 1 - third_party/zip/zipsplit.c | 1 - third_party/zip/zipup.c | 1 - third_party/zip/zipup.h | 1 - third_party/zlib/adler32.c | 2 - third_party/zlib/adler32_simd.c | 1 - third_party/zlib/chunkcopy.inc | 1 - third_party/zlib/compress.c | 1 - third_party/zlib/cpu_features.internal.h | 2 - third_party/zlib/crc32.c | 1 - third_party/zlib/crc32.inc | 1 - third_party/zlib/crc32_simd.c | 1 - third_party/zlib/crc32_simd.internal.h | 3 - third_party/zlib/crc_folding.c | 1 - third_party/zlib/deflate.c | 1 - third_party/zlib/deflate.internal.h | 3 - third_party/zlib/gz/gzclose.c | 1 - third_party/zlib/gz/gzguts.inc | 1 - third_party/zlib/gz/gzlib.c | 1 - third_party/zlib/gz/gzread.c | 1 - third_party/zlib/gz/gzwrite.c | 1 - third_party/zlib/infback.c | 1 - third_party/zlib/inffast.c | 1 - third_party/zlib/inffast.internal.h | 3 - third_party/zlib/inffast_chunk.c | 1 - third_party/zlib/inffixed.inc | 1 - third_party/zlib/inflate.c | 1 - third_party/zlib/inflate.internal.h | 3 - third_party/zlib/inftrees.c | 2 - third_party/zlib/inftrees.internal.h | 3 - third_party/zlib/insert_string.inc | 2 - third_party/zlib/internal.h | 2 - third_party/zlib/macros.internal.h | 3 - third_party/zlib/slide_hash_simd.inc | 1 - third_party/zlib/trees.c | 1 - third_party/zlib/trees.inc | 1 - third_party/zlib/uncompr.c | 1 - third_party/zlib/zconf.h | 2 - third_party/zlib/zlib.h | 2 - third_party/zlib/zutil.c | 1 - third_party/zlib/zutil.internal.h | 2 - third_party/zstd/lib/common/allocations.h | 1 - third_party/zstd/lib/common/bits.h | 1 - third_party/zstd/lib/common/bitstream.h | 1 - third_party/zstd/lib/common/compiler.h | 1 - third_party/zstd/lib/common/cpu.h | 1 - third_party/zstd/lib/common/debug.c | 1 - third_party/zstd/lib/common/debug.h | 1 - third_party/zstd/lib/common/entropy_common.c | 1 - third_party/zstd/lib/common/error_private.c | 1 - third_party/zstd/lib/common/error_private.h | 1 - third_party/zstd/lib/common/fse.h | 1 - third_party/zstd/lib/common/fse_decompress.c | 1 - third_party/zstd/lib/common/huf.h | 1 - third_party/zstd/lib/common/mem.h | 1 - third_party/zstd/lib/common/pool.c | 1 - third_party/zstd/lib/common/pool.h | 1 - .../zstd/lib/common/portability_macros.h | 1 - third_party/zstd/lib/common/threading.c | 1 - third_party/zstd/lib/common/threading.h | 1 - third_party/zstd/lib/common/xxhash.c | 1 - third_party/zstd/lib/common/xxhash.h | 1 - third_party/zstd/lib/common/zstd_common.c | 1 - third_party/zstd/lib/common/zstd_deps.h | 1 - third_party/zstd/lib/common/zstd_internal.h | 1 - third_party/zstd/lib/common/zstd_trace.h | 1 - third_party/zstd/lib/compress/clevels.h | 1 - third_party/zstd/lib/compress/fse_compress.c | 1 - third_party/zstd/lib/compress/hist.c | 1 - third_party/zstd/lib/compress/hist.h | 1 - third_party/zstd/lib/compress/huf_compress.c | 1 - third_party/zstd/lib/compress/zstd_compress.c | 1 - .../lib/compress/zstd_compress_internal.h | 1 - .../lib/compress/zstd_compress_literals.c | 1 - .../lib/compress/zstd_compress_literals.h | 1 - .../lib/compress/zstd_compress_sequences.c | 1 - .../lib/compress/zstd_compress_sequences.h | 1 - .../lib/compress/zstd_compress_superblock.c | 1 - .../lib/compress/zstd_compress_superblock.h | 1 - third_party/zstd/lib/compress/zstd_cwksp.h | 1 - .../zstd/lib/compress/zstd_double_fast.c | 1 - .../zstd/lib/compress/zstd_double_fast.h | 1 - third_party/zstd/lib/compress/zstd_fast.c | 1 - third_party/zstd/lib/compress/zstd_fast.h | 1 - third_party/zstd/lib/compress/zstd_lazy.c | 1 - third_party/zstd/lib/compress/zstd_lazy.h | 1 - third_party/zstd/lib/compress/zstd_ldm.c | 1 - third_party/zstd/lib/compress/zstd_ldm.h | 1 - .../zstd/lib/compress/zstd_ldm_geartab.h | 1 - third_party/zstd/lib/compress/zstd_opt.c | 1 - third_party/zstd/lib/compress/zstd_opt.h | 1 - .../zstd/lib/compress/zstdmt_compress.c | 1 - .../zstd/lib/compress/zstdmt_compress.h | 1 - .../zstd/lib/decompress/huf_decompress.c | 1 - .../lib/decompress/huf_decompress_amd64.S | 1 - third_party/zstd/lib/decompress/zstd_ddict.c | 1 - third_party/zstd/lib/decompress/zstd_ddict.h | 1 - .../zstd/lib/decompress/zstd_decompress.c | 1 - .../lib/decompress/zstd_decompress_block.c | 1 - .../lib/decompress/zstd_decompress_block.h | 1 - .../lib/decompress/zstd_decompress_internal.h | 1 - third_party/zstd/lib/deprecated/zbuff.h | 1 - .../zstd/lib/deprecated/zbuff_common.c | 1 - .../zstd/lib/deprecated/zbuff_compress.c | 1 - .../zstd/lib/deprecated/zbuff_decompress.c | 1 - third_party/zstd/lib/dictBuilder/cover.c | 1 - third_party/zstd/lib/dictBuilder/cover.h | 1 - third_party/zstd/lib/dictBuilder/divsufsort.c | 1 - third_party/zstd/lib/dictBuilder/divsufsort.h | 1 - third_party/zstd/lib/dictBuilder/fastcover.c | 1 - third_party/zstd/lib/dictBuilder/zdict.c | 1 - third_party/zstd/programs/benchfn.c | 1 - third_party/zstd/programs/benchfn.h | 1 - third_party/zstd/programs/benchzstd.c | 1 - third_party/zstd/programs/benchzstd.h | 1 - third_party/zstd/programs/datagen.c | 1 - third_party/zstd/programs/datagen.h | 1 - third_party/zstd/programs/dibio.c | 1 - third_party/zstd/programs/dibio.h | 1 - third_party/zstd/programs/fileio.c | 1 - third_party/zstd/programs/fileio.h | 1 - third_party/zstd/programs/fileio_asyncio.c | 1 - third_party/zstd/programs/fileio_asyncio.h | 1 - third_party/zstd/programs/fileio_common.h | 1 - third_party/zstd/programs/fileio_types.h | 1 - third_party/zstd/programs/platform.h | 1 - third_party/zstd/programs/timefn.c | 1 - third_party/zstd/programs/timefn.h | 1 - third_party/zstd/programs/util.c | 1 - third_party/zstd/programs/util.h | 1 - third_party/zstd/programs/zstdcli.c | 1 - third_party/zstd/programs/zstdcli_trace.c | 1 - third_party/zstd/programs/zstdcli_trace.h | 1 - third_party/zstd/programs/zstdgrep | 1 - third_party/zstd/zdict.h | 1 - third_party/zstd/zstd.h | 1 - third_party/zstd/zstd_errors.h | 1 - tool/args/args.h | 2 - tool/build/apelink.c | 2 +- tool/build/ar.c | 2 +- tool/build/assimilate.c | 2 +- tool/build/compile.c | 2 +- tool/build/elf2pe.c | 2 +- tool/build/fixupobj.c | 2 +- tool/build/lib/asmdown.h | 2 - tool/build/lib/buffer.h | 2 - tool/build/lib/case.h | 2 - tool/build/lib/demangle.h | 2 - tool/build/lib/elfwriter.h | 2 - tool/build/lib/elfwriter_zip.c | 1 + tool/build/lib/eztls.h | 2 - tool/build/lib/getargs.h | 2 - tool/build/lib/interner.h | 2 - tool/build/lib/javadown.h | 2 - tool/build/lib/lib.h | 2 - tool/build/lib/panel.h | 2 - tool/build/lib/psk.h | 2 - tool/build/lib/stripcomponents.h | 2 - tool/build/mkdeps.c | 2 +- tool/build/pecheck.c | 2 +- tool/build/pledge.c | 2 +- tool/build/runit.c | 2 +- tool/build/runitd.c | 2 +- tool/build/zipcopy.c | 2 + tool/build/zipobj.c | 1 + tool/curl/cmd.h | 2 - tool/decode/ar.c | 2 +- tool/decode/elf.c | 2 +- tool/decode/lib/asmcodegen.h | 2 - tool/decode/lib/bitabuilder.c | 1 - tool/decode/lib/bitabuilder.h | 2 - tool/decode/lib/disassemblehex.h | 2 - tool/decode/lib/elfidnames.h | 2 - tool/decode/lib/flagger.h | 2 - tool/decode/lib/idname.h | 2 - tool/decode/lib/machoidnames.h | 2 - tool/decode/lib/ntfileflagnames.h | 2 - tool/decode/lib/peidnames.h | 2 - tool/decode/lib/socknames.h | 2 - tool/decode/lib/titlegen.h | 2 - tool/decode/lib/x86idnames.h | 2 - tool/decode/lib/xederrors.h | 2 - tool/decode/lib/zipnames.h | 2 - tool/decode/pe2.c | 2 +- tool/decode/x86opinfo.c | 1 - tool/decode/zip.c | 2 +- tool/lambda/lib/blc.h | 2 - tool/net/lfinger.h | 2 - tool/net/lfuncs.c | 10 +- tool/net/lfuncs.h | 2 - tool/net/ljson.c | 2 +- tool/net/ljson.h | 2 - tool/net/lpath.h | 2 - tool/net/luacheck.h | 2 - tool/net/redbean.c | 2 +- tool/plinko/lib/char.h | 2 - tool/plinko/lib/config.h | 2 - tool/plinko/lib/cons.h | 2 - tool/plinko/lib/error.h | 2 - tool/plinko/lib/gc.h | 2 - tool/plinko/lib/histo.h | 2 - tool/plinko/lib/index.h | 2 - tool/plinko/lib/ktpenc.h | 2 - tool/plinko/lib/plinko.h | 2 - tool/plinko/lib/print.h | 2 - tool/plinko/lib/printf.h | 2 - tool/plinko/lib/stack.h | 2 - tool/plinko/lib/trace.h | 2 - tool/plinko/lib/tree.h | 2 - tool/plinko/lib/types.h | 2 - tool/scripts/fix-third-party.py | 2 - tool/viz/cpuid.c | 1 - tool/viz/lib/bilinearscale.h | 2 - tool/viz/lib/convolution.h | 2 - tool/viz/lib/convolve.h | 2 - tool/viz/lib/formatstringtable-assembly.c | 1 - tool/viz/lib/formatstringtable-testlib.h | 2 - tool/viz/lib/formatstringtable.h | 2 - tool/viz/lib/graphic.h | 2 - tool/viz/lib/halfblit.h | 2 - tool/viz/lib/knobs.h | 2 - tool/viz/lib/perlin3.c | 1 - tool/viz/lib/stringbuilder.h | 2 - tool/viz/lib/ycbcr.h | 2 - tool/viz/maxmind.c | 8 +- tool/viz/memzoom.c | 1 - tool/viz/printansi.c | 1 - tool/viz/printvideo.c | 1 - 3057 files changed, 410 insertions(+), 4398 deletions(-) delete mode 100644 libc/intrin/bitreverse.c delete mode 100644 libc/intrin/bitreverse32.c delete mode 100644 libc/intrin/bitreverse64.c rename libc/{intrin/bits.h => serialize.h} (67%) create mode 100644 libc/thread/pt.internal.h delete mode 100644 test/libc/intrin/bitreverse_test.c rename third_party/{sqlite3 => }/.clang-format (100%) delete mode 100644 third_party/libcxx/.clang-format diff --git a/Makefile b/Makefile index 266f57229..dd303d37f 100644 --- a/Makefile +++ b/Makefile @@ -123,6 +123,9 @@ o/$(MODE): \ o/$(MODE)/examples \ o/$(MODE)/third_party +.PHONY: o/$(MODE)/. +o/$(MODE)/.: o/$(MODE) + # check if we're using o//third_party/make/make.com # we added sandboxing to guarantee cosmo's makefile is hermetic # it also shaves away 200ms of startup latency with native $(uniq) diff --git a/ape/BUILD.mk b/ape/BUILD.mk index b3d7c87cd..7eb64bc5a 100644 --- a/ape/BUILD.mk +++ b/ape/BUILD.mk @@ -46,7 +46,6 @@ o/$(MODE)/ape: $(APE) o/$(MODE)/ape/aarch64.lds: \ ape/aarch64.lds \ libc/zip.internal.h \ - libc/intrin/bits.h \ libc/thread/tls.h \ libc/calls/struct/timespec.h \ libc/macros.internal.h \ @@ -274,7 +273,6 @@ o/$(MODE)/ape/ape.lds: \ ape/macros.internal.h \ ape/relocations.h \ ape/ape.internal.h \ - libc/intrin/bits.h \ libc/thread/tls.h \ libc/calls/struct/timespec.h \ libc/thread/thread.h \ diff --git a/ape/sections.internal.h b/ape/sections.internal.h index cec1745dd..0fbf72e70 100644 --- a/ape/sections.internal.h +++ b/ape/sections.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_APE_SECTIONS_INTERNAL_H_ #define COSMOPOLITAN_APE_SECTIONS_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const char __comment_start[] __attribute__((__weak__)); @@ -25,5 +24,4 @@ extern uint8_t __bss_start[] __attribute__((__weak__)); extern uint8_t __bss_end[] __attribute__((__weak__)); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_APE_SECTIONS_INTERNAL_H_ */ diff --git a/dsp/core/c11.h b/dsp/core/c11.h index c46d8d2ee..e88f3045d 100644 --- a/dsp/core/c11.h +++ b/dsp/core/c11.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_CORE_C11_H_ #define COSMOPOLITAN_DSP_CORE_C11_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Fixed-point 8-bit rounded mean kernel. @@ -17,5 +16,4 @@ __funline unsigned char C11(unsigned char al, unsigned char bl) { return al; } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_C11_H_ */ diff --git a/dsp/core/c121.h b/dsp/core/c121.h index d7b09314b..ce7d9176c 100644 --- a/dsp/core/c121.h +++ b/dsp/core/c121.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_CORE_C121_H_ #define COSMOPOLITAN_DSP_CORE_C121_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ __funline unsigned char C121(unsigned char al, unsigned char bl, @@ -16,5 +15,4 @@ __funline unsigned char C121(unsigned char al, unsigned char bl, } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_C121_H_ */ diff --git a/dsp/core/c121s.h b/dsp/core/c121s.h index 46e01c682..4dc41b4d4 100644 --- a/dsp/core/c121s.h +++ b/dsp/core/c121s.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_CORE_C121S_H_ #define COSMOPOLITAN_DSP_CORE_C121S_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) __funline signed char C121S(signed char al, signed char bl, signed char cl) { short ax; @@ -13,5 +12,4 @@ __funline signed char C121S(signed char al, signed char bl, signed char cl) { return ax; } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_C121S_H_ */ diff --git a/dsp/core/c1331.h b/dsp/core/c1331.h index 2a3e27c51..f9c66044c 100644 --- a/dsp/core/c1331.h +++ b/dsp/core/c1331.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_CORE_C1331_H_ #define COSMOPOLITAN_DSP_CORE_C1331_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Byte sized kernel for resampling memory in half. @@ -24,5 +23,4 @@ __funline unsigned char C1331(unsigned char al, unsigned char bl, return al; } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_C1331_H_ */ diff --git a/dsp/core/c1331s.h b/dsp/core/c1331s.h index 66388e080..c55fb6f92 100644 --- a/dsp/core/c1331s.h +++ b/dsp/core/c1331s.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_CORE_C1331S_H_ #define COSMOPOLITAN_DSP_CORE_C1331S_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Byte sized kernel for resampling difference samples in half. @@ -22,5 +21,4 @@ __funline signed char C1331S(signed char al, signed char bl, signed char cl, return ax; } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_C1331S_H_ */ diff --git a/dsp/core/c161.h b/dsp/core/c161.h index c9b22de12..40753eefa 100644 --- a/dsp/core/c161.h +++ b/dsp/core/c161.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_DSP_CORE_C161_H_ #define COSMOPOLITAN_DSP_CORE_C161_H_ #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define EXTRA_SHARP 2 @@ -28,5 +27,4 @@ __funline unsigned char C161(unsigned char al, unsigned char bl, return MIN(255, MAX(0, ax)); } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_C161_H_ */ diff --git a/dsp/core/c161s.h b/dsp/core/c161s.h index b67f08a2c..325278ee2 100644 --- a/dsp/core/c161s.h +++ b/dsp/core/c161s.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_DSP_CORE_C161S_H_ #include "dsp/core/c161.h" #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) __funline signed char C161S(signed char al, signed char bl, signed char cl) { short ax, bx, cx; @@ -20,5 +19,4 @@ __funline signed char C161S(signed char al, signed char bl, signed char cl) { return al; } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_C161S_H_ */ diff --git a/dsp/core/c331.h b/dsp/core/c331.h index 382bea626..8286b2e4d 100644 --- a/dsp/core/c331.h +++ b/dsp/core/c331.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_CORE_C331_H_ #define COSMOPOLITAN_DSP_CORE_C331_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -25,5 +24,4 @@ __funline unsigned char C331(unsigned char al, unsigned char bl, } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_C331_H_ */ diff --git a/dsp/core/gamma.h b/dsp/core/gamma.h index 05f6202a2..b3ab15e49 100644 --- a/dsp/core/gamma.h +++ b/dsp/core/gamma.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_DSP_CORE_GAMMA_H_ #define COSMOPOLITAN_DSP_CORE_GAMMA_H_ #include "libc/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define COMPANDLUMA(X, ...) COMPANDLUMA_(X, __VA_ARGS__) #define COMPANDLUMA_(X, K1, K2, K3, K4) \ @@ -19,5 +18,4 @@ #define COMPANDLUMA_BT1886(X) COMPANDLUMA(X, COMPANDLUMA_BT1886_MAGNUM) #define UNCOMPANDLUMA_BT1886(X) UNCOMPANDLUMA(X, COMPANDLUMA_BT1886_MAGNUM) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_GAMMA_H_ */ diff --git a/dsp/core/half.h b/dsp/core/half.h index 98770219a..0955ddfba 100644 --- a/dsp/core/half.h +++ b/dsp/core/half.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_DSP_CORE_HALF_H_ #define COSMOPOLITAN_DSP_CORE_HALF_H_ #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Divides integer in half w/ rounding. */ #define HALF(X) (((X) + 1) / 2) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_HALF_H_ */ diff --git a/dsp/core/illumination.h b/dsp/core/illumination.h index a50c7794e..dbf6e8eb9 100644 --- a/dsp/core/illumination.h +++ b/dsp/core/illumination.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_CORE_ILLUMINANT_H_ #define COSMOPOLITAN_DSP_CORE_ILLUMINANT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const double kBradford[3][3]; @@ -27,5 +26,4 @@ void *GetChromaticAdaptationMatrix(double[3][3], const double[3], const double[3]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_ILLUMINANT_H_ */ diff --git a/dsp/core/ituround.h b/dsp/core/ituround.h index 9c05aeaac..e30843812 100644 --- a/dsp/core/ituround.h +++ b/dsp/core/ituround.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_DSP_CORE_ITUROUND_H_ #define COSMOPOLITAN_DSP_CORE_ITUROUND_H_ #include "libc/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * An ITU recommended rounding function. @@ -19,5 +18,4 @@ __funline int ituroundf(float x) { return floorf(x + .5f); } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_ITUROUND_H_ */ diff --git a/dsp/core/ks8.h b/dsp/core/ks8.h index eebe38112..100b3decc 100644 --- a/dsp/core/ks8.h +++ b/dsp/core/ks8.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_DSP_CORE_KS8_H_ #define COSMOPOLITAN_DSP_CORE_KS8_H_ #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Performs 16-bit scaled rounded madd w/ eight coefficients or fewer. @@ -43,5 +42,4 @@ x1; \ }) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_KS8_H_ */ diff --git a/dsp/core/kss8.h b/dsp/core/kss8.h index 64a8f8844..54bff129c 100644 --- a/dsp/core/kss8.h +++ b/dsp/core/kss8.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_DSP_CORE_KSS8_H_ #include "libc/limits.h" #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Performs 16-bit scaled rounded saturated madd w/ eight coefficients or fewer. @@ -39,5 +38,4 @@ x1; \ }) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_KSS8_H_ */ diff --git a/dsp/core/q.h b/dsp/core/q.h index ebc881844..3d122bf49 100644 --- a/dsp/core/q.h +++ b/dsp/core/q.h @@ -3,7 +3,6 @@ #include "libc/limits.h" #include "libc/macros.internal.h" #include "libc/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * @fileoverview Fixed point arithmetic macros. @@ -23,5 +22,4 @@ long GetIntegerCoefficients(long[static 6], const double[static 6], long, long, long GetIntegerCoefficients8(long[static 8], const double[static 8], long, long, long); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_Q_H_ */ diff --git a/dsp/core/scalevolume.c b/dsp/core/scalevolume.c index e568b39db..2986a0dd6 100644 --- a/dsp/core/scalevolume.c +++ b/dsp/core/scalevolume.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/core/core.h" -#include "libc/intrin/bits.h" #include "libc/intrin/safemacros.internal.h" #include "libc/limits.h" diff --git a/dsp/core/twixt8.h b/dsp/core/twixt8.h index e8f4a31fb..01d3c0719 100644 --- a/dsp/core/twixt8.h +++ b/dsp/core/twixt8.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_CORE_TWIXT8_H_ #define COSMOPOLITAN_DSP_CORE_TWIXT8_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -19,5 +18,4 @@ __funline unsigned char twixt8(unsigned char al, unsigned char bl, } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_CORE_TWIXT8_H_ */ diff --git a/dsp/mpeg/blockset.h b/dsp/mpeg/blockset.h index cb33de551..14d0f36b2 100644 --- a/dsp/mpeg/blockset.h +++ b/dsp/mpeg/blockset.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_MPEG_BLOCKSET_H_ #define COSMOPOLITAN_DSP_MPEG_BLOCKSET_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define PLM_BLOCK_SET(DEST, DEST_INDEX, DEST_WIDTH, SOURCE_INDEX, \ SOURCE_WIDTH, BLOCK_SIZE, OP) \ @@ -18,5 +17,4 @@ } \ } while (false) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_MPEG_BLOCKSET_H_ */ diff --git a/dsp/mpeg/buffer.h b/dsp/mpeg/buffer.h index 93838c6c0..5fefc72b5 100644 --- a/dsp/mpeg/buffer.h +++ b/dsp/mpeg/buffer.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_DSP_MPEG_BUFFER_H_ #define COSMOPOLITAN_DSP_MPEG_BUFFER_H_ #include "dsp/mpeg/mpeg.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct FILE; @@ -159,5 +158,4 @@ forceinline uint16_t plm_buffer_read_vlc_uint(plm_buffer_t *self, } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_MPEG_BUFFER_H_ */ diff --git a/dsp/mpeg/demux.h b/dsp/mpeg/demux.h index 892c52220..0cc24e2eb 100644 --- a/dsp/mpeg/demux.h +++ b/dsp/mpeg/demux.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_DSP_MPEG_DEMUX_H_ #define COSMOPOLITAN_DSP_MPEG_DEMUX_H_ #include "dsp/mpeg/mpeg.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define START_PACK 0xBA @@ -27,5 +26,4 @@ plm_packet_t *plm_demux_decode_packet(plm_demux_t *self, int start_code); plm_packet_t *plm_demux_get_packet(plm_demux_t *self); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_MPEG_DEMUX_H_ */ diff --git a/dsp/mpeg/idct.h b/dsp/mpeg/idct.h index 6c64f969d..1d16f8e38 100644 --- a/dsp/mpeg/idct.h +++ b/dsp/mpeg/idct.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_DSP_MPEG_IDCT_H_ #define COSMOPOLITAN_DSP_MPEG_IDCT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void plm_video_idct(int *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_MPEG_IDCT_H_ */ diff --git a/dsp/mpeg/mpeg.h b/dsp/mpeg/mpeg.h index 26b9984ae..b96c622b9 100644 --- a/dsp/mpeg/mpeg.h +++ b/dsp/mpeg/mpeg.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_MPEG_MPEG_H_ #define COSMOPOLITAN_DSP_MPEG_MPEG_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct FILE; @@ -446,5 +445,4 @@ plm_samples_t *plm_audio_decode(plm_audio_t *self); extern long plmpegdecode_latency_; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_MPEG_MPEG_H_ */ diff --git a/dsp/mpeg/video.h b/dsp/mpeg/video.h index 546b7d91f..570ee94ea 100644 --- a/dsp/mpeg/video.h +++ b/dsp/mpeg/video.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_DSP_MPEG_VIDEO_H_ #define COSMOPOLITAN_DSP_MPEG_VIDEO_H_ #include "dsp/mpeg/mpeg.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct { @@ -58,5 +57,4 @@ void plm_video_process_macroblock_16(plm_video_t *, uint8_t *restrict, uint8_t *restrict, int, int, bool); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_MPEG_VIDEO_H_ */ diff --git a/dsp/scale/cdecimate2xuint8x8.h b/dsp/scale/cdecimate2xuint8x8.h index 04f30668a..8d8613959 100644 --- a/dsp/scale/cdecimate2xuint8x8.h +++ b/dsp/scale/cdecimate2xuint8x8.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_DSP_SCALE_CDECIMATE2XUINT8X8_H_ #define COSMOPOLITAN_DSP_SCALE_CDECIMATE2XUINT8X8_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *cDecimate2xUint8x8(unsigned long n, unsigned char[n], const signed char[8]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_SCALE_CDECIMATE2XUINT8X8_H_ */ diff --git a/dsp/scale/scale.h b/dsp/scale/scale.h index be58dde94..857bf1162 100644 --- a/dsp/scale/scale.h +++ b/dsp/scale/scale.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_SCALE_SCALE_H_ #define COSMOPOLITAN_DSP_SCALE_SCALE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern long gyarados_latency_; @@ -33,5 +32,4 @@ void *EzGyarados(long, long, long, void *, long, long, long, const void *, long, long, long, long, long, long, double, double, double, double); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_SCALE_SCALE_H_ */ diff --git a/dsp/tty/internal.h b/dsp/tty/internal.h index 0be772622..e0d56e5f2 100644 --- a/dsp/tty/internal.h +++ b/dsp/tty/internal.h @@ -3,7 +3,6 @@ #include "dsp/tty/quant.h" #include "dsp/tty/ttyrgb.h" #include "third_party/intel/xmmintrin.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct TtyRgb rgb2tty24f_(ttyrgb_m128); @@ -30,5 +29,4 @@ char *setbgfg24_(char *, struct TtyRgb, struct TtyRgb); struct TtyRgb rgb2ansi8_(int, int, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_TTY_INTERNAL_H_ */ diff --git a/dsp/tty/itoa8.c b/dsp/tty/itoa8.c index 226f60c6f..951d734d1 100644 --- a/dsp/tty/itoa8.c +++ b/dsp/tty/itoa8.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/itoa8.h" -#include "libc/intrin/bits.h" #include "libc/str/str.h" struct Itoa8 kItoa8; diff --git a/dsp/tty/itoa8.h b/dsp/tty/itoa8.h index 3c3849051..26810aea0 100644 --- a/dsp/tty/itoa8.h +++ b/dsp/tty/itoa8.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_DSP_TTY_ITOA8_H_ #define COSMOPOLITAN_DSP_TTY_ITOA8_H_ #include "libc/str/str.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Itoa8 { @@ -17,5 +16,4 @@ forceinline char *itoa8(char *p, uint8_t c) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_TTY_ITOA8_H_ */ diff --git a/dsp/tty/quant.h b/dsp/tty/quant.h index a0422ebf4..f9e031730 100644 --- a/dsp/tty/quant.h +++ b/dsp/tty/quant.h @@ -2,10 +2,8 @@ #define DSP_TTY_QUANT_H_ #include "dsp/tty/ttyrgb.h" #include "libc/assert.h" -#include "libc/intrin/bits.h" #include "libc/limits.h" #include "libc/str/str.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define TL 0 @@ -90,5 +88,4 @@ forceinline bool ttyeq(struct TtyRgb x, struct TtyRgb y) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* DSP_TTY_QUANT_H_ */ diff --git a/dsp/tty/tty.h b/dsp/tty/tty.h index 07d4fd537..99ca8f00e 100644 --- a/dsp/tty/tty.h +++ b/dsp/tty/tty.h @@ -3,7 +3,6 @@ #define kTtyIdScreen 83 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct FILE; @@ -55,5 +54,4 @@ void ttyhisto(uint32_t[hasatleast 256], uint8_t[hasatleast 256], const uint8_t *, const uint8_t *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_TTY_TTY_H_ */ diff --git a/dsp/tty/ttyraster.c b/dsp/tty/ttyraster.c index b334c6562..4659180bc 100644 --- a/dsp/tty/ttyraster.c +++ b/dsp/tty/ttyraster.c @@ -22,7 +22,6 @@ #include "dsp/tty/ttyrgb.h" #include "dsp/tty/windex.h" #include "libc/assert.h" -#include "libc/intrin/bits.h" #include "libc/intrin/safemacros.internal.h" #include "libc/limits.h" #include "libc/log/check.h" diff --git a/dsp/tty/ttyrgb.h b/dsp/tty/ttyrgb.h index cc1d713dc..fd0f34a12 100644 --- a/dsp/tty/ttyrgb.h +++ b/dsp/tty/ttyrgb.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_DSP_TTY_RGB_H_ #define COSMOPOLITAN_DSP_TTY_RGB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct TtyRgb { @@ -8,5 +7,4 @@ struct TtyRgb { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_TTY_RGB_H_ */ diff --git a/dsp/tty/windex.h b/dsp/tty/windex.h index 0effa18bd..12af61387 100644 --- a/dsp/tty/windex.h +++ b/dsp/tty/windex.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_DSP_TTY_WINDEX_H_ #define COSMOPOLITAN_DSP_TTY_WINDEX_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern unsigned (*windex)(uint16_t *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_TTY_WINDEX_H_ */ diff --git a/dsp/tty/xtermname.h b/dsp/tty/xtermname.h index ed3551b80..7641f8c08 100644 --- a/dsp/tty/xtermname.h +++ b/dsp/tty/xtermname.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_DSP_TTY_XTERMNAME_H_ #define COSMOPOLITAN_DSP_TTY_XTERMNAME_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const char kXtermName[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_DSP_TTY_XTERMNAME_H_ */ diff --git a/examples/nesemu1.cc b/examples/nesemu1.cc index e521c5739..0f5db41cd 100644 --- a/examples/nesemu1.cc +++ b/examples/nesemu1.cc @@ -19,7 +19,6 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" #include "libc/intrin/safemacros.internal.h" #include "libc/inttypes.h" #include "libc/log/check.h" diff --git a/examples/package/lib/myprint.h b/examples/package/lib/myprint.h index 03caf3106..4c38cda02 100644 --- a/examples/package/lib/myprint.h +++ b/examples/package/lib/myprint.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_EXAMPLES_PACKAGE_LIB_MYPRINT_H_ #define COSMOPOLITAN_EXAMPLES_PACKAGE_LIB_MYPRINT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void MyPrint(const char *); void MyAsm(const char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_EXAMPLES_PACKAGE_LIB_MYPRINT_H_ */ diff --git a/libc/ar.h b/libc/ar.h index ffdbf4335..b7d2d4aeb 100644 --- a/libc/ar.h +++ b/libc/ar.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_AR_H_ #define COSMOPOLITAN_LIBC_AR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define ARMAG "!\n" @@ -18,5 +17,4 @@ struct ar_hdr { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_AR_H_ */ diff --git a/libc/calls/asan.internal.h b/libc/calls/asan.internal.h index e8d743c8d..31b504e14 100644 --- a/libc/calls/asan.internal.h +++ b/libc/calls/asan.internal.h @@ -4,7 +4,6 @@ #include "libc/calls/struct/timeval.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/asmflag.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ forceinline bool __asan_is_valid_timespec(const struct timespec *ts) { @@ -25,5 +24,4 @@ forceinline bool __asan_is_valid_timeval(const struct timeval *tv) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_ASAN_INTERNAL_H_ */ diff --git a/libc/calls/blockcancel.internal.h b/libc/calls/blockcancel.internal.h index 5ca6ed3a5..6b4a0f23f 100644 --- a/libc/calls/blockcancel.internal.h +++ b/libc/calls/blockcancel.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_BLOCKCANCEL_H_ #define COSMOPOLITAN_LIBC_CALLS_BLOCKCANCEL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define BLOCK_CANCELATION \ @@ -17,5 +16,4 @@ int _pthread_block_cancelation(void); void _pthread_allow_cancelation(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_BLOCKCANCEL_H_ */ diff --git a/libc/calls/cachestat.h b/libc/calls/cachestat.h index 1c3cd22f3..362e31ec4 100644 --- a/libc/calls/cachestat.h +++ b/libc/calls/cachestat.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_CACHESTAT_H_ #define COSMOPOLITAN_LIBC_CALLS_CACHESTAT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct cachestat_range { @@ -30,5 +29,4 @@ struct cachestat { int cachestat(int, struct cachestat_range *, struct cachestat *, uint32_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_LANDLOCK_H_ */ \ No newline at end of file diff --git a/libc/calls/calls.h b/libc/calls/calls.h index 298de4d79..dbf7ca5bd 100644 --- a/libc/calls/calls.h +++ b/libc/calls/calls.h @@ -65,7 +65,6 @@ #define tmpfd __tmpfd #endif -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § system calls ─╬─│┼ @@ -260,5 +259,4 @@ int __wifsignaled(int) pureconst; #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SYSCALLS_H_ */ diff --git a/libc/calls/cp.internal.h b/libc/calls/cp.internal.h index 1fa22ee6b..d727fbdd0 100644 --- a/libc/calls/cp.internal.h +++ b/libc/calls/cp.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_CP_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_CP_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int begin_cancelation_point(void); @@ -21,5 +20,4 @@ void end_cancelation_point(int); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_CP_INTERNAL_H_ */ diff --git a/libc/calls/fchmodat.c b/libc/calls/fchmodat.c index c1d56792b..b74d02392 100644 --- a/libc/calls/fchmodat.c +++ b/libc/calls/fchmodat.c @@ -16,6 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/blockcancel.internal.h" #include "libc/calls/calls.h" #include "libc/calls/syscall-nt.internal.h" #include "libc/calls/syscall-sysv.internal.h" @@ -62,7 +63,9 @@ int fchmodat(int dirfd, const char *path, uint32_t mode, int flags) { rc = sys_fchmodat2(dirfd, path, mode, flags); if (rc == -1 && errno == ENOSYS) { errno = serrno; + BLOCK_CANCELATION; rc = sys_fchmodat_linux(dirfd, path, mode, flags); + ALLOW_CANCELATION; } } else { rc = sys_fchmodat(dirfd, path, mode, flags); diff --git a/libc/calls/finddebugbinary.c b/libc/calls/finddebugbinary.c index ff38f51a8..86eae856e 100644 --- a/libc/calls/finddebugbinary.c +++ b/libc/calls/finddebugbinary.c @@ -26,7 +26,7 @@ #include "libc/elf/def.h" #include "libc/elf/tinyelf.internal.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/directmap.internal.h" #include "libc/nt/memory.h" #include "libc/nt/runtime.h" diff --git a/libc/calls/getprogramexecutablename.greg.c b/libc/calls/getprogramexecutablename.greg.c index b3e4cde81..983e91b2b 100644 --- a/libc/calls/getprogramexecutablename.greg.c +++ b/libc/calls/getprogramexecutablename.greg.c @@ -23,7 +23,7 @@ #include "libc/cosmo.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/macros.internal.h" #include "libc/nt/runtime.h" diff --git a/libc/calls/getrandom.c b/libc/calls/getrandom.c index 3ced34951..118c4eb53 100644 --- a/libc/calls/getrandom.c +++ b/libc/calls/getrandom.c @@ -31,7 +31,6 @@ #include "libc/errno.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/asmflag.h" -#include "libc/intrin/bits.h" #include "libc/intrin/strace.internal.h" #include "libc/intrin/weaken.h" #include "libc/macros.internal.h" diff --git a/libc/calls/groups.internal.h b/libc/calls/groups.internal.h index 616b47277..d7d0c80b7 100644 --- a/libc/calls/groups.internal.h +++ b/libc/calls/groups.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_GROUPS_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_GROUPS_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_getgroups(int size, uint32_t list[]); @@ -11,5 +10,4 @@ const char *DescribeGidList(char[128], int, int, const uint32_t list[]); DescribeGidList(alloca(128), rc, length, gidlist) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_GROUPS_INTERNAL_H_ */ diff --git a/libc/calls/internal.h b/libc/calls/internal.h index df04b5438..5640aa719 100644 --- a/libc/calls/internal.h +++ b/libc/calls/internal.h @@ -9,7 +9,6 @@ #define kSigactionMinRva 8 /* >SIG_{ERR,DFL,IGN,...} */ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define kIoMotion ((const int8_t[3]){1, 0, 0}) @@ -54,5 +53,4 @@ bool __iswsl1(void); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_INTERNAL_H_ */ diff --git a/libc/calls/ioctl.c b/libc/calls/ioctl.c index 6b31c3d96..09cc37553 100644 --- a/libc/calls/ioctl.c +++ b/libc/calls/ioctl.c @@ -24,7 +24,7 @@ #include "libc/calls/termios.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/cmpxchg.h" #include "libc/intrin/strace.internal.h" #include "libc/intrin/weaken.h" @@ -66,7 +66,7 @@ static struct HostAdapterInfoNode { struct sockaddr netmask; struct sockaddr broadcast; short flags; -} * __hostInfo; +} *__hostInfo; static int ioctl_default(int fd, unsigned long request, void *arg) { int rc; diff --git a/libc/calls/ipc.h b/libc/calls/ipc.h index 8a90f31c8..70c253ca5 100644 --- a/libc/calls/ipc.h +++ b/libc/calls/ipc.h @@ -10,11 +10,9 @@ #define IPC_EXCL 02000 #define IPC_NOWAIT 04000 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int ftok(const char *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_IPC_H_ */ diff --git a/libc/calls/isapemagic.c b/libc/calls/isapemagic.c index 0da408fad..49a9d98d8 100644 --- a/libc/calls/isapemagic.c +++ b/libc/calls/isapemagic.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/calls.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" +#include "libc/proc/execve.internal.h" /** * Returns true if executable image is supported by APE Loader. diff --git a/libc/calls/landlock.h b/libc/calls/landlock.h index e689188d4..b2237cd3d 100644 --- a/libc/calls/landlock.h +++ b/libc/calls/landlock.h @@ -36,7 +36,6 @@ */ #define LANDLOCK_ACCESS_FS_TRUNCATE 0x4000ul -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ enum landlock_rule_type { @@ -58,5 +57,4 @@ int landlock_create_ruleset(const struct landlock_ruleset_attr *, size_t, uint32_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_LANDLOCK_H_ */ diff --git a/libc/calls/makedev.h b/libc/calls/makedev.h index ad874a06f..8dc2b0049 100644 --- a/libc/calls/makedev.h +++ b/libc/calls/makedev.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_MAKEDEV_H_ #define COSMOPOLITAN_LIBC_CALLS_MAKEDEV_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) uint64_t makedev(uint32_t, uint32_t); uint32_t major(uint64_t); @@ -10,5 +9,4 @@ uint32_t minor(uint64_t); #define minor(x) minor(x) #define makedev(x, y) makedev(x, y) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_MAKEDEV_H_ */ diff --git a/libc/calls/mkdtemp.c b/libc/calls/mkdtemp.c index a4c690816..f565189c3 100644 --- a/libc/calls/mkdtemp.c +++ b/libc/calls/mkdtemp.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/stdio/rand.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/mount.h b/libc/calls/mount.h index ee0b88830..c3097ab2d 100644 --- a/libc/calls/mount.h +++ b/libc/calls/mount.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_MOUNT_H_ #define COSMOPOLITAN_LIBC_CALLS_MOUNT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int mount(const char *, const char *, const char *, unsigned long, @@ -13,5 +12,4 @@ int umount2(const char *, int); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_MOUNT_H_ */ diff --git a/libc/calls/openatemp.c b/libc/calls/openatemp.c index e1c747228..5001dd555 100644 --- a/libc/calls/openatemp.c +++ b/libc/calls/openatemp.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/stdio/rand.h" #include "libc/str/str.h" #include "libc/sysv/consts/o.h" diff --git a/libc/calls/openbsd.internal.h b/libc/calls/openbsd.internal.h index 37b42cfb6..d56712d96 100644 --- a/libc/calls/openbsd.internal.h +++ b/libc/calls/openbsd.internal.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_COMPAT_OPENBSD_H_ #define COSMOPOLITAN_LIBC_COMPAT_OPENBSD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef unsigned char u_char; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_COMPAT_OPENBSD_H_ */ diff --git a/libc/calls/pledge.h b/libc/calls/pledge.h index 77cc452bb..dcf186380 100644 --- a/libc/calls/pledge.h +++ b/libc/calls/pledge.h @@ -7,11 +7,9 @@ #define PLEDGE_PENALTY_MASK 0x000f #define PLEDGE_STDERR_LOGGING 0x0010 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern int __pledge_mode; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_PLEDGE_H_ */ diff --git a/libc/calls/pledge.internal.h b/libc/calls/pledge.internal.h index c26ed5f97..a133cc904 100644 --- a/libc/calls/pledge.internal.h +++ b/libc/calls/pledge.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_PLEDGE_INTERNAL_H_ #include "libc/calls/pledge.h" #include "libc/intrin/promises.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Pledges { @@ -17,5 +16,4 @@ int sys_pledge_linux(unsigned long, int); int ParsePromises(const char *, unsigned long *, unsigned long); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_PLEDGE_INTERNAL_H_ */ diff --git a/libc/calls/poll-nt.c b/libc/calls/poll-nt.c index d5c63ada7..f51a7f7d3 100644 --- a/libc/calls/poll-nt.c +++ b/libc/calls/poll-nt.c @@ -27,7 +27,6 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" #include "libc/intrin/strace.internal.h" #include "libc/macros.internal.h" #include "libc/mem/mem.h" diff --git a/libc/calls/prctl.internal.h b/libc/calls/prctl.internal.h index 89d9a0308..b2da973f6 100644 --- a/libc/calls/prctl.internal.h +++ b/libc/calls/prctl.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_PRCTL_INTERNAL_H_ #include "libc/dce.h" #include "libc/sysv/consts/nrlinux.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ forceinline int sys_prctl(int op, long a, long b, long c, long d) { @@ -34,5 +33,4 @@ forceinline int sys_prctl(int op, long a, long b, long c, long d) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_PRCTL_INTERNAL_H_ */ diff --git a/libc/calls/sched-sysv.internal.h b/libc/calls/sched-sysv.internal.h index f5a69e9ad..c80a4feab 100644 --- a/libc/calls/sched-sysv.internal.h +++ b/libc/calls/sched-sysv.internal.h @@ -11,7 +11,6 @@ #define CPU_WHICH_TID 1 #define CPU_WHICH_PID 2 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_sched_get_priority_max(int); @@ -41,5 +40,4 @@ int sys_sched_getaffinity_freebsd(int level, int which, int id, size_t setsize, void *mask) asm("sys_sched_getaffinity"); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SCHED_SYSV_INTERNAL_H_ */ diff --git a/libc/calls/sig.internal.h b/libc/calls/sig.internal.h index cedc38338..49e65c605 100644 --- a/libc/calls/sig.internal.h +++ b/libc/calls/sig.internal.h @@ -6,7 +6,6 @@ #define SIG_HANDLED_NO_RESTART 1 #define SIG_HANDLED_SA_RESTART 2 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Signals { @@ -28,5 +27,4 @@ void __sig_generate(int, int); void __sig_init(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SIGNALS_INTERNAL_H_ */ diff --git a/libc/calls/sigaction.c b/libc/calls/sigaction.c index d7f313b0e..68b8ea7f7 100644 --- a/libc/calls/sigaction.c +++ b/libc/calls/sigaction.c @@ -31,7 +31,6 @@ #include "libc/calls/ucontext.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" -#include "libc/intrin/bits.h" #include "libc/intrin/describeflags.internal.h" #include "libc/intrin/dll.h" #include "libc/intrin/strace.internal.h" diff --git a/libc/calls/sigtimedwait.h b/libc/calls/sigtimedwait.h index 0f8cd86fb..041a4fe69 100644 --- a/libc/calls/sigtimedwait.h +++ b/libc/calls/sigtimedwait.h @@ -3,7 +3,6 @@ #include "libc/calls/struct/siginfo.h" #include "libc/calls/struct/sigset.h" #include "libc/calls/struct/timespec.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sigwait(const sigset_t *, int *); @@ -11,5 +10,4 @@ int sigtimedwait(const sigset_t *, siginfo_t *, const struct timespec *); int sigwaitinfo(const sigset_t *, siginfo_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SIGTIMEDWAIT_H_ */ diff --git a/libc/calls/sigtimedwait.internal.h b/libc/calls/sigtimedwait.internal.h index a75b51929..c81e8d4cc 100644 --- a/libc/calls/sigtimedwait.internal.h +++ b/libc/calls/sigtimedwait.internal.h @@ -3,12 +3,10 @@ #include "libc/calls/struct/siginfo-meta.internal.h" #include "libc/calls/struct/sigset.h" #include "libc/calls/struct/timespec.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_sigtimedwait(const sigset_t *, union siginfo_meta *, const struct timespec *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SIGTIMEDWAIT_INTERNAL_H_ */ diff --git a/libc/calls/state.internal.h b/libc/calls/state.internal.h index a37a780bc..003265867 100644 --- a/libc/calls/state.internal.h +++ b/libc/calls/state.internal.h @@ -4,7 +4,6 @@ #include "libc/nt/struct/securityattributes.h" #include "libc/thread/thread.h" #include "libc/thread/tls.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern int __vforked; @@ -21,5 +20,4 @@ void __fds_unlock(void); #define __vforked (__tls_enabled && (__get_tls()->tib_flags & TIB_FLAG_VFORKED)) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STATE_INTERNAL_H_ */ diff --git a/libc/calls/struct/aarch64.internal.h b/libc/calls/struct/aarch64.internal.h index a34650227..01b778d3f 100644 --- a/libc/calls/struct/aarch64.internal.h +++ b/libc/calls/struct/aarch64.internal.h @@ -6,7 +6,6 @@ #define EXTRA_MAGIC 0x45585401 #define SVE_MAGIC 0x53564501 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct _aarch64_ctx { @@ -40,5 +39,4 @@ struct sve_context { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_AARCH64_H_ */ diff --git a/libc/calls/struct/bpf.internal.h b/libc/calls/struct/bpf.internal.h index 4021c1799..e6f48bb58 100644 --- a/libc/calls/struct/bpf.internal.h +++ b/libc/calls/struct/bpf.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_BPF_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_BPF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define BPF_MAXINSNS 4096 @@ -1328,5 +1327,4 @@ struct btf_ptr { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_BPF_H_ */ diff --git a/libc/calls/struct/cpuset.h b/libc/calls/struct/cpuset.h index dafddbb14..26e654bc9 100644 --- a/libc/calls/struct/cpuset.h +++ b/libc/calls/struct/cpuset.h @@ -3,7 +3,6 @@ #define CPU_SETSIZE 1024 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct cpu_set_t { @@ -55,5 +54,4 @@ int CPU_COUNT_S(size_t, const cpu_set_t *); #define CPU_ISSET_S(i, size, set) _CPU_S(i, size, set, &) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_CPUSET_H_ */ diff --git a/libc/calls/struct/dirent.h b/libc/calls/struct/dirent.h index 42690c563..39c387979 100644 --- a/libc/calls/struct/dirent.h +++ b/libc/calls/struct/dirent.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_DIRENT_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_DIRENT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct dirent { /* linux getdents64 abi */ @@ -29,5 +28,4 @@ int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **)); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_DIRENT_H_ */ diff --git a/libc/calls/struct/fd.internal.h b/libc/calls/struct/fd.internal.h index 5c54a97d4..235ee7ff5 100644 --- a/libc/calls/struct/fd.internal.h +++ b/libc/calls/struct/fd.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_FD_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_FD_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define kFdEmpty 0 @@ -35,5 +34,4 @@ struct Fds { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FD_INTERNAL_H_ */ diff --git a/libc/calls/struct/filter.internal.h b/libc/calls/struct/filter.internal.h index b44fec07b..f070ca202 100644 --- a/libc/calls/struct/filter.internal.h +++ b/libc/calls/struct/filter.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_FILTER_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_FILTER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define BPF_MAJOR_VERSION 1 @@ -55,5 +54,4 @@ struct sock_fprog { #define BPF_LL_OFF SKF_LL_OFF COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FILTER_H_ */ diff --git a/libc/calls/struct/flock.h b/libc/calls/struct/flock.h index ac897f6db..6fc45b5a1 100644 --- a/libc/calls/struct/flock.h +++ b/libc/calls/struct/flock.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_FLOCK_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_FLOCK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct flock { /* cosmopolitan abi */ @@ -13,5 +12,4 @@ struct flock { /* cosmopolitan abi */ }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FLOCK_H_ */ diff --git a/libc/calls/struct/flock.internal.h b/libc/calls/struct/flock.internal.h index 1d379ebca..aea17b09e 100644 --- a/libc/calls/struct/flock.internal.h +++ b/libc/calls/struct/flock.internal.h @@ -2,12 +2,10 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_FLOCK_INTERNAL_H_ #include "libc/calls/struct/flock.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ const char *DescribeFlock(char[300], int, const struct flock *); #define DescribeFlock(c, l) DescribeFlock(alloca(300), c, l) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FLOCK_INTERNAL_H_ */ diff --git a/libc/calls/struct/framebuffercolormap.h b/libc/calls/struct/framebuffercolormap.h index 922ae3aa8..aa3aef9b5 100644 --- a/libc/calls/struct/framebuffercolormap.h +++ b/libc/calls/struct/framebuffercolormap.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_FRAMEBUFFERCOLORMAP_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_FRAMEBUFFERCOLORMAP_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct FrameBufferColorMap { uint32_t start; @@ -11,5 +10,4 @@ struct FrameBufferColorMap { uint16_t *transp; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FRAMEBUFFERCOLORMAP_H_ */ diff --git a/libc/calls/struct/framebufferfixedscreeninfo.h b/libc/calls/struct/framebufferfixedscreeninfo.h index 4e7b9d3af..b69d6c5ad 100644 --- a/libc/calls/struct/framebufferfixedscreeninfo.h +++ b/libc/calls/struct/framebufferfixedscreeninfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_FRAMEBUFFERFIXEDSCREENINFO_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_FRAMEBUFFERFIXEDSCREENINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct FrameBufferFixedScreenInfo { char id[16]; @@ -20,5 +19,4 @@ struct FrameBufferFixedScreenInfo { uint16_t reserved[2]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FRAMEBUFFERFIXEDSCREENINFO_H_ */ diff --git a/libc/calls/struct/framebuffervirtualscreeninfo.h b/libc/calls/struct/framebuffervirtualscreeninfo.h index db3d5a963..48b622a9e 100644 --- a/libc/calls/struct/framebuffervirtualscreeninfo.h +++ b/libc/calls/struct/framebuffervirtualscreeninfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_FRAMEBUFFERVIRTUALSCREENINFO_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_FRAMEBUFFERVIRTUALSCREENINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct FrameBufferBitField { uint32_t offset; @@ -40,5 +39,4 @@ struct FrameBufferVirtualScreenInfo { uint32_t reserved[4]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FRAMEBUFFERVIRTUALSCREENINFO_H_ */ diff --git a/libc/calls/struct/fsid.h b/libc/calls/struct/fsid.h index 9bf3ac1bb..43fe16157 100644 --- a/libc/calls/struct/fsid.h +++ b/libc/calls/struct/fsid.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_FSID_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_FSID_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct fsid_t { @@ -8,5 +7,4 @@ typedef struct fsid_t { } fsid_t; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FSID_H_ */ diff --git a/libc/calls/struct/iovec.h b/libc/calls/struct/iovec.h index de85f13f6..cc984c997 100644 --- a/libc/calls/struct/iovec.h +++ b/libc/calls/struct/iovec.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_IOVEC_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_IOVEC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct iovec { @@ -15,5 +14,4 @@ ssize_t vmsplice(int, const struct iovec *, int64_t, uint32_t); ssize_t writev(int, const struct iovec *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_IOVEC_H_ */ diff --git a/libc/calls/struct/iovec.internal.h b/libc/calls/struct/iovec.internal.h index c39a3f56e..488b30b2e 100644 --- a/libc/calls/struct/iovec.internal.h +++ b/libc/calls/struct/iovec.internal.h @@ -3,7 +3,6 @@ #include "libc/calls/struct/fd.internal.h" #include "libc/calls/struct/iovec.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ ssize_t __robust_writev(int, struct iovec *, int); @@ -28,5 +27,4 @@ const char *DescribeIovec(char[300], ssize_t, const struct iovec *, int); #define DescribeIovec(x, y, z) DescribeIovec(alloca(300), x, y, z) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_IOVEC_INTERNAL_H_ */ diff --git a/libc/calls/struct/itimerval.h b/libc/calls/struct/itimerval.h index 0c8a78b9c..fcb7cd405 100644 --- a/libc/calls/struct/itimerval.h +++ b/libc/calls/struct/itimerval.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_ITIMERVAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_ITIMERVAL_H_ #include "libc/calls/struct/timeval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct itimerval { @@ -13,5 +12,4 @@ int getitimer(int, struct itimerval *); int setitimer(int, const struct itimerval *, struct itimerval *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_ITIMERVAL_H_ */ diff --git a/libc/calls/struct/itimerval.internal.h b/libc/calls/struct/itimerval.internal.h index 96119e98d..ababa1bee 100644 --- a/libc/calls/struct/itimerval.internal.h +++ b/libc/calls/struct/itimerval.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_ITIMERVAL_INTERNAL_H_ #include "libc/calls/struct/itimerval.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_getitimer(int, struct itimerval *); @@ -13,5 +12,4 @@ const char *DescribeItimerval(char[90], int, const struct itimerval *); #define DescribeItimerval(rc, ts) DescribeItimerval(alloca(90), rc, ts) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_ITIMERVAL_INTERNAL_H_ */ diff --git a/libc/calls/struct/metasigaltstack.h b/libc/calls/struct/metasigaltstack.h index 215bf4ec9..ac6976ec7 100644 --- a/libc/calls/struct/metasigaltstack.h +++ b/libc/calls/struct/metasigaltstack.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_METASIGALTSTACK_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_METASIGALTSTACK_H_ #include "libc/calls/struct/sigaltstack.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sigaltstack_bsd { @@ -11,5 +10,4 @@ struct sigaltstack_bsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_METASIGALTSTACK_H_ */ diff --git a/libc/calls/struct/metastat.internal.h b/libc/calls/struct/metastat.internal.h index e9086fd1a..4d00e5a2b 100644 --- a/libc/calls/struct/metastat.internal.h +++ b/libc/calls/struct/metastat.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_METASTAT_H_ #include "libc/calls/struct/stat.h" #include "libc/calls/struct/timespec.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define METASTAT(x, field) \ @@ -115,5 +114,4 @@ union metastat { void __stat2cosmo(struct stat *restrict, const union metastat *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_METASTAT_H_ */ diff --git a/libc/calls/struct/metatermios.internal.h b/libc/calls/struct/metatermios.internal.h index 2bb2f2685..7a48d1969 100644 --- a/libc/calls/struct/metatermios.internal.h +++ b/libc/calls/struct/metatermios.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_METATERMIOS_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_METATERMIOS_H_ #include "libc/calls/struct/termios.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct termios_xnu { @@ -31,5 +30,4 @@ union metatermios { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_METATERMIOS_H_ */ diff --git a/libc/calls/struct/rlimit.h b/libc/calls/struct/rlimit.h index 532ff0a13..4d6f10369 100644 --- a/libc/calls/struct/rlimit.h +++ b/libc/calls/struct/rlimit.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_RLIMIT_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_RLIMIT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct rlimit { @@ -12,5 +11,4 @@ int getrlimit(int, struct rlimit *); int setrlimit(int, const struct rlimit *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_RLIMIT_H_ */ diff --git a/libc/calls/struct/rlimit.internal.h b/libc/calls/struct/rlimit.internal.h index 8a7235c73..fa8ce9200 100644 --- a/libc/calls/struct/rlimit.internal.h +++ b/libc/calls/struct/rlimit.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_RLIMIT_INTERNAL_H_ #include "libc/calls/struct/rlimit.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_getrlimit(int, struct rlimit *); @@ -13,5 +12,4 @@ const char *DescribeRlimit(char[64], int, const struct rlimit *); #define DescribeRlimit(rc, rl) DescribeRlimit(alloca(64), rc, rl) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_RLIMIT_INTERNAL_H_ */ diff --git a/libc/calls/struct/rusage.h b/libc/calls/struct/rusage.h index b85be7615..edd451aac 100644 --- a/libc/calls/struct/rusage.h +++ b/libc/calls/struct/rusage.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_RUSAGE_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_RUSAGE_H_ #include "libc/calls/struct/timeval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct rusage { @@ -29,5 +28,4 @@ int wait4(int, int *, int, struct rusage *); void rusage_add(struct rusage *, const struct rusage *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_RUSAGE_H_ */ diff --git a/libc/calls/struct/rusage.internal.h b/libc/calls/struct/rusage.internal.h index 50432fb9c..57154f017 100644 --- a/libc/calls/struct/rusage.internal.h +++ b/libc/calls/struct/rusage.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_RUSAGE_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_RUSAGE_INTERNAL_H_ #include "libc/calls/struct/rusage.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int __sys_getrusage(int, struct rusage *); @@ -12,5 +11,4 @@ void __rusage2linux(struct rusage *); int sys_getrusage_nt(int, struct rusage *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_RUSAGE_INTERNAL_H_ */ diff --git a/libc/calls/struct/sched_param.h b/libc/calls/struct/sched_param.h index e445ef056..69de69f35 100644 --- a/libc/calls/struct/sched_param.h +++ b/libc/calls/struct/sched_param.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SCHED_PARAM_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SCHED_PARAM_H_ #include "libc/calls/struct/timespec.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sched_param { @@ -17,5 +16,4 @@ int sched_setparam(int, const struct sched_param *); int sched_setscheduler(int, int, const struct sched_param *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SCHED_PARAM_H_ */ diff --git a/libc/calls/struct/sched_param.internal.h b/libc/calls/struct/sched_param.internal.h index ced36d346..9df42312e 100644 --- a/libc/calls/struct/sched_param.internal.h +++ b/libc/calls/struct/sched_param.internal.h @@ -2,12 +2,10 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SCHED_PARAM_INTERNAL_H_ #include "libc/calls/struct/sched_param.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ const char *DescribeSchedParam(char[32], const struct sched_param *); #define DescribeSchedParam(x) DescribeSchedParam(alloca(32), x) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SCHED_PARAM_INTERNAL_H_ */ diff --git a/libc/calls/struct/seccomp.internal.h b/libc/calls/struct/seccomp.internal.h index 0e5cc8f8c..d3d9aae4a 100644 --- a/libc/calls/struct/seccomp.internal.h +++ b/libc/calls/struct/seccomp.internal.h @@ -26,7 +26,6 @@ #define SECCOMP_ADDFD_FLAG_SETFD (1UL << 0) #define SECCOMP_ADDFD_FLAG_SEND (1UL << 1) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define SECCOMP_IOC_MAGIC '!' @@ -76,5 +75,4 @@ struct seccomp_notif_addfd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SECCOMP_H_ */ diff --git a/libc/calls/struct/sigaction.h b/libc/calls/struct/sigaction.h index b70ca425f..657a18fa9 100644 --- a/libc/calls/struct/sigaction.h +++ b/libc/calls/struct/sigaction.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGACTION_H_ #include "libc/calls/struct/siginfo.h" #include "libc/calls/struct/sigset.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef void (*sighandler_t)(int); @@ -22,5 +21,4 @@ sighandler_t signal(int, sighandler_t); int sigaction(int, const struct sigaction *, struct sigaction *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGACTION_H_ */ diff --git a/libc/calls/struct/sigaction.internal.h b/libc/calls/struct/sigaction.internal.h index d944ad0d1..00a425d70 100644 --- a/libc/calls/struct/sigaction.internal.h +++ b/libc/calls/struct/sigaction.internal.h @@ -3,7 +3,6 @@ #include "libc/calls/struct/sigaction.h" #include "libc/calls/struct/siginfo.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sigaction_linux { @@ -73,5 +72,4 @@ const char *DescribeSigaction(char[256], int, const struct sigaction *); void _init_onntconsoleevent(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGACTION_INTERNAL_H_ */ diff --git a/libc/calls/struct/sigaltstack.h b/libc/calls/struct/sigaltstack.h index 3a7399459..fcff879c3 100644 --- a/libc/calls/struct/sigaltstack.h +++ b/libc/calls/struct/sigaltstack.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGALTSTACK_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGALTSTACK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sigaltstack { @@ -14,5 +13,4 @@ typedef struct sigaltstack stack_t; int sigaltstack(const struct sigaltstack *, struct sigaltstack *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGALTSTACK_H_ */ diff --git a/libc/calls/struct/sigaltstack.internal.h b/libc/calls/struct/sigaltstack.internal.h index 89c50099f..43c21abb9 100644 --- a/libc/calls/struct/sigaltstack.internal.h +++ b/libc/calls/struct/sigaltstack.internal.h @@ -2,12 +2,10 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGALTSTACK_INTERNAL_H_ #include "libc/calls/struct/sigaltstack.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ const char *DescribeSigaltstk(char[128], int, const struct sigaltstack *); #define DescribeSigaltstk(rc, ss) DescribeSigaltstk(alloca(128), rc, ss) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGALTSTACK_INTERNAL_H_ */ diff --git a/libc/calls/struct/siginfo-freebsd.internal.h b/libc/calls/struct/siginfo-freebsd.internal.h index 71b1fa243..5ca2770d6 100644 --- a/libc/calls/struct/siginfo-freebsd.internal.h +++ b/libc/calls/struct/siginfo-freebsd.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_FREEBSD_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_FREEBSD_H_ #include "libc/calls/struct/sigval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct siginfo_freebsd { @@ -35,5 +34,4 @@ struct siginfo_freebsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_FREEBSD_H_ */ diff --git a/libc/calls/struct/siginfo-meta.internal.h b/libc/calls/struct/siginfo-meta.internal.h index 45c751876..4fdbdf389 100644 --- a/libc/calls/struct/siginfo-meta.internal.h +++ b/libc/calls/struct/siginfo-meta.internal.h @@ -5,7 +5,6 @@ #include "libc/calls/struct/siginfo-openbsd.internal.h" #include "libc/calls/struct/siginfo-xnu.internal.h" #include "libc/calls/struct/siginfo.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ union siginfo_meta { @@ -19,5 +18,4 @@ union siginfo_meta { void __siginfo2cosmo(struct siginfo *, const union siginfo_meta *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_META_INTERNAL_H_ */ diff --git a/libc/calls/struct/siginfo-netbsd.internal.h b/libc/calls/struct/siginfo-netbsd.internal.h index e71e24f2b..92d966910 100644 --- a/libc/calls/struct/siginfo-netbsd.internal.h +++ b/libc/calls/struct/siginfo-netbsd.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_NETBSD_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_NETBSD_H_ #include "libc/calls/struct/sigval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct siginfo_netbsd { @@ -49,5 +48,4 @@ struct siginfo_netbsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_NETBSD_H_ */ diff --git a/libc/calls/struct/siginfo-openbsd.internal.h b/libc/calls/struct/siginfo-openbsd.internal.h index dbe2074a5..4cdbfc953 100644 --- a/libc/calls/struct/siginfo-openbsd.internal.h +++ b/libc/calls/struct/siginfo-openbsd.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_OPENBSD_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_OPENBSD_H_ #include "libc/calls/struct/sigval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct siginfo_openbsd { @@ -32,5 +31,4 @@ struct siginfo_openbsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_OPENBSD_H_ */ diff --git a/libc/calls/struct/siginfo-xnu.internal.h b/libc/calls/struct/siginfo-xnu.internal.h index f6f4f8b53..856e65712 100644 --- a/libc/calls/struct/siginfo-xnu.internal.h +++ b/libc/calls/struct/siginfo-xnu.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_XNU_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_XNU_H_ #include "libc/calls/struct/sigval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct siginfo_xnu { @@ -18,5 +17,4 @@ struct siginfo_xnu { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_XNU_H_ */ diff --git a/libc/calls/struct/siginfo.h b/libc/calls/struct/siginfo.h index 50e2b4302..967d6d6ed 100644 --- a/libc/calls/struct/siginfo.h +++ b/libc/calls/struct/siginfo.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_H_ #include "libc/calls/struct/sigval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct siginfo { @@ -63,5 +62,4 @@ char __is_stack_overflow(siginfo_t *, void *); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_H_ */ diff --git a/libc/calls/struct/siginfo.internal.h b/libc/calls/struct/siginfo.internal.h index 06134b9e9..99b2e4eda 100644 --- a/libc/calls/struct/siginfo.internal.h +++ b/libc/calls/struct/siginfo.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_INTERNAL_H_ #include "libc/calls/struct/siginfo.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_sigqueueinfo(int, const siginfo_t *); @@ -11,5 +10,4 @@ const char *DescribeSiginfo(char[300], int, const siginfo_t *); #define DescribeSiginfo(x, y) DescribeSiginfo(alloca(300), x, y) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGINFO_INTERNAL_H_ */ diff --git a/libc/calls/struct/sigset.h b/libc/calls/struct/sigset.h index 207560460..3d783c47a 100644 --- a/libc/calls/struct/sigset.h +++ b/libc/calls/struct/sigset.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGSET_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGSET_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef uint64_t sigset_t; @@ -20,5 +19,4 @@ int sigpending(sigset_t *); int pthread_sigmask(int, const sigset_t *, sigset_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGSET_H_ */ diff --git a/libc/calls/struct/sigset.internal.h b/libc/calls/struct/sigset.internal.h index f8a2fdea0..050071d45 100644 --- a/libc/calls/struct/sigset.internal.h +++ b/libc/calls/struct/sigset.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGSET_INTERNAL_H_ #include "libc/calls/struct/sigset.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define BLOCK_SIGNALS \ @@ -28,5 +27,4 @@ const char *DescribeSigset(char[128], int, const sigset_t *); #define DescribeSigset(rc, ss) DescribeSigset(alloca(128), rc, ss) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGSET_INTERNAL_H_ */ diff --git a/libc/calls/struct/sigval.h b/libc/calls/struct/sigval.h index fd6e2fe8f..07ae37ea6 100644 --- a/libc/calls/struct/sigval.h +++ b/libc/calls/struct/sigval.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGVAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGVAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ union sigval { @@ -11,5 +10,4 @@ union sigval { int sigqueue(int, int, const union sigval); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGVAL_H_ */ diff --git a/libc/calls/struct/sigval.internal.h b/libc/calls/struct/sigval.internal.h index ee87d1dcb..d18e42cf9 100644 --- a/libc/calls/struct/sigval.internal.h +++ b/libc/calls/struct/sigval.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGVAL_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGVAL_INTERNAL_H_ #include "libc/calls/struct/sigval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_sigqueue(int, int, const union sigval); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGVAL_INTERNAL_H_ */ diff --git a/libc/calls/struct/stat.h b/libc/calls/struct/stat.h index 117448db7..7c82dd35d 100644 --- a/libc/calls/struct/stat.h +++ b/libc/calls/struct/stat.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_STAT_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_STAT_H_ #include "libc/calls/struct/timespec.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct stat { /* cosmo abi */ @@ -29,5 +28,4 @@ int fstat(int, struct stat *); int fstatat(int, const char *, struct stat *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STAT_H_ */ diff --git a/libc/calls/struct/stat.internal.h b/libc/calls/struct/stat.internal.h index 2d5f51dfb..5d1c9fed6 100644 --- a/libc/calls/struct/stat.internal.h +++ b/libc/calls/struct/stat.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_STAT_INTERNAL_H_ #include "libc/calls/struct/stat.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_fstat(int, struct stat *); @@ -18,5 +17,4 @@ const char *DescribeStat(char[300], int, const struct stat *); #define DescribeStat(rc, st) DescribeStat(alloca(300), rc, st) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STAT_INTERNAL_H_ */ diff --git a/libc/calls/struct/statfs-freebsd.internal.h b/libc/calls/struct/statfs-freebsd.internal.h index 050b7bfa8..8760c221a 100644 --- a/libc/calls/struct/statfs-freebsd.internal.h +++ b/libc/calls/struct/statfs-freebsd.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_FREEBSD_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_FREEBSD_INTERNAL_H_ #include "libc/calls/struct/fsid.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct statfs_freebsd { @@ -30,5 +29,4 @@ struct statfs_freebsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_FREEBSD_INTERNAL_H_ */ diff --git a/libc/calls/struct/statfs-linux.internal.h b/libc/calls/struct/statfs-linux.internal.h index 3e14247d1..48121d58c 100644 --- a/libc/calls/struct/statfs-linux.internal.h +++ b/libc/calls/struct/statfs-linux.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_LINUX_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_LINUX_INTERNAL_H_ #include "libc/calls/struct/fsid.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct statfs_linux { @@ -20,5 +19,4 @@ struct statfs_linux { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_LINUX_INTERNAL_H_ */ diff --git a/libc/calls/struct/statfs-meta.internal.h b/libc/calls/struct/statfs-meta.internal.h index 26d767570..21b0644c3 100644 --- a/libc/calls/struct/statfs-meta.internal.h +++ b/libc/calls/struct/statfs-meta.internal.h @@ -6,7 +6,6 @@ #include "libc/calls/struct/statfs-openbsd.internal.h" #include "libc/calls/struct/statfs-xnu.internal.h" #include "libc/calls/struct/statfs.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ union statfs_meta { @@ -20,5 +19,4 @@ union statfs_meta { void statfs2cosmo(struct statfs *, const union statfs_meta *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_META_INTERNAL_H_ */ diff --git a/libc/calls/struct/statfs-netbsd.internal.h b/libc/calls/struct/statfs-netbsd.internal.h index 7e8e3cf0f..0731bc52b 100644 --- a/libc/calls/struct/statfs-netbsd.internal.h +++ b/libc/calls/struct/statfs-netbsd.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_NETBSD_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_NETBSD_H_ #include "libc/calls/struct/fsid.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct statfs_netbsd { @@ -26,5 +25,4 @@ struct statfs_netbsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_NETBSD_H_ */ diff --git a/libc/calls/struct/statfs-openbsd.internal.h b/libc/calls/struct/statfs-openbsd.internal.h index e1795f48c..f20a207c5 100644 --- a/libc/calls/struct/statfs-openbsd.internal.h +++ b/libc/calls/struct/statfs-openbsd.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_OPENBSD_H_ #include "libc/calls/struct/fsid.h" #include "libc/sock/struct/sockaddr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct xucred_openbsd { @@ -132,5 +131,4 @@ struct statfs_openbsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_OPENBSD_H_ */ diff --git a/libc/calls/struct/statfs-xnu.internal.h b/libc/calls/struct/statfs-xnu.internal.h index eaf3e922f..3401cac94 100644 --- a/libc/calls/struct/statfs-xnu.internal.h +++ b/libc/calls/struct/statfs-xnu.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_XNU_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_XNU_INTERNAL_H_ #include "libc/calls/struct/fsid.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct statfs_xnu { @@ -25,5 +24,4 @@ struct statfs_xnu { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_XNU_INTERNAL_H_ */ diff --git a/libc/calls/struct/statfs.h b/libc/calls/struct/statfs.h index 1e7c9a9ed..2c2e648fc 100644 --- a/libc/calls/struct/statfs.h +++ b/libc/calls/struct/statfs.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_H_ #include "libc/calls/struct/fsid.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct statfs { /* cosmo abi */ @@ -25,5 +24,4 @@ int statfs(const char *, struct statfs *); int fstatfs(int, struct statfs *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_H_ */ diff --git a/libc/calls/struct/statfs.internal.h b/libc/calls/struct/statfs.internal.h index bba93de72..ab3919628 100644 --- a/libc/calls/struct/statfs.internal.h +++ b/libc/calls/struct/statfs.internal.h @@ -4,7 +4,6 @@ #include "libc/calls/struct/statfs.h" #include "libc/calls/struct/statvfs.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_statfs(const char *, union statfs_meta *); @@ -17,5 +16,4 @@ const char *DescribeStatfs(char[300], int, const struct statfs *); #define DescribeStatfs(rc, sf) DescribeStatfs(alloca(300), rc, sf) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATFS_INTERNAL_H_ */ diff --git a/libc/calls/struct/statvfs.h b/libc/calls/struct/statvfs.h index 9c75266c6..e1e101a12 100644 --- a/libc/calls/struct/statvfs.h +++ b/libc/calls/struct/statvfs.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_STATVFS_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_STATVFS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct statvfs { @@ -21,5 +20,4 @@ int statvfs(const char *, struct statvfs *); int fstatvfs(int, struct statvfs *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_STATVFS_H_ */ diff --git a/libc/calls/struct/sysinfo.h b/libc/calls/struct/sysinfo.h index 3df62822b..f839f81c2 100644 --- a/libc/calls/struct/sysinfo.h +++ b/libc/calls/struct/sysinfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SYSINFO_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SYSINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sysinfo { @@ -23,5 +22,4 @@ struct sysinfo { int sysinfo(struct sysinfo *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SYSINFO_H_ */ diff --git a/libc/calls/struct/sysinfo.internal.h b/libc/calls/struct/sysinfo.internal.h index b4d992db4..f77f2010b 100644 --- a/libc/calls/struct/sysinfo.internal.h +++ b/libc/calls/struct/sysinfo.internal.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SYSINFO_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SYSINFO_INTERNAL_H_ #include "libc/calls/struct/sysinfo.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_sysinfo(struct sysinfo *); int sys_sysinfo_nt(struct sysinfo *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SYSINFO_INTERNAL_H_ */ diff --git a/libc/calls/struct/termios.h b/libc/calls/struct/termios.h index 66cf7c2f5..a51d34c4b 100644 --- a/libc/calls/struct/termios.h +++ b/libc/calls/struct/termios.h @@ -3,7 +3,6 @@ #define NCCS 20 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct termios { /* cosmo abi */ @@ -17,5 +16,4 @@ struct termios { /* cosmo abi */ }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_TERMIOS_H_ */ diff --git a/libc/calls/struct/termios.internal.h b/libc/calls/struct/termios.internal.h index a8e4e4f91..c116d4d04 100644 --- a/libc/calls/struct/termios.internal.h +++ b/libc/calls/struct/termios.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_TERMIOS_INTERNAL_H_ #include "libc/calls/struct/termios.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ const char *DescribeTermios(char[1024], ssize_t, const struct termios *); @@ -10,5 +9,4 @@ const char *DescribeTermios(char[1024], ssize_t, const struct termios *); #define DescribeTermios(rc, tio) DescribeTermios(alloca(1024), rc, tio) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_TERMIOS_INTERNAL_H_ */ diff --git a/libc/calls/struct/timespec.internal.h b/libc/calls/struct/timespec.internal.h index 3628fff8e..fc15a2061 100644 --- a/libc/calls/struct/timespec.internal.h +++ b/libc/calls/struct/timespec.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_TIMESPEC_INTERNAL_H_ #include "libc/calls/struct/timespec.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* clang-format off */ @@ -31,5 +30,4 @@ const char *DescribeTimespec(char[45], int, const struct timespec *); #define DescribeTimespec(rc, ts) DescribeTimespec(alloca(45), rc, ts) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_TIMESPEC_INTERNAL_H_ */ diff --git a/libc/calls/struct/timeval.h b/libc/calls/struct/timeval.h index 85f41e222..e2004b7e6 100644 --- a/libc/calls/struct/timeval.h +++ b/libc/calls/struct/timeval.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_TIMEVAL_H_ #include "libc/calls/struct/timespec.h" #include "libc/time/struct/timezone.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct timeval { @@ -71,5 +70,4 @@ static inline int timeval_isvalid(struct timeval __tv) { #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_TIMEVAL_H_ */ diff --git a/libc/calls/struct/timeval.internal.h b/libc/calls/struct/timeval.internal.h index c68b65283..d3eca91bc 100644 --- a/libc/calls/struct/timeval.internal.h +++ b/libc/calls/struct/timeval.internal.h @@ -3,7 +3,6 @@ #include "libc/calls/struct/timeval.h" #include "libc/mem/alloca.h" #include "libc/time/struct/timezone.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_settimeofday(const struct timeval *, const struct timezone *); @@ -16,5 +15,4 @@ const char *DescribeTimeval(char[45], int, const struct timeval *); #define DescribeTimeval(rc, ts) DescribeTimeval(alloca(45), rc, ts) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_TIMEVAL_INTERNAL_H_ */ diff --git a/libc/calls/struct/tms.h b/libc/calls/struct/tms.h index 17bd801ff..a6af1392b 100644 --- a/libc/calls/struct/tms.h +++ b/libc/calls/struct/tms.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_TMS_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_TMS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct tms { @@ -13,5 +12,4 @@ struct tms { long times(struct tms *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_TMS_H_ */ diff --git a/libc/calls/struct/ucontext-freebsd.internal.h b/libc/calls/struct/ucontext-freebsd.internal.h index f0b6f07e6..facb16fa6 100644 --- a/libc/calls/struct/ucontext-freebsd.internal.h +++ b/libc/calls/struct/ucontext-freebsd.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_FREEBSD_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_FREEBSD_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct stack_freebsd { @@ -60,5 +59,4 @@ struct ucontext_freebsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_FREEBSD_INTERNAL_H_ */ diff --git a/libc/calls/struct/ucontext-netbsd.internal.h b/libc/calls/struct/ucontext-netbsd.internal.h index 53c9392d8..94751db1c 100644 --- a/libc/calls/struct/ucontext-netbsd.internal.h +++ b/libc/calls/struct/ucontext-netbsd.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_NETBSD_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_NETBSD_INTERNAL_H_ #include "libc/calls/ucontext.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ // clang-format off @@ -83,5 +82,4 @@ struct ucontext_netbsd { #endif /* __x86_64__ */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_NETBSD_INTERNAL_H_ */ diff --git a/libc/calls/struct/ucontext-openbsd.internal.h b/libc/calls/struct/ucontext-openbsd.internal.h index 4cbb7d17e..929d8767d 100644 --- a/libc/calls/struct/ucontext-openbsd.internal.h +++ b/libc/calls/struct/ucontext-openbsd.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_OPENBSD_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_OPENBSD_INTERNAL_H_ #include "libc/calls/ucontext.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct ucontext_openbsd { @@ -38,5 +37,4 @@ struct ucontext_openbsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_OPENBSD_INTERNAL_H_ */ diff --git a/libc/calls/struct/ucontext.internal.h b/libc/calls/struct/ucontext.internal.h index 613fdfb1f..9122af24a 100644 --- a/libc/calls/struct/ucontext.internal.h +++ b/libc/calls/struct/ucontext.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_INTERNAL_H_ #include "libc/calls/ucontext.h" #include "libc/nt/struct/context.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #ifdef __x86_64__ @@ -33,5 +32,4 @@ void _ntcontext2linux(struct ucontext *, const struct NtContext *); void _ntlinux2context(struct NtContext *, const ucontext_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_UCONTEXT_INTERNAL_H_ */ diff --git a/libc/calls/struct/user_regs_struct.h b/libc/calls/struct/user_regs_struct.h index 7caad2a7a..5cbe63f5c 100644 --- a/libc/calls/struct/user_regs_struct.h +++ b/libc/calls/struct/user_regs_struct.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_USER_REGS_STRUCT_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_USER_REGS_STRUCT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -69,5 +68,4 @@ struct useregs_struct_freebsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_USER_REGS_STRUCT_H_ */ diff --git a/libc/calls/struct/utsname-linux.internal.h b/libc/calls/struct/utsname-linux.internal.h index 3d8dd04a4..119b96a77 100644 --- a/libc/calls/struct/utsname-linux.internal.h +++ b/libc/calls/struct/utsname-linux.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_UTSNAME_LINUX_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_UTSNAME_LINUX_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct utsname_linux { @@ -15,5 +14,4 @@ struct utsname_linux { int sys_uname_linux(struct utsname_linux *) asm("sys_uname"); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_UTSNAME_LINUX_INTERNAL_H_ */ diff --git a/libc/calls/struct/utsname.h b/libc/calls/struct/utsname.h index 07c055f09..c2e1094d1 100644 --- a/libc/calls/struct/utsname.h +++ b/libc/calls/struct/utsname.h @@ -3,7 +3,6 @@ #define SYS_NMLN 150 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct utsname { /* cosmo abi */ @@ -18,5 +17,4 @@ struct utsname { /* cosmo abi */ int uname(struct utsname *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_UTSNAME_H_ */ diff --git a/libc/calls/struct/winsize.h b/libc/calls/struct/winsize.h index 328b25a63..db23f97b2 100644 --- a/libc/calls/struct/winsize.h +++ b/libc/calls/struct/winsize.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_WINSIZE_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_WINSIZE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct winsize { @@ -11,5 +10,4 @@ struct winsize { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_WINSIZE_H_ */ diff --git a/libc/calls/struct/winsize.internal.h b/libc/calls/struct/winsize.internal.h index 7647be2b4..8e1d5dbec 100644 --- a/libc/calls/struct/winsize.internal.h +++ b/libc/calls/struct/winsize.internal.h @@ -3,7 +3,6 @@ #include "libc/calls/struct/fd.internal.h" #include "libc/calls/struct/winsize.h" #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int tcgetwinsize_nt(int, struct winsize *); @@ -11,5 +10,4 @@ const char *DescribeWinsize(char[64], int, const struct winsize *); #define DescribeWinsize(rc, ws) DescribeWinsize(alloca(64), rc, ws) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_WINSIZE_INTERNAL_H_ */ diff --git a/libc/calls/syscall-nt.internal.h b/libc/calls/syscall-nt.internal.h index 83aec6bf0..70fa3b41d 100644 --- a/libc/calls/syscall-nt.internal.h +++ b/libc/calls/syscall-nt.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_SYSCALL_NT_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_SYSCALL_NT_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool32 sys_isatty(int); @@ -41,5 +40,4 @@ ssize_t sys_read_nt_impl(int, void *, size_t, int64_t); ssize_t sys_readlinkat_nt(int, const char *, char *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SYSCALL_NT_INTERNAL_H_ */ diff --git a/libc/calls/syscall-sysv.internal.h b/libc/calls/syscall-sysv.internal.h index 609ca0094..e976e42ed 100644 --- a/libc/calls/syscall-sysv.internal.h +++ b/libc/calls/syscall-sysv.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_SYSCALL_SYSV_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_SYSCALL_SYSV_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define i32 int32_t #define i64 int64_t @@ -146,5 +145,4 @@ void sys_exit(i32); #undef u32 #undef u64 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SYSCALL_SYSV_INTERNAL_H_ */ diff --git a/libc/calls/syscall_support-nt.internal.h b/libc/calls/syscall_support-nt.internal.h index 657344216..7d7bab43c 100644 --- a/libc/calls/syscall_support-nt.internal.h +++ b/libc/calls/syscall_support-nt.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_NT_INTERNAL_H_ #include "libc/limits.h" #include "libc/nt/struct/overlapped.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool isdirectory_nt(const char *); @@ -29,5 +28,4 @@ ssize_t sys_readwrite_nt(int, void *, size_t, ssize_t, int64_t, uint64_t, struct NtOverlapped *)); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_NT_INTERNAL_H_ */ diff --git a/libc/calls/syscall_support-sysv.internal.h b/libc/calls/syscall_support-sysv.internal.h index ebf3103d7..2eca70985 100644 --- a/libc/calls/syscall_support-sysv.internal.h +++ b/libc/calls/syscall_support-sysv.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_SYSV_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_SYSV_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § syscalls » system five » structless support ─╬─│┼ @@ -36,5 +35,4 @@ void cosmo2flock(uintptr_t); void flock2cosmo(uintptr_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_SYSV_INTERNAL_H_ */ diff --git a/libc/calls/termios.h b/libc/calls/termios.h index 9586bf09e..834e3f26e 100644 --- a/libc/calls/termios.h +++ b/libc/calls/termios.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_TERMIOS_H_ #include "libc/calls/struct/termios.h" #include "libc/calls/struct/winsize.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ @@ -41,5 +40,4 @@ int tcsetwinsize(int, const struct winsize *); int tcgetwinsize(int, struct winsize *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_TERMIOS_H_ */ diff --git a/libc/calls/typedef/u.h b/libc/calls/typedef/u.h index 8d35f7288..a5b7b8923 100644 --- a/libc/calls/typedef/u.h +++ b/libc/calls/typedef/u.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_TYPEDEF_U_H_ #define COSMOPOLITAN_LIBC_CALLS_TYPEDEF_U_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef unsigned char u_int8_t; @@ -15,5 +14,4 @@ typedef long long quad_t; typedef unsigned long long u_quad_t; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_TYPEDEF_U_H_ */ diff --git a/libc/calls/ucontext.h b/libc/calls/ucontext.h index 9a5d57491..4c755f3b0 100644 --- a/libc/calls/ucontext.h +++ b/libc/calls/ucontext.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_CALLS_UCONTEXT_H_ #include "libc/calls/struct/sigaltstack.h" #include "libc/calls/struct/sigset.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #ifdef __x86_64__ @@ -135,5 +134,4 @@ void makecontext(ucontext_t *, void (*)(), int, ...) dontthrow nocallback; void __sig_restore(const ucontext_t *) wontreturn; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_UCONTEXT_H_ */ diff --git a/libc/calls/vdsofunc.greg.c b/libc/calls/vdsofunc.greg.c index 7f669a962..4f176092a 100644 --- a/libc/calls/vdsofunc.greg.c +++ b/libc/calls/vdsofunc.greg.c @@ -26,7 +26,6 @@ #include "libc/elf/struct/sym.h" #include "libc/elf/struct/verdaux.h" #include "libc/elf/struct/verdef.h" -#include "libc/intrin/bits.h" #include "libc/intrin/getauxval.internal.h" #include "libc/intrin/strace.internal.h" #include "libc/runtime/runtime.h" diff --git a/libc/calls/weirdtypes.h b/libc/calls/weirdtypes.h index 997475a4e..190c795b0 100644 --- a/libc/calls/weirdtypes.h +++ b/libc/calls/weirdtypes.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_WEIRDTYPES_H_ #define COSMOPOLITAN_LIBC_CALLS_WEIRDTYPES_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * @fileoverview Types we'd prefer hadn't been invented. @@ -88,5 +87,4 @@ typedef uint32_t nlink_t; /* uint16_t on xnu */ #define versionsort64 versionsort #endif -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_WEIRDTYPES_H_ */ diff --git a/libc/calls/wincrash.internal.h b/libc/calls/wincrash.internal.h index 15ce3e3b2..dd53e14f3 100644 --- a/libc/calls/wincrash.internal.h +++ b/libc/calls/wincrash.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_WINCRASH_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_WINCRASH_INTERNAL_H_ #include "libc/nt/struct/ntexceptionpointers.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ unsigned __wincrash(struct NtExceptionPointers *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_WINCRASH_INTERNAL_H_ */ diff --git a/libc/calls/winexec.c b/libc/calls/winexec.c index 5cd1d5141..01ee1748e 100644 --- a/libc/calls/winexec.c +++ b/libc/calls/winexec.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/calls/struct/sigset.internal.h" -#include "libc/intrin/bits.h" #include "libc/nt/errors.h" #include "libc/nt/events.h" #include "libc/nt/files.h" diff --git a/libc/complex.h b/libc/complex.h index 86b6eec4e..e7fb8ad95 100644 --- a/libc/complex.h +++ b/libc/complex.h @@ -1,6 +1,5 @@ #ifndef _COMPLEX_H #define _COMPLEX_H -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if __STDC_VERSION__ + 0 >= 201112 && !defined(__STDC_NO_COMPLEX__) @@ -117,5 +116,4 @@ complex long double cpowl(complex long double, complex long double); #endif /* C11 */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _COMPLEX_H */ diff --git a/libc/cosmo.h b/libc/cosmo.h index a35324e06..60f4f4112 100644 --- a/libc/cosmo.h +++ b/libc/cosmo.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_COSMO_H_ #define COSMOPOLITAN_LIBC_COSMO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ errno_t cosmo_once(_Atomic(uint32_t) *, void (*)(void)); int systemvpe(const char *, char *const[], char *const[]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_COSMO_H_ */ diff --git a/libc/crt/crt.S b/libc/crt/crt.S index 350fc9f8e..e83a05cbe 100644 --- a/libc/crt/crt.S +++ b/libc/crt/crt.S @@ -19,7 +19,6 @@ #include "libc/dce.h" #include "libc/macros.internal.h" #include "libc/notice.inc" -#include "libc/runtime/internal.h" .section .start,"ax",@progbits #if SupportsXnu() && defined(__x86_64__) diff --git a/libc/dlopen/dlfcn.h b/libc/dlopen/dlfcn.h index 83cbd1241..cf81c110b 100644 --- a/libc/dlopen/dlfcn.h +++ b/libc/dlopen/dlfcn.h @@ -6,7 +6,6 @@ #define RTLD_NOW 2 #define RTLD_GLOBAL 256 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define RTLD_NEXT ((void *)-1) @@ -27,5 +26,4 @@ int cosmo_dl_iterate_phdr(int (*)(void *, size_t, void *), void *); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DLFCN_H_ */ diff --git a/libc/dlopen/dlopen.c b/libc/dlopen/dlopen.c index e063985f5..f5e6cf112 100644 --- a/libc/dlopen/dlopen.c +++ b/libc/dlopen/dlopen.c @@ -36,7 +36,7 @@ #include "libc/errno.h" #include "libc/fmt/itoa.h" #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/strace.internal.h" #include "libc/limits.h" diff --git a/libc/dns/consts.h b/libc/dns/consts.h index 940d9ceaf..03136ac79 100644 --- a/libc/dns/consts.h +++ b/libc/dns/consts.h @@ -12,10 +12,8 @@ #define DNS_CLASS_IN 1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define kMinSockaddr4Size \ (offsetof(struct sockaddr_in, sin_addr) + sizeof(struct in_addr)) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DNS_CONSTS_H_ */ diff --git a/libc/dns/dns.h b/libc/dns/dns.h index 5c7a4ca08..0332b3077 100644 --- a/libc/dns/dns.h +++ b/libc/dns/dns.h @@ -45,7 +45,6 @@ #define NI_MAXSERV 32 #define NI_MAXHOST 1025 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct addrinfo { @@ -77,5 +76,4 @@ int ResolveDnsReverse(const struct ResolvConf *, int, const char *, char *, struct addrinfo *newaddrinfo(uint16_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DNS_DNS_H_ */ diff --git a/libc/dns/dnsheader.c b/libc/dns/dnsheader.c index 2d4fe0ef3..e601ed4eb 100644 --- a/libc/dns/dnsheader.c +++ b/libc/dns/dnsheader.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dns/dnsheader.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/dns/dnsheader.h b/libc/dns/dnsheader.h index d517ddc04..15318b9b9 100644 --- a/libc/dns/dnsheader.h +++ b/libc/dns/dnsheader.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_DNS_DNSHEADER_H_ #define COSMOPOLITAN_LIBC_DNS_DNSHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct DnsHeader { @@ -17,5 +16,4 @@ void SerializeDnsHeader(uint8_t[restrict 12], const struct DnsHeader *); void DeserializeDnsHeader(struct DnsHeader *, const uint8_t[restrict 12]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DNS_DNSHEADER_H_ */ diff --git a/libc/dns/dnsquestion.h b/libc/dns/dnsquestion.h index 920622ab5..0047747cb 100644 --- a/libc/dns/dnsquestion.h +++ b/libc/dns/dnsquestion.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_DNS_DNSQUESTION_H_ #define COSMOPOLITAN_LIBC_DNS_DNSQUESTION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct DnsQuestion { @@ -12,5 +11,4 @@ struct DnsQuestion { int SerializeDnsQuestion(uint8_t *, size_t, const struct DnsQuestion *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DNS_DNSQUESTION_H_ */ diff --git a/libc/dns/ent.h b/libc/dns/ent.h index 269e46feb..530ebb5c6 100644 --- a/libc/dns/ent.h +++ b/libc/dns/ent.h @@ -8,7 +8,6 @@ #define NO_DATA 4 #define NO_ADDRESS NO_DATA -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct netent { @@ -69,5 +68,4 @@ void setservent(int); void endservent(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DNS_ENT_H_ */ diff --git a/libc/dns/gethoststxt.c b/libc/dns/gethoststxt.c index d61d650ae..1b3e4ff27 100644 --- a/libc/dns/gethoststxt.c +++ b/libc/dns/gethoststxt.c @@ -21,7 +21,6 @@ #include "libc/dce.h" #include "libc/dns/hoststxt.h" #include "libc/dns/servicestxt.h" -#include "libc/intrin/bits.h" #include "libc/intrin/pushpop.internal.h" #include "libc/intrin/safemacros.internal.h" #include "libc/macros.internal.h" diff --git a/libc/dns/hoststxt.h b/libc/dns/hoststxt.h index 6e41c69e0..f413fea51 100644 --- a/libc/dns/hoststxt.h +++ b/libc/dns/hoststxt.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_DNS_HOSTSTXT_H_ #include "libc/sock/struct/sockaddr.h" #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct HostsTxtEntry { @@ -36,5 +35,4 @@ int ResolveHostsReverse(const struct HostsTxt *, int, const uint8_t *, char *, size_t) paramsnonnull((1, 3)); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DNS_HOSTSTXT_H_ */ diff --git a/libc/dns/prototxt.h b/libc/dns/prototxt.h index 21e15ebe9..8746f044d 100644 --- a/libc/dns/prototxt.h +++ b/libc/dns/prototxt.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_DNS_PROTOTXT_H_ #include "libc/sock/sock.h" #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ const char *GetProtocolsTxtPath(char *, size_t); @@ -15,5 +14,4 @@ int LookupProtoByName(const char *, char *, size_t, const char *) /* TODO: implement like struct HostsTxt? */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DNS_PROTOTXT_H_ */ diff --git a/libc/dns/resolvconf.h b/libc/dns/resolvconf.h index 2ce3be2a2..46a24064f 100644 --- a/libc/dns/resolvconf.h +++ b/libc/dns/resolvconf.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_DNS_RESOLVCONF_H_ #include "libc/sock/sock.h" #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Nameservers { @@ -20,5 +19,4 @@ void FreeResolvConf(struct ResolvConf **) paramsnonnull(); int GetNtNameServers(struct ResolvConf *) paramsnonnull(); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DNS_RESOLVCONF_H_ */ diff --git a/libc/dns/resolvedns.c b/libc/dns/resolvedns.c index 9c5c10181..5baf4fa30 100644 --- a/libc/dns/resolvedns.c +++ b/libc/dns/resolvedns.c @@ -22,7 +22,7 @@ #include "libc/dns/dnsheader.h" #include "libc/dns/dnsquestion.h" #include "libc/dns/resolvconf.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/sock/internal.h" diff --git a/libc/dns/resolvednsreverse.c b/libc/dns/resolvednsreverse.c index 44dd30544..9154ea3fd 100644 --- a/libc/dns/resolvednsreverse.c +++ b/libc/dns/resolvednsreverse.c @@ -30,7 +30,7 @@ #include "libc/dns/dnsheader.h" #include "libc/dns/dnsquestion.h" #include "libc/dns/resolvconf.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" diff --git a/libc/dns/resolvehostsreverse.c b/libc/dns/resolvehostsreverse.c index cdd76cf02..2cca512d4 100644 --- a/libc/dns/resolvehostsreverse.c +++ b/libc/dns/resolvehostsreverse.c @@ -19,7 +19,7 @@ #include "libc/dns/consts.h" #include "libc/dns/dns.h" #include "libc/dns/hoststxt.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/mem/alg.h" #include "libc/sock/sock.h" #include "libc/str/str.h" diff --git a/libc/dns/servicestxt.h b/libc/dns/servicestxt.h index 8e29133fa..901c8f498 100644 --- a/libc/dns/servicestxt.h +++ b/libc/dns/servicestxt.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_DNS_SERVICESTXT_H_ #include "libc/sock/sock.h" #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *GetSystemDirectoryPath(char *, size_t, const char *); @@ -15,5 +14,4 @@ const char *GetServicesTxtPath(char *, size_t); /* TODO: implement like struct HostsTxt? */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_DNS_SERVICESTXT_H_ */ diff --git a/libc/elf/elf.h b/libc/elf/elf.h index 9aea545ea..1f2432164 100644 --- a/libc/elf/elf.h +++ b/libc/elf/elf.h @@ -4,7 +4,6 @@ #include "libc/elf/struct/phdr.h" #include "libc/elf/struct/shdr.h" #include "libc/elf/struct/sym.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ @@ -28,5 +27,4 @@ char *GetElfSectionNameStringTable(const Elf64_Ehdr *, size_t); COSMOPOLITAN_C_END_ #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_H_ */ diff --git a/libc/elf/iself64binary.c b/libc/elf/iself64binary.c index 8464cb070..9b6930516 100644 --- a/libc/elf/iself64binary.c +++ b/libc/elf/iself64binary.c @@ -19,7 +19,7 @@ #include "libc/elf/def.h" #include "libc/elf/elf.h" #include "libc/elf/struct/ehdr.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" /** * Returns true if `elf` is a 64-bit elf executable. diff --git a/libc/elf/struct/auxv.h b/libc/elf/struct/auxv.h index a093e1d89..b366437c4 100644 --- a/libc/elf/struct/auxv.h +++ b/libc/elf/struct/auxv.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_AUXV_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_AUXV_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_auxv_t { uint64_t a_type; @@ -9,5 +8,4 @@ typedef struct Elf64_auxv_t { } a_un; } Elf64_auxv_t; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_AUXV_H_ */ diff --git a/libc/elf/struct/chdr.h b/libc/elf/struct/chdr.h index 5471a43e1..b9ea18ebf 100644 --- a/libc/elf/struct/chdr.h +++ b/libc/elf/struct/chdr.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_CHDR_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_CHDR_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Chdr { Elf64_Word ch_type; @@ -10,5 +9,4 @@ typedef struct Elf64_Chdr { Elf64_Xword ch_addralign; } Elf64_Chdr; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_CHDR_H_ */ diff --git a/libc/elf/struct/dyn.h b/libc/elf/struct/dyn.h index 12158a31c..5bf2e30d1 100644 --- a/libc/elf/struct/dyn.h +++ b/libc/elf/struct/dyn.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_DYN_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_DYN_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Dyn { Elf64_Sxword d_tag; @@ -11,5 +10,4 @@ typedef struct Elf64_Dyn { } d_un; } Elf64_Dyn; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_DYN_H_ */ diff --git a/libc/elf/struct/ehdr.h b/libc/elf/struct/ehdr.h index 73f023348..e53d888c0 100644 --- a/libc/elf/struct/ehdr.h +++ b/libc/elf/struct/ehdr.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_EHDR_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_EHDR_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /* * ELF header. @@ -159,5 +158,4 @@ typedef struct Elf64_Ehdr { } Elf64_Ehdr; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_EHDR_H_ */ diff --git a/libc/elf/struct/lib.h b/libc/elf/struct/lib.h index c77c613eb..a0516bb17 100644 --- a/libc/elf/struct/lib.h +++ b/libc/elf/struct/lib.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_LIB_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_LIB_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Lib { Elf64_Word l_name; @@ -11,5 +10,4 @@ typedef struct Elf64_Lib { Elf64_Word l_flags; } Elf64_Lib; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_LIB_H_ */ diff --git a/libc/elf/struct/move.h b/libc/elf/struct/move.h index 49d92e676..5dbb2faf1 100644 --- a/libc/elf/struct/move.h +++ b/libc/elf/struct/move.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_MOVE_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_MOVE_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Move { Elf64_Xword m_value; @@ -11,5 +10,4 @@ typedef struct Elf64_Move { Elf64_Half m_stride; } Elf64_Move; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_MOVE_H_ */ diff --git a/libc/elf/struct/nhdr.h b/libc/elf/struct/nhdr.h index 07e9099d8..f40f8a7ca 100644 --- a/libc/elf/struct/nhdr.h +++ b/libc/elf/struct/nhdr.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_NHDR_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_NHDR_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Nhdr { Elf64_Word n_namesz; @@ -9,5 +8,4 @@ typedef struct Elf64_Nhdr { Elf64_Word n_type; } Elf64_Nhdr; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_NHDR_H_ */ diff --git a/libc/elf/struct/phdr.h b/libc/elf/struct/phdr.h index f1f95234d..893e9fa66 100644 --- a/libc/elf/struct/phdr.h +++ b/libc/elf/struct/phdr.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_PHDR_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_PHDR_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Phdr { Elf64_Word p_type; @@ -14,5 +13,4 @@ typedef struct Elf64_Phdr { Elf64_Xword p_align; } Elf64_Phdr; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_PHDR_H_ */ diff --git a/libc/elf/struct/rel.h b/libc/elf/struct/rel.h index 725d27bcc..aaa8f19bf 100644 --- a/libc/elf/struct/rel.h +++ b/libc/elf/struct/rel.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_REL_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_REL_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /* * ELF relocation. @@ -50,5 +49,4 @@ typedef struct Elf64_Rel { } Elf64_Rel; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_REL_H_ */ diff --git a/libc/elf/struct/rela.h b/libc/elf/struct/rela.h index 6d8f0e2fa..311a7535f 100644 --- a/libc/elf/struct/rela.h +++ b/libc/elf/struct/rela.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_RELA_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_RELA_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /* * ELF relocation w/ explicit addend. @@ -62,5 +61,4 @@ typedef struct Elf64_Rela { } Elf64_Rela; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_RELA_H_ */ diff --git a/libc/elf/struct/shdr.h b/libc/elf/struct/shdr.h index 23de1b9b6..71b03632c 100644 --- a/libc/elf/struct/shdr.h +++ b/libc/elf/struct/shdr.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_SHDR_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_SHDR_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Section header. @@ -48,5 +47,4 @@ typedef struct Elf64_Shdr { } Elf64_Shdr; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_SHDR_H_ */ diff --git a/libc/elf/struct/sym.h b/libc/elf/struct/sym.h index 1392a43de..5e1ef1647 100644 --- a/libc/elf/struct/sym.h +++ b/libc/elf/struct/sym.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_SYM_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_SYM_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Sym { @@ -92,5 +91,4 @@ typedef struct Elf64_Sym { } Elf64_Sym; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_SYM_H_ */ diff --git a/libc/elf/struct/syminfo.h b/libc/elf/struct/syminfo.h index 6b83ca116..3d7d247da 100644 --- a/libc/elf/struct/syminfo.h +++ b/libc/elf/struct/syminfo.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_SYMINFO_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_SYMINFO_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Syminfo { Elf64_Half si_boundto; Elf64_Half si_flags; } Elf64_Syminfo; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_SYMINFO_H_ */ diff --git a/libc/elf/struct/verdaux.h b/libc/elf/struct/verdaux.h index 82ba63a00..6b023a2aa 100644 --- a/libc/elf/struct/verdaux.h +++ b/libc/elf/struct/verdaux.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_VERDAUX_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_VERDAUX_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Verdaux { Elf64_Word vda_name; Elf64_Word vda_next; } Elf64_Verdaux; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_VERDAUX_H_ */ diff --git a/libc/elf/struct/verdef.h b/libc/elf/struct/verdef.h index ac332d7c4..0eb8545ff 100644 --- a/libc/elf/struct/verdef.h +++ b/libc/elf/struct/verdef.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_VERDEF_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_VERDEF_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Verdef { Elf64_Half vd_version; @@ -13,5 +12,4 @@ typedef struct Elf64_Verdef { Elf64_Word vd_next; } Elf64_Verdef; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_VERDEF_H_ */ diff --git a/libc/elf/struct/vernaux.h b/libc/elf/struct/vernaux.h index 40aade7d3..bdea9b39c 100644 --- a/libc/elf/struct/vernaux.h +++ b/libc/elf/struct/vernaux.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_VERNAUX_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_VERNAUX_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Vernaux { Elf64_Word vna_hash; @@ -11,5 +10,4 @@ typedef struct Elf64_Vernaux { Elf64_Word vna_next; } Elf64_Vernaux; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_VERNAUX_H_ */ diff --git a/libc/elf/struct/verneed.h b/libc/elf/struct/verneed.h index fe04b7bf2..83d66142d 100644 --- a/libc/elf/struct/verneed.h +++ b/libc/elf/struct/verneed.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ELF_STRUCT_VERNEED_H_ #define COSMOPOLITAN_LIBC_ELF_STRUCT_VERNEED_H_ #include "libc/elf/scalar.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef struct Elf64_Verneed { Elf64_Half vn_version; @@ -11,5 +10,4 @@ typedef struct Elf64_Verneed { Elf64_Word vn_next; } Elf64_Verneed; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_STRUCT_VERNEED_H_ */ diff --git a/libc/elf/tinyelf.internal.h b/libc/elf/tinyelf.internal.h index 23e9dc52e..ca00d3ce7 100644 --- a/libc/elf/tinyelf.internal.h +++ b/libc/elf/tinyelf.internal.h @@ -5,10 +5,9 @@ #include "libc/elf/struct/phdr.h" #include "libc/elf/struct/shdr.h" #include "libc/elf/struct/sym.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/log/libfatal.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define GetStr(tab, rva) ((char *)(tab) + (rva)) @@ -88,5 +87,4 @@ static inline bool GetElfSymbolValue(const Elf64_Ehdr *ehdr, const char *name, } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ELF_TINYELF_INTERNAL_H_ */ diff --git a/libc/errno.h b/libc/errno.h index cf84106f9..01dc1bde4 100644 --- a/libc/errno.h +++ b/libc/errno.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_ERRNO_H_ #define COSMOPOLITAN_LIBC_ERRNO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -667,5 +666,4 @@ extern char *program_invocation_name; #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ERRNO_H_ */ diff --git a/libc/fmt/bing.internal.h b/libc/fmt/bing.internal.h index 041dda069..d485d3e49 100644 --- a/libc/fmt/bing.internal.h +++ b/libc/fmt/bing.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_FMT_BING_H_ #define COSMOPOLITAN_LIBC_FMT_BING_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) int bing(int, int) nosideeffect; int unbing(int) nosideeffect; void *unbingbuf(void *, size_t, const char16_t *, int); void *unbingstr(const char16_t *) paramsnonnull() mallocesque; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_FMT_BING_H_ */ diff --git a/libc/fmt/conv.h b/libc/fmt/conv.h index df240dd75..9fe3f1c7c 100644 --- a/libc/fmt/conv.h +++ b/libc/fmt/conv.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_FMT_CONV_H_ #define COSMOPOLITAN_LIBC_FMT_CONV_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int abs(int) libcesque pureconst; @@ -73,5 +72,4 @@ imaxdiv_t imaxdiv(intmax_t, intmax_t) pureconst; #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_FMT_CONV_H_ */ diff --git a/libc/fmt/divmod10.internal.h b/libc/fmt/divmod10.internal.h index 46b09574b..a679636b7 100644 --- a/libc/fmt/divmod10.internal.h +++ b/libc/fmt/divmod10.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_FMT_DIVMOD10_H_ #define COSMOPOLITAN_LIBC_FMT_DIVMOD10_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) forceinline uint64_t __divmod10(uint64_t __x, unsigned *__r) { #if defined(__STRICT_ANSI__) || !defined(__GNUC__) || \ @@ -22,5 +21,4 @@ forceinline uint64_t __divmod10(uint64_t __x, unsigned *__r) { #endif } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_FMT_DIVMOD10_H_ */ diff --git a/libc/fmt/itoa.h b/libc/fmt/itoa.h index 438aaec18..10d976723 100644 --- a/libc/fmt/itoa.h +++ b/libc/fmt/itoa.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_FMT_ITOA_H_ #define COSMOPOLITAN_LIBC_FMT_ITOA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE COSMOPOLITAN_C_START_ @@ -44,5 +43,4 @@ size_t uint64toarray_radix8(uint64_t, char[hasatleast 24]); COSMOPOLITAN_C_END_ #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_FMT_ITOA_H_ */ diff --git a/libc/fmt/leb128.h b/libc/fmt/leb128.h index a8681b8a9..f01bc1e7f 100644 --- a/libc/fmt/leb128.h +++ b/libc/fmt/leb128.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_FMT_LEB128_H_ #define COSMOPOLITAN_LIBC_FMT_LEB128_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE COSMOPOLITAN_C_START_ @@ -18,5 +17,4 @@ int unuleb64(const char *, size_t, uint64_t *); COSMOPOLITAN_C_END_ #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_FMT_LEB128_H_ */ diff --git a/libc/fmt/libgen.h b/libc/fmt/libgen.h index ebf0c4b3b..96dcb98e4 100644 --- a/libc/fmt/libgen.h +++ b/libc/fmt/libgen.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_FMT_LIBGEN_H_ #define COSMOPOLITAN_LIBC_FMT_LIBGEN_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *dirname(char *); char *basename(char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_FMT_LIBGEN_H_ */ diff --git a/libc/fmt/wintime.internal.h b/libc/fmt/wintime.internal.h index 97d9fce57..1c067abb8 100644 --- a/libc/fmt/wintime.internal.h +++ b/libc/fmt/wintime.internal.h @@ -7,7 +7,6 @@ #define MODERNITYSECONDS 11644473600ull #define HECTONANOSECONDS 10000000ull -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int64_t DosDateTimeToUnix(uint32_t, uint32_t) pureconst; @@ -37,5 +36,4 @@ struct timeval WindowsTimeToTimeVal(int64_t) pureconst; #define TimeValToFileTime(x) MakeFileTime(TimeValToWindowsTime(x)) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_FMT_WINTIME_H_ */ diff --git a/libc/intrin/asan.c b/libc/intrin/asan.c index d3e5db522..e582fc023 100644 --- a/libc/intrin/asan.c +++ b/libc/intrin/asan.c @@ -24,7 +24,7 @@ #include "libc/errno.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/cmpxchg.h" #include "libc/intrin/describebacktrace.internal.h" #include "libc/intrin/directmap.internal.h" diff --git a/libc/intrin/asan.internal.h b/libc/intrin/asan.internal.h index de1875d79..a146b8999 100644 --- a/libc/intrin/asan.internal.h +++ b/libc/intrin/asan.internal.h @@ -3,7 +3,6 @@ #include "libc/calls/struct/iovec.h" #include "libc/intrin/asancodes.h" #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define SHADOW(x) ((signed char *)(((intptr_t)(x) >> kAsanScale) + kAsanMagic)) @@ -43,5 +42,4 @@ void __asan_memset(void *, char, size_t); void *__asan_memcpy(void *, const void *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_ASAN_H_ */ diff --git a/libc/intrin/asmflag.h b/libc/intrin/asmflag.h index 64013b14b..a283cf44b 100644 --- a/libc/intrin/asmflag.h +++ b/libc/intrin/asmflag.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_BITS_ASMFLAG_H_ #define COSMOPOLITAN_LIBC_BITS_ASMFLAG_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) /* * Constraints for virtual machine flags. @@ -30,5 +29,4 @@ #define ABOVEFLAG_ASM(OP) OP "\n\tseta\t%b0" #endif -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_ASMFLAG_H_ */ diff --git a/libc/intrin/atomic.h b/libc/intrin/atomic.h index 926c916c9..dcaaf3ace 100644 --- a/libc/intrin/atomic.h +++ b/libc/intrin/atomic.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_BITS_ATOMIC_H_ #define COSMOPOLITAN_LIBC_BITS_ATOMIC_H_ #include "libc/atomic.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * @fileoverview Cosmopolitan C11 Atomics Library @@ -217,5 +216,4 @@ enum { #error "atomic operations not supported with this compiler and/or architecture" #endif -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_ATOMIC_H_ */ diff --git a/libc/intrin/bitreverse.c b/libc/intrin/bitreverse.c deleted file mode 100644 index ffdc68b03..000000000 --- a/libc/intrin/bitreverse.c +++ /dev/null @@ -1,52 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" - -static const unsigned char kReverseBits[256] = { - 0, 128, 64, 192, 32, 160, 96, 224, 16, 144, 80, 208, 48, 176, 112, 240, - 8, 136, 72, 200, 40, 168, 104, 232, 24, 152, 88, 216, 56, 184, 120, 248, - 4, 132, 68, 196, 36, 164, 100, 228, 20, 148, 84, 212, 52, 180, 116, 244, - 12, 140, 76, 204, 44, 172, 108, 236, 28, 156, 92, 220, 60, 188, 124, 252, - 2, 130, 66, 194, 34, 162, 98, 226, 18, 146, 82, 210, 50, 178, 114, 242, - 10, 138, 74, 202, 42, 170, 106, 234, 26, 154, 90, 218, 58, 186, 122, 250, - 6, 134, 70, 198, 38, 166, 102, 230, 22, 150, 86, 214, 54, 182, 118, 246, - 14, 142, 78, 206, 46, 174, 110, 238, 30, 158, 94, 222, 62, 190, 126, 254, - 1, 129, 65, 193, 33, 161, 97, 225, 17, 145, 81, 209, 49, 177, 113, 241, - 9, 137, 73, 201, 41, 169, 105, 233, 25, 153, 89, 217, 57, 185, 121, 249, - 5, 133, 69, 197, 37, 165, 101, 229, 21, 149, 85, 213, 53, 181, 117, 245, - 13, 141, 77, 205, 45, 173, 109, 237, 29, 157, 93, 221, 61, 189, 125, 253, - 3, 131, 67, 195, 35, 163, 99, 227, 19, 147, 83, 211, 51, 179, 115, 243, - 11, 139, 75, 203, 43, 171, 107, 235, 27, 155, 91, 219, 59, 187, 123, 251, - 7, 135, 71, 199, 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, 119, 247, - 15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255, -}; - -/** - * Reverses bits in 8-bit word. - */ -int _bitreverse8(int x) { - return kReverseBits[x & 255]; -} - -/** - * Reverses bits in 16-bit word. - */ -int _bitreverse16(int x) { - return kReverseBits[x & 255] << 8 | kReverseBits[(0xFF00 & x) >> 8]; -} diff --git a/libc/intrin/bitreverse32.c b/libc/intrin/bitreverse32.c deleted file mode 100644 index cc1c0380c..000000000 --- a/libc/intrin/bitreverse32.c +++ /dev/null @@ -1,31 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" -#include "libc/intrin/bswap.h" - -/** - * Reverses bits in 32-bit word. - */ -uint32_t _bitreverse32(uint32_t x) { - x = bswap_32(x); - x = (x & 0xaaaaaaaa) >> 1 | (x & 0x55555555) << 1; - x = (x & 0xcccccccc) >> 2 | (x & 0x33333333) << 2; - x = (x & 0xf0f0f0f0) >> 4 | (x & 0x0f0f0f0f) << 4; - return x; -} diff --git a/libc/intrin/bitreverse64.c b/libc/intrin/bitreverse64.c deleted file mode 100644 index ae2b827b6..000000000 --- a/libc/intrin/bitreverse64.c +++ /dev/null @@ -1,31 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" -#include "libc/intrin/bswap.h" - -/** - * Reverses bits in 64-bit word. - */ -uint64_t _bitreverse64(uint64_t x) { - x = bswap_64(x); - x = (x & 0xaaaaaaaaaaaaaaaa) >> 1 | (x & 0x5555555555555555) << 1; - x = (x & 0xcccccccccccccccc) >> 2 | (x & 0x3333333333333333) << 2; - x = (x & 0xf0f0f0f0f0f0f0f0) >> 4 | (x & 0x0f0f0f0f0f0f0f0f) << 4; - return x; -} diff --git a/libc/intrin/bsf.h b/libc/intrin/bsf.h index 090270d11..241beb54f 100644 --- a/libc/intrin/bsf.h +++ b/libc/intrin/bsf.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_BSF_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_BSF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int _bsf(int) pureconst; @@ -14,5 +13,4 @@ int _bsfll(long long) pureconst; #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_BSF_H_ */ diff --git a/libc/intrin/bsr.h b/libc/intrin/bsr.h index 6aa475e69..0229b7e82 100644 --- a/libc/intrin/bsr.h +++ b/libc/intrin/bsr.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_BSR_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_BSR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int _bsr(int) pureconst; @@ -14,5 +13,4 @@ int _bsrll(long long) pureconst; #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_BSR_H_ */ diff --git a/libc/intrin/bswap.h b/libc/intrin/bswap.h index 9de9280e0..c05cb668f 100644 --- a/libc/intrin/bswap.h +++ b/libc/intrin/bswap.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_BITS_BSWAP_H_ #define COSMOPOLITAN_LIBC_BITS_BSWAP_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ uint16_t bswap_16(uint16_t) pureconst; @@ -14,5 +13,4 @@ uint64_t bswap_64(uint64_t) pureconst; #endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_BSWAP_H_ */ diff --git a/libc/intrin/cmpxchg.h b/libc/intrin/cmpxchg.h index cd511f14c..9d7abb02c 100644 --- a/libc/intrin/cmpxchg.h +++ b/libc/intrin/cmpxchg.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_CMPXCHG_H_ #define COSMOPOLITAN_LIBC_INTRIN_CMPXCHG_H_ #include "libc/intrin/asmflag.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if defined(__GNUC__) && !defined(__STRICT_ANSI__) && defined(__x86__) @@ -23,5 +22,4 @@ COSMOPOLITAN_C_START_ #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_CMPXCHG_H_ */ diff --git a/libc/intrin/countbits.c b/libc/intrin/countbits.c index f6c0f3c4f..1425dd83e 100644 --- a/libc/intrin/countbits.c +++ b/libc/intrin/countbits.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/dce.h" -#include "libc/intrin/bits.h" #include "libc/nexgen32e/x86feature.h" /** diff --git a/libc/intrin/cxaatexit.internal.h b/libc/intrin/cxaatexit.internal.h index 95a31fd82..be417acb7 100644 --- a/libc/intrin/cxaatexit.internal.h +++ b/libc/intrin/cxaatexit.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_RUNTIME_CXAATEXIT_H_ #include "libc/stdio/stdio.h" #include "libc/thread/tls.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct CxaAtexitBlocks { @@ -26,5 +25,4 @@ void __cxa_printexits(FILE *, void *); int __cxa_thread_atexit_impl(void *, void *, void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_CXAATEXIT_H_ */ diff --git a/libc/intrin/describebacktrace.internal.h b/libc/intrin/describebacktrace.internal.h index b2f6e6702..8186bb071 100644 --- a/libc/intrin/describebacktrace.internal.h +++ b/libc/intrin/describebacktrace.internal.h @@ -2,12 +2,10 @@ #define COSMOPOLITAN_LIBC_INTRIN_DESCRIBEBACKTRACE_INTERNAL_H_ #include "libc/mem/alloca.h" #include "libc/nexgen32e/stackframe.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ const char *DescribeBacktrace(char[160], struct StackFrame *); #define DescribeBacktrace(x) DescribeBacktrace(alloca(160), x) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_DESCRIBEBACKTRACE_INTERNAL_H_ */ diff --git a/libc/intrin/describeflags.internal.h b/libc/intrin/describeflags.internal.h index d1434bbee..389391b56 100644 --- a/libc/intrin/describeflags.internal.h +++ b/libc/intrin/describeflags.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_DESCRIBEFLAGS_INTERNAL_H_ #define COSMOPOLITAN_LIBC_INTRIN_DESCRIBEFLAGS_INTERNAL_H_ #include "libc/mem/alloca.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct thatispacked DescribeFlags { @@ -128,5 +127,4 @@ const char *DescribeWhichPrio(char[12], int); #define DescribeWhichPrio(x) DescribeWhichPrio(alloca(12), x) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_DESCRIBEFLAGS_INTERNAL_H_ */ diff --git a/libc/intrin/describentoverlapped.internal.h b/libc/intrin/describentoverlapped.internal.h index 157609118..009dad0c1 100644 --- a/libc/intrin/describentoverlapped.internal.h +++ b/libc/intrin/describentoverlapped.internal.h @@ -2,12 +2,10 @@ #define COSMOPOLITAN_LIBC_INTRIN_DESCRIBENTOVERLAPPED_INTERNAL_H_ #include "libc/mem/alloca.h" #include "libc/nt/struct/overlapped.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ const char *DescribeNtOverlapped(char[128], const struct NtOverlapped *); #define DescribeNtOverlapped(x) DescribeNtOverlapped(alloca(128), x) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_DESCRIBENTOVERLAPPED_INTERNAL_H_ */ diff --git a/libc/intrin/directmap.internal.h b/libc/intrin/directmap.internal.h index b95df80c5..bfe6b0c70 100644 --- a/libc/intrin/directmap.internal.h +++ b/libc/intrin/directmap.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_DIRECTMAP_H_ #define COSMOPOLITAN_LIBC_INTRIN_DIRECTMAP_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct ProtectNt { @@ -20,5 +19,4 @@ int sys_munmap_metal(void *, size_t); int __prot2nt(int, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_DIRECTMAP_H_ */ diff --git a/libc/intrin/dll.h b/libc/intrin/dll.h index 5f269f018..eb1ce8b74 100644 --- a/libc/intrin/dll.h +++ b/libc/intrin/dll.h @@ -5,7 +5,6 @@ #define dll_make_last __dll_make_last #define dll_remove __dll_remove #define dll_splice_after __dll_splice_after -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define DLL_CONTAINER(t, f, p) ((t *)(((char *)(p)) - offsetof(t, f))) @@ -56,6 +55,5 @@ void dll_make_first(struct Dll **, struct Dll *) paramsnonnull((1)) libcesque; void dll_splice_after(struct Dll *, struct Dll *) paramsnonnull((1)) libcesque; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _COSMO_SOURCE */ #endif /* COSMOPOLITAN_LIBC_INTRIN_DLL_H_ */ diff --git a/libc/intrin/dos2errno.internal.h b/libc/intrin/dos2errno.internal.h index bc02eb705..3c650e2ee 100644 --- a/libc/intrin/dos2errno.internal.h +++ b/libc/intrin/dos2errno.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_DOS2ERRNO_INTERNAL_H_ #define COSMOPOLITAN_LIBC_INTRIN_DOS2ERRNO_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct thatispacked Dos2Errno { @@ -11,5 +10,4 @@ struct thatispacked Dos2Errno { extern const struct Dos2Errno kDos2Errno[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_DOS2ERRNO_INTERNAL_H_ */ diff --git a/libc/intrin/extend.internal.h b/libc/intrin/extend.internal.h index c81f0023f..224e37fd1 100644 --- a/libc/intrin/extend.internal.h +++ b/libc/intrin/extend.internal.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_EXTEND_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_EXTEND_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *_extend(void *, size_t, void *, int, intptr_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_EXTEND_INTERNAL_H_ */ diff --git a/libc/intrin/getauxval.internal.h b/libc/intrin/getauxval.internal.h index 7c9e4995f..ad2ac1cd7 100644 --- a/libc/intrin/getauxval.internal.h +++ b/libc/intrin/getauxval.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_GETAUXVAL_H_ #define COSMOPOLITAN_LIBC_INTRIN_GETAUXVAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct AuxiliaryValue { @@ -11,5 +10,4 @@ struct AuxiliaryValue { struct AuxiliaryValue __getauxval(unsigned long); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_GETAUXVAL_H_ */ diff --git a/libc/intrin/getenv.internal.h b/libc/intrin/getenv.internal.h index 44511a0b1..9bc1d4d74 100644 --- a/libc/intrin/getenv.internal.h +++ b/libc/intrin/getenv.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_GETENV_H_ #define COSMOPOLITAN_LIBC_INTRIN_GETENV_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Env { @@ -11,5 +10,4 @@ struct Env { struct Env __getenv(char **, const char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_GETENV_H_ */ diff --git a/libc/intrin/hilbert.h b/libc/intrin/hilbert.h index 71befd4e3..5528cb6bb 100644 --- a/libc/intrin/hilbert.h +++ b/libc/intrin/hilbert.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_BITS_HILBERT_H_ #define COSMOPOLITAN_LIBC_BITS_HILBERT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE COSMOPOLITAN_C_START_ #define hilbert __hilbert @@ -11,5 +10,4 @@ axdx_t unhilbert(long, long) pureconst; COSMOPOLITAN_C_END_ #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_HILBERT_H_ */ diff --git a/libc/intrin/kprintf.greg.c b/libc/intrin/kprintf.greg.c index 317318949..bb3336c01 100644 --- a/libc/intrin/kprintf.greg.c +++ b/libc/intrin/kprintf.greg.c @@ -24,7 +24,7 @@ #include "libc/fmt/magnumstrs.internal.h" #include "libc/intrin/asmflag.h" #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/getenv.internal.h" #include "libc/intrin/likely.h" #include "libc/intrin/nomultics.internal.h" diff --git a/libc/intrin/leaky.internal.h b/libc/intrin/leaky.internal.h index 403eece31..d413461fd 100644 --- a/libc/intrin/leaky.internal.h +++ b/libc/intrin/leaky.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_LEAKY_INTERNAL_H_ #define COSMOPOLITAN_LIBC_INTRIN_LEAKY_INTERNAL_H_ #include "libc/dce.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if IsAsan() @@ -17,5 +16,4 @@ extern intptr_t _leaky_end[] __attribute__((__weak__)); extern intptr_t _leaky_start[] __attribute__((__weak__)); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_LEAKY_INTERNAL_H_ */ diff --git a/libc/intrin/likely.h b/libc/intrin/likely.h index d8f803b11..88b802469 100644 --- a/libc/intrin/likely.h +++ b/libc/intrin/likely.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_BITS_LIKELY_H_ #define COSMOPOLITAN_LIBC_BITS_LIKELY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE #define LIKELY(x) __builtin_expect(!!(x), 1) @@ -19,5 +18,4 @@ #endif #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_LIKELY_H_ */ diff --git a/libc/intrin/macros.h b/libc/intrin/macros.h index 050b203ba..38d6324bd 100644 --- a/libc/intrin/macros.h +++ b/libc/intrin/macros.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_INTRIN_MACROS_H_ #include "libc/dce.h" #include "libc/nexgen32e/x86feature.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define INTRIN_COMMUTATIVE "%" #define INTRIN_NONCOMMUTATIVE @@ -80,5 +79,4 @@ typedef char __intrin_xmm_t #define INTRIN_SSEVEX_X_X_(PURE, ISA, OP, A, B) PURE(A, B) #endif /* X86 && !ANSI */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_MACROS_H_ */ diff --git a/libc/intrin/memtrack.greg.c b/libc/intrin/memtrack.greg.c index dba35bdfe..3594fb8c8 100644 --- a/libc/intrin/memtrack.greg.c +++ b/libc/intrin/memtrack.greg.c @@ -21,7 +21,6 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" -#include "libc/intrin/bits.h" #include "libc/intrin/directmap.internal.h" #include "libc/intrin/strace.internal.h" #include "libc/log/libfatal.internal.h" diff --git a/libc/intrin/nomultics.internal.h b/libc/intrin/nomultics.internal.h index 9cd8d4595..833bc7e28 100644 --- a/libc/intrin/nomultics.internal.h +++ b/libc/intrin/nomultics.internal.h @@ -8,7 +8,6 @@ #define kTtyNoIsigs 16 /* don't auto-raise signals on keys */ #define kTtyXtMouse 32 /* enables eXtreme Xterm mouse mode */ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct TtyConf { @@ -44,5 +43,4 @@ struct TtyConf { extern struct TtyConf __ttyconf; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_NOMULTICS_H_ */ diff --git a/libc/intrin/packsswb.h b/libc/intrin/packsswb.h index c39b7f749..fae659b0b 100644 --- a/libc/intrin/packsswb.h +++ b/libc/intrin/packsswb.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PACKSSWB_H_ #define COSMOPOLITAN_LIBC_INTRIN_PACKSSWB_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void packsswb(int8_t[16], const int16_t[8], const int16_t[8]); @@ -11,5 +10,4 @@ void packsswb(int8_t[16], const int16_t[8], const int16_t[8]); B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PACKSSWB_H_ */ diff --git a/libc/intrin/packuswb.h b/libc/intrin/packuswb.h index 405de694b..3c8ddf7da 100644 --- a/libc/intrin/packuswb.h +++ b/libc/intrin/packuswb.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PACKUSWB_H_ #define COSMOPOLITAN_LIBC_INTRIN_PACKUSWB_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void packuswb(uint8_t[16], const int16_t[8], const int16_t[8]); @@ -11,5 +10,4 @@ void packuswb(uint8_t[16], const int16_t[8], const int16_t[8]); B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PACKUSWB_H_ */ diff --git a/libc/intrin/paddw.h b/libc/intrin/paddw.h index 755d4c172..bdad518d9 100644 --- a/libc/intrin/paddw.h +++ b/libc/intrin/paddw.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PADDW_H_ #define COSMOPOLITAN_LIBC_INTRIN_PADDW_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void paddw(int16_t[8], const int16_t[8], const int16_t[8]); @@ -10,5 +9,4 @@ void paddw(int16_t[8], const int16_t[8], const int16_t[8]); INTRIN_SSEVEX_X_X_X_(paddw, SSE2, "paddw", INTRIN_COMMUTATIVE, A, B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PADDW_H_ */ diff --git a/libc/intrin/palignr.h b/libc/intrin/palignr.h index 8c3c6509a..bee9b694f 100644 --- a/libc/intrin/palignr.h +++ b/libc/intrin/palignr.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_INTRIN_PALIGNR_H_ #include "libc/intrin/macros.h" #include "libc/str/str.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void palignr(void *, const void *, const void *, unsigned long); @@ -43,5 +42,4 @@ __intrin_xmm_t __palignrs(__intrin_xmm_t, __intrin_xmm_t); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PALIGNR_H_ */ diff --git a/libc/intrin/pandn.h b/libc/intrin/pandn.h index 474d77a9a..bb4687614 100644 --- a/libc/intrin/pandn.h +++ b/libc/intrin/pandn.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PANDN_H_ #define COSMOPOLITAN_LIBC_INTRIN_PANDN_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void pandn(uint64_t[2], const uint64_t[2], const uint64_t[2]); @@ -10,5 +9,4 @@ void pandn(uint64_t[2], const uint64_t[2], const uint64_t[2]); INTRIN_SSEVEX_X_X_X_(pandn, SSE2, "pandn", INTRIN_NONCOMMUTATIVE, A, B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PANDN_H_ */ diff --git a/libc/intrin/pcmpgtb.h b/libc/intrin/pcmpgtb.h index c9f4c4812..043cedf4f 100644 --- a/libc/intrin/pcmpgtb.h +++ b/libc/intrin/pcmpgtb.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PCMPGTB_H_ #define COSMOPOLITAN_LIBC_INTRIN_PCMPGTB_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void pcmpgtb(int8_t[16], const int8_t[16], const int8_t[16]); @@ -10,5 +9,4 @@ void pcmpgtb(int8_t[16], const int8_t[16], const int8_t[16]); INTRIN_SSEVEX_X_X_X_(pcmpgtb, SSE2, "pcmpgtb", INTRIN_NONCOMMUTATIVE, A, B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PCMPGTB_H_ */ diff --git a/libc/intrin/pcmpgtw.h b/libc/intrin/pcmpgtw.h index a518acaca..bb9707d19 100644 --- a/libc/intrin/pcmpgtw.h +++ b/libc/intrin/pcmpgtw.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PCMPGTW_H_ #define COSMOPOLITAN_LIBC_INTRIN_PCMPGTW_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void pcmpgtw(int16_t[8], const int16_t[8], const int16_t[8]); @@ -10,5 +9,4 @@ void pcmpgtw(int16_t[8], const int16_t[8], const int16_t[8]); INTRIN_SSEVEX_X_X_X_(pcmpgtw, SSE2, "pcmpgtw", INTRIN_NONCOMMUTATIVE, A, B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PCMPGTW_H_ */ diff --git a/libc/intrin/pmaddubsw.h b/libc/intrin/pmaddubsw.h index c5224e1ce..5e503c56c 100644 --- a/libc/intrin/pmaddubsw.h +++ b/libc/intrin/pmaddubsw.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PMADDUBSW_H_ #define COSMOPOLITAN_LIBC_INTRIN_PMADDUBSW_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void pmaddubsw(int16_t[8], const uint8_t[16], const int8_t[16]); @@ -11,5 +10,4 @@ void pmaddubsw(int16_t[8], const uint8_t[16], const int8_t[16]); W, B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PMADDUBSW_H_ */ diff --git a/libc/intrin/pmovmskb.h b/libc/intrin/pmovmskb.h index 303850570..e17e1fb16 100644 --- a/libc/intrin/pmovmskb.h +++ b/libc/intrin/pmovmskb.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PMOVMSKB_H_ #define COSMOPOLITAN_LIBC_INTRIN_PMOVMSKB_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ uint32_t pmovmskb(const uint8_t[16]); @@ -25,5 +24,4 @@ uint32_t pmovmskb(const uint8_t[16]); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PMOVMSKB_H_ */ diff --git a/libc/intrin/pmulhrsw.h b/libc/intrin/pmulhrsw.h index 7c133cae1..2182c3404 100644 --- a/libc/intrin/pmulhrsw.h +++ b/libc/intrin/pmulhrsw.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PMULHRSW_H_ #define COSMOPOLITAN_LIBC_INTRIN_PMULHRSW_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void pmulhrsw(int16_t a[8], const int16_t b[8], const int16_t c[8]); @@ -10,5 +9,4 @@ void pmulhrsw(int16_t a[8], const int16_t b[8], const int16_t c[8]); INTRIN_SSEVEX_X_X_X_(pmulhrsw, SSSE3, "pmulhrsw", INTRIN_COMMUTATIVE, A, B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PMULHRSW_H_ */ diff --git a/libc/intrin/popcnt.h b/libc/intrin/popcnt.h index 26aad97e7..6456bbbe9 100644 --- a/libc/intrin/popcnt.h +++ b/libc/intrin/popcnt.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_BITS_POPCNT_H_ #define COSMOPOLITAN_LIBC_BITS_POPCNT_H_ #include "libc/nexgen32e/x86feature.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ size_t _countbits(const void *, size_t); @@ -23,5 +22,4 @@ unsigned long popcnt(unsigned long) pureconst; #endif /* GNUC && !ANSI */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_POPCNT_H_ */ diff --git a/libc/intrin/promises.internal.h b/libc/intrin/promises.internal.h index 217ee90c8..09cc64569 100644 --- a/libc/intrin/promises.internal.h +++ b/libc/intrin/promises.internal.h @@ -28,12 +28,10 @@ #define PLEDGED(x) ((~__promises >> PROMISE_##x) & 1) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern unsigned long __promises; extern unsigned long __execpromises; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PROMISES_H_ */ diff --git a/libc/intrin/psraw.h b/libc/intrin/psraw.h index 59e6e2811..81be8f1c6 100644 --- a/libc/intrin/psraw.h +++ b/libc/intrin/psraw.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PSRAW_H_ #define COSMOPOLITAN_LIBC_INTRIN_PSRAW_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void psraw(int16_t[8], const int16_t[8], unsigned char); @@ -12,5 +11,4 @@ void psrawv(int16_t[8], const int16_t[8], const uint64_t[2]); INTRIN_SSEVEX_X_X_X_(psrawv, SSE2, "psraw", INTRIN_NONCOMMUTATIVE, A, B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PSRAW_H_ */ diff --git a/libc/intrin/punpckhbw.h b/libc/intrin/punpckhbw.h index 69ca1fc4e..306cb1597 100644 --- a/libc/intrin/punpckhbw.h +++ b/libc/intrin/punpckhbw.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PUNPCKHBW_H_ #define COSMOPOLITAN_LIBC_INTRIN_PUNPCKHBW_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void punpckhbw(uint8_t[16], const uint8_t[16], const uint8_t[16]); @@ -11,5 +10,4 @@ void punpckhbw(uint8_t[16], const uint8_t[16], const uint8_t[16]); B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PUNPCKHBW_H_ */ diff --git a/libc/intrin/punpckhwd.h b/libc/intrin/punpckhwd.h index 4d850e9a6..548e6ee92 100644 --- a/libc/intrin/punpckhwd.h +++ b/libc/intrin/punpckhwd.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PUNPCKHWD_H_ #define COSMOPOLITAN_LIBC_INTRIN_PUNPCKHWD_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void punpckhwd(uint16_t[8], const uint16_t[8], const uint16_t[8]); @@ -11,5 +10,4 @@ void punpckhwd(uint16_t[8], const uint16_t[8], const uint16_t[8]); B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PUNPCKHWD_H_ */ diff --git a/libc/intrin/punpcklbw.h b/libc/intrin/punpcklbw.h index 259ec0447..40c9cef89 100644 --- a/libc/intrin/punpcklbw.h +++ b/libc/intrin/punpcklbw.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PUNPCKLBW_H_ #define COSMOPOLITAN_LIBC_INTRIN_PUNPCKLBW_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void punpcklbw(uint8_t[16], const uint8_t[16], const uint8_t[16]); @@ -11,5 +10,4 @@ void punpcklbw(uint8_t[16], const uint8_t[16], const uint8_t[16]); B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PUNPCKLBW_H_ */ diff --git a/libc/intrin/punpcklwd.h b/libc/intrin/punpcklwd.h index f7e99e990..e286ba9c2 100644 --- a/libc/intrin/punpcklwd.h +++ b/libc/intrin/punpcklwd.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_PUNPCKLWD_H_ #define COSMOPOLITAN_LIBC_INTRIN_PUNPCKLWD_H_ #include "libc/intrin/macros.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void punpcklwd(uint16_t[8], const uint16_t[8], const uint16_t[8]); @@ -11,5 +10,4 @@ void punpcklwd(uint16_t[8], const uint16_t[8], const uint16_t[8]); B, C) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PUNPCKLWD_H_ */ diff --git a/libc/intrin/pushpop.internal.h b/libc/intrin/pushpop.internal.h index f71e9383e..2f693e542 100644 --- a/libc/intrin/pushpop.internal.h +++ b/libc/intrin/pushpop.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_BITS_PUSHPOP_H_ #ifdef _COSMO_SOURCE #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined(__GNUC__) || defined(__STRICT_ANSI__) || !defined(__x86_64__) || \ !defined(__MNO_RED_ZONE__) @@ -54,6 +53,5 @@ }) #endif -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _COSMO_SOURCE */ #endif /* COSMOPOLITAN_LIBC_BITS_PUSHPOP_H_ */ diff --git a/libc/intrin/repmovsb.h b/libc/intrin/repmovsb.h index 7f096ae48..02a167524 100644 --- a/libc/intrin/repmovsb.h +++ b/libc/intrin/repmovsb.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_REPMOVSB_H_ #define COSMOPOLITAN_LIBC_INTRIN_REPMOVSB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE forceinline void repmovsb(void **dest, const void **src, size_t cx) { @@ -24,5 +23,4 @@ forceinline void repmovsb(void **dest, const void **src, size_t cx) { #endif #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_REPMOVSB_H_ */ diff --git a/libc/intrin/repstosb.h b/libc/intrin/repstosb.h index 14ae6ad0f..d0b75a05f 100644 --- a/libc/intrin/repstosb.h +++ b/libc/intrin/repstosb.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_REPSTOSB_H_ #define COSMOPOLITAN_LIBC_INTRIN_REPSTOSB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE forceinline void *repstosb(void *dest, unsigned char al, size_t cx) { @@ -23,5 +22,4 @@ forceinline void *repstosb(void *dest, unsigned char al, size_t cx) { #endif #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_REPSTOSB_H_ */ diff --git a/libc/intrin/safemacros.internal.h b/libc/intrin/safemacros.internal.h index ac1c1e03b..87b39dadd 100644 --- a/libc/intrin/safemacros.internal.h +++ b/libc/intrin/safemacros.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_ #include "libc/macros.internal.h" #include "libc/runtime/runtime.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define min(x, y) \ @@ -67,5 +66,4 @@ COSMOPOLITAN_C_START_ }) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_ */ diff --git a/libc/intrin/segmentation.h b/libc/intrin/segmentation.h index 12e9eccee..845b9a41a 100644 --- a/libc/intrin/segmentation.h +++ b/libc/intrin/segmentation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_BITS_SEGMENTATION_H_ #define COSMOPOLITAN_LIBC_BITS_SEGMENTATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #if defined(__GNUC__) && !defined(__STRICT_ANSI__) #ifdef _COSMO_SOURCE @@ -22,5 +21,4 @@ #endif /* _COSMO_SOURCE */ #endif /* __GNUC__ && !__STRICT_ANSI__ */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_SEGMENTATION_H_ */ diff --git a/libc/intrin/setjmp.internal.h b/libc/intrin/setjmp.internal.h index b48150874..4e9bf1c98 100644 --- a/libc/intrin/setjmp.internal.h +++ b/libc/intrin/setjmp.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_INTRIN_SETJMP_INTERNAL_H_ #define COSMOPOLITAN_LIBC_INTRIN_SETJMP_INTERNAL_H_ #include "libc/limits.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -25,5 +24,4 @@ static inline int DecodeSetjmp(int x) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_SETJMP_INTERNAL_H_ */ diff --git a/libc/intrin/strnlen.c b/libc/intrin/strnlen.c index 9a5bee53a..da0d22ad0 100644 --- a/libc/intrin/strnlen.c +++ b/libc/intrin/strnlen.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/dce.h" -#include "libc/intrin/bits.h" #include "libc/str/str.h" #ifndef __aarch64__ diff --git a/libc/intrin/ulock.h b/libc/intrin/ulock.h index d76277a4f..d0eb1eeb5 100644 --- a/libc/intrin/ulock.h +++ b/libc/intrin/ulock.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_ULOCK_H_ #define COSMOPOLITAN_ULOCK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* both wake and wait take one of these */ @@ -23,5 +22,4 @@ int ulock_wake(uint32_t, void *, uint64_t); int ulock_wait(uint32_t, void *, uint64_t, uint32_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_ULOCK_H_ */ diff --git a/libc/intrin/weaken.h b/libc/intrin/weaken.h index 44aea3e28..189a87565 100644 --- a/libc/intrin/weaken.h +++ b/libc/intrin/weaken.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_BITS_WEAKEN_H_ #define COSMOPOLITAN_LIBC_BITS_WEAKEN_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef __chibicc__ #define _weaken(symbol) \ @@ -12,5 +11,4 @@ #define _weaken(symbol) (&(symbol)) #endif -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_WEAKEN_H_ */ diff --git a/libc/intrin/xchg.internal.h b/libc/intrin/xchg.internal.h index 333f81398..d75f43501 100644 --- a/libc/intrin/xchg.internal.h +++ b/libc/intrin/xchg.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_BITS_XCHG_H_ #define COSMOPOLITAN_LIBC_BITS_XCHG_H_ #include "libc/str/str.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Exchanges *MEMORY into *LOCALVAR. @@ -20,5 +19,4 @@ Temp; \ }) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BITS_XCHG_H_ */ diff --git a/libc/irq/acpi-xsdt.c b/libc/irq/acpi-xsdt.c index 9b20c5ab0..0586ee280 100644 --- a/libc/irq/acpi-xsdt.c +++ b/libc/irq/acpi-xsdt.c @@ -26,7 +26,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/directmap.internal.h" #include "libc/intrin/kprintf.h" #include "libc/irq/acpi.internal.h" @@ -41,8 +41,7 @@ #ifdef __x86_64__ textstartup static void *_AcpiOsMapRoMemory(uintptr_t phy, size_t n) { - __invert_and_perm_ref_memory_area(__get_mm(), __get_pml4t(), phy, n, - PAGE_XD); + __invert_and_perm_ref_memory_area(__get_mm(), __get_pml4t(), phy, n, PAGE_XD); return (void *)(BANE + phy); } @@ -108,10 +107,10 @@ textstartup static AcpiStatus _AcpiRsdpVerifyChecksums(const uint8_t *p) { if (q->Revision <= 1) return kAcpiOk; length = q->Length; if (length < offsetof(AcpiTableRsdp, Reserved)) { - KWARNF("malformed ACPI 2+ RSDP, length %#zx < %#zx", - length, offsetof(AcpiTableRsdp, Reserved)); - if (length < offsetof(AcpiTableRsdp, RsdtPhysicalAddress) - + sizeof(q->RsdtPhysicalAddress)) { + KWARNF("malformed ACPI 2+ RSDP, length %#zx < %#zx", length, + offsetof(AcpiTableRsdp, Reserved)); + if (length < offsetof(AcpiTableRsdp, RsdtPhysicalAddress) + + sizeof(q->RsdtPhysicalAddress)) { return kAcpiExBadHeader; } return kAcpiOk; diff --git a/libc/irq/acpi.internal.h b/libc/irq/acpi.internal.h index 61b53bfc6..16cc321ac 100644 --- a/libc/irq/acpi.internal.h +++ b/libc/irq/acpi.internal.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_IRQ_ACPI_INTERNAL_H_ #define COSMOPOLITAN_LIBC_IRQ_ACPI_INTERNAL_H_ -#include "libc/intrin/bits.h" #include "libc/intrin/kprintf.h" -#include "libc/log/color.internal.h" /** * @internal @@ -18,10 +16,10 @@ * @internal * AcpiStatus values. */ -#define kAcpiOk 0x0000 -#define kAcpiExNotFound 0x0005 -#define kAcpiExBadHeader 0x2002 -#define kAcpiExBadChecksum 0x2003 +#define kAcpiOk 0x0000 +#define kAcpiExNotFound 0x0005 +#define kAcpiExBadHeader 0x2002 +#define kAcpiExBadChecksum 0x2003 /** * @internal @@ -44,9 +42,9 @@ * @internal * Values for AcpiSubtableHeader::Type under an AcpiTableMadt. */ -#define kAcpiMadtLocalApic 0 -#define kAcpiMadtIoApic 1 -#define kAcpiMadtIntOverride 2 +#define kAcpiMadtLocalApic 0 +#define kAcpiMadtIoApic 1 +#define kAcpiMadtIntOverride 2 #if !(__ASSEMBLER__ + __LINKER__ + 0) @@ -131,9 +129,9 @@ typedef struct thatispacked { */ typedef struct thatispacked { AcpiTableHeader Header; - uint32_t Address; /* local APIC address */ - uint32_t Flags; /* multiple APIC flags */ - char Subtable[]; /* ...interrupt controller structures... */ + uint32_t Address; /* local APIC address */ + uint32_t Flags; /* multiple APIC flags */ + char Subtable[]; /* ...interrupt controller structures... */ } AcpiTableMadt; /** @@ -228,8 +226,11 @@ forceinline bool _AcpiSuccess(AcpiStatus __sta) { forceinline AcpiStatus _AcpiGetTable(const char __sig[4], uint32_t __inst, void **__phdr) { - uint8_t __sig_copy[4] = { __sig[0], __sig[1], __sig[2], __sig[3] }; - return _AcpiGetTableImpl(READ32LE(__sig_copy), __inst, __phdr); + unsigned sig32le = (unsigned)(unsigned char)__sig[0] | + (unsigned)(unsigned char)__sig[1] << 8 | + (unsigned)(unsigned char)__sig[2] << 16 | + (unsigned)(unsigned char)__sig[3] << 24; + return _AcpiGetTableImpl(sig32le, __inst, __phdr); } COSMOPOLITAN_C_END_ diff --git a/libc/isystem/linux/types.h b/libc/isystem/linux/types.h index 68f3fdeb3..846d6ba82 100644 --- a/libc/isystem/linux/types.h +++ b/libc/isystem/linux/types.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_ISYSTEM_LINUX_TYPES_H_ #define COSMOPOLITAN_LIBC_ISYSTEM_LINUX_TYPES_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef uint16_t __u16; @@ -21,5 +20,4 @@ typedef __u32 __wsum; #define __aligned_le64 __le64 __attribute__((__aligned__(8))) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ISYSTEM_LINUX_TYPES_H_ */ diff --git a/libc/isystem/tgmath.h b/libc/isystem/tgmath.h index d5f6aa9c0..a62b88a59 100644 --- a/libc/isystem/tgmath.h +++ b/libc/isystem/tgmath.h @@ -3,7 +3,6 @@ #include "libc/complex.h" #include "libc/imag.internal.h" #include "libc/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #if __STDC_VERSION__ + 0 >= 201112 /* from https://en.cppreference.com/w/c/numeric/tgmath */ @@ -328,5 +327,4 @@ : cprojl)(x) #endif /* C11 */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _TGMATH_H */ diff --git a/libc/log/appendresourcereport.c b/libc/log/appendresourcereport.c index 953a635ef..b4e6b883f 100644 --- a/libc/log/appendresourcereport.c +++ b/libc/log/appendresourcereport.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/struct/rusage.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/log/log.h" #include "libc/math.h" #include "libc/runtime/clktck.h" diff --git a/libc/log/appendresourcereport.internal.h b/libc/log/appendresourcereport.internal.h index 697b951e9..0adc231e2 100644 --- a/libc/log/appendresourcereport.internal.h +++ b/libc/log/appendresourcereport.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_LOG_APPENDRESOURCEREPORT_INTERNAL_H_ #define COSMOPOLITAN_LIBC_LOG_APPENDRESOURCEREPORT_INTERNAL_H_ #include "libc/calls/struct/rusage.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void AppendResourceReport(char **, struct rusage *, const char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_APPENDRESOURCEREPORT_INTERNAL_H_ */ diff --git a/libc/log/backtrace.internal.h b/libc/log/backtrace.internal.h index 872b423e4..96cc2dd42 100644 --- a/libc/log/backtrace.internal.h +++ b/libc/log/backtrace.internal.h @@ -3,7 +3,6 @@ #include "libc/nexgen32e/stackframe.h" #include "libc/runtime/memtrack.internal.h" #include "libc/runtime/symbols.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ forceinline pureconst bool IsValidStackFramePointer(struct StackFrame *x) { @@ -20,5 +19,4 @@ int PrintBacktraceUsingSymbols(int, const struct StackFrame *, struct SymbolTable *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_BACKTRACE_H_ */ diff --git a/libc/log/bsd.h b/libc/log/bsd.h index 8f9842182..b9753e36a 100644 --- a/libc/log/bsd.h +++ b/libc/log/bsd.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_LOG_BSD_H_ #define COSMOPOLITAN_LIBC_LOG_BSD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void err(int, const char *, ...) wontreturn; @@ -18,5 +17,4 @@ void vwarnx(const char *, va_list); void err_set_exit(void (*)(int)); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_BSD_H_ */ diff --git a/libc/log/check.h b/libc/log/check.h index 9c2339725..bbf179a12 100644 --- a/libc/log/check.h +++ b/libc/log/check.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_LOG_CHECK_H_ #include "libc/dce.h" #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define CHECK(X, ...) __CHK(ne, !=, false, "false", !!(X), #X, "" __VA_ARGS__) @@ -107,5 +106,4 @@ void __check_fail_aligned(unsigned, uint64_t, const char *, int, const char *, #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_CHECK_H_ */ diff --git a/libc/log/color.internal.h b/libc/log/color.internal.h index 663e554b9..47a0bc0c0 100644 --- a/libc/log/color.internal.h +++ b/libc/log/color.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_LOG_COLOR_H_ #define COSMOPOLITAN_LIBC_LOG_COLOR_H_ #include "libc/log/internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define CLS (!__nocolor ? "\r\e[J" : "") #define RED (!__nocolor ? "\e[30;101m" : "") @@ -13,5 +12,4 @@ #define RESET (!__nocolor ? "\e[0m" : "") #define SUBTLE (!__nocolor ? "\e[35m" : "") -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_COLOR_H_ */ diff --git a/libc/log/countbranch.h b/libc/log/countbranch.h index 03b7b6c63..467d65e62 100644 --- a/libc/log/countbranch.h +++ b/libc/log/countbranch.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_LOG_COUNTBRANCH_H_ #include "libc/macros.internal.h" #include "libc/stdbool.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define COUNTBRANCH(x) COUNTBRANCH_(x, #x, STRINGIFY(__FILE__), __LINE__) @@ -55,5 +54,4 @@ extern struct countbranch countbranch_data[]; void countbranch_report(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_COUNTBRANCH_H_ */ diff --git a/libc/log/countexpr.h b/libc/log/countexpr.h index ac8f28a41..51104bcbe 100644 --- a/libc/log/countexpr.h +++ b/libc/log/countexpr.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_LOG_COUNTEXPR_H_ #include "libc/macros.internal.h" #include "libc/nexgen32e/bench.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -80,5 +79,4 @@ extern struct countexpr countexpr_data[]; void countexpr_report(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_COUNTEXPR_H_ */ diff --git a/libc/log/gdb.h b/libc/log/gdb.h index 2953aa07d..a66eedf8d 100644 --- a/libc/log/gdb.h +++ b/libc/log/gdb.h @@ -6,7 +6,6 @@ #include "libc/proc/proc.internal.h" #include "libc/sysv/consts/nr.h" #include "libc/sysv/consts/w.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -63,5 +62,4 @@ int AttachDebugger(intptr_t); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_GDB_H_ */ diff --git a/libc/log/getcallername.internal.h b/libc/log/getcallername.internal.h index 597409c68..3e49a6040 100644 --- a/libc/log/getcallername.internal.h +++ b/libc/log/getcallername.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_LOG_GETCALLERNAME_INTERNAL_H_ #define COSMOPOLITAN_LIBC_LOG_GETCALLERNAME_INTERNAL_H_ #include "libc/nexgen32e/stackframe.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ const char *GetCallerName(const struct StackFrame *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_GETCALLERNAME_INTERNAL_H_ */ diff --git a/libc/log/internal.h b/libc/log/internal.h index ee6459d41..cec8ae390 100644 --- a/libc/log/internal.h +++ b/libc/log/internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_LOG_INTERNAL_H_ #define COSMOPOLITAN_LIBC_LOG_INTERNAL_H_ #include "libc/calls/struct/siginfo.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern bool __nocolor; @@ -12,5 +11,4 @@ void __restore_tty(void); void __oncrash(int, struct siginfo *, void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_INTERNAL_H_ */ diff --git a/libc/log/leaks.c b/libc/log/leaks.c index d73d2cda8..bae201d56 100644 --- a/libc/log/leaks.c +++ b/libc/log/leaks.c @@ -19,7 +19,6 @@ #include "libc/cxxabi.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" -#include "libc/intrin/bits.h" #include "libc/intrin/cmpxchg.h" #include "libc/intrin/cxaatexit.internal.h" #include "libc/intrin/kprintf.h" diff --git a/libc/log/libfatal.internal.h b/libc/log/libfatal.internal.h index 6c97d0314..aa5f7589a 100644 --- a/libc/log/libfatal.internal.h +++ b/libc/log/libfatal.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_ #define COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_ #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ __funline unsigned long __strlen(const char *s) { @@ -197,5 +196,4 @@ __funline void *__memmove(void *a, const void *b, unsigned long n) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_ */ diff --git a/libc/log/log.h b/libc/log/log.h index 0d09d1512..92a8c2a10 100644 --- a/libc/log/log.h +++ b/libc/log/log.h @@ -30,7 +30,6 @@ #define _LOG_TINY 0 #endif -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern FILE *__log_file; @@ -225,6 +224,5 @@ void vffatalf(ARGS, va_list) asm("vflogf") ATTRV relegated wontreturn libcesque; #endif /* __STRICT_ANSI__ */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _COSMO_SOURCE */ #endif /* COSMOPOLITAN_LIBC_LOG_LOG_H_ */ diff --git a/libc/log/traceme.h b/libc/log/traceme.h index a7aad06de..f7d3735df 100644 --- a/libc/log/traceme.h +++ b/libc/log/traceme.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_LOG_TRACEME_H_ #define COSMOPOLITAN_LIBC_LOG_TRACEME_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern int traceme; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LOG_TRACEME_H_ */ diff --git a/libc/log/vflogf.c b/libc/log/vflogf.c index bc30362b4..22a5bcb54 100644 --- a/libc/log/vflogf.c +++ b/libc/log/vflogf.c @@ -25,7 +25,6 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/fmt/libgen.h" -#include "libc/intrin/bits.h" #include "libc/intrin/safemacros.internal.h" #include "libc/intrin/strace.internal.h" #include "libc/log/internal.h" diff --git a/libc/log/watch.c b/libc/log/watch.c index 5c24be248..397b87a78 100644 --- a/libc/log/watch.c +++ b/libc/log/watch.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/kprintf.h" #include "libc/log/backtrace.internal.h" #include "libc/log/log.h" diff --git a/libc/mach.internal.h b/libc/mach.internal.h index 9a605156f..6170174e1 100644 --- a/libc/mach.internal.h +++ b/libc/mach.internal.h @@ -38,12 +38,10 @@ #define kXnuNtNsBase 0x060 /* uint64_t */ #define kXnuNtGeneration 0x068 /* uint32_t */ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool swtch(void); bool swtch_pri(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_MACH_H_ */ diff --git a/libc/math.h b/libc/math.h index fbd4d9347..dd1f7df68 100644 --- a/libc/math.h +++ b/libc/math.h @@ -66,7 +66,6 @@ #define FP_ILOGB0 (-2147483647 - 1) #define FP_ILOGBNAN (-2147483647 - 1) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define NAN __builtin_nanf("") @@ -326,5 +325,4 @@ float y1f(float); float ynf(int, float); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_MATH_H_ */ diff --git a/libc/mem/alg.h b/libc/mem/alg.h index f966adb2e..59d627c73 100644 --- a/libc/mem/alg.h +++ b/libc/mem/alg.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_ALG_ALG_H_ #define COSMOPOLITAN_LIBC_ALG_ALG_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *bsearch(const void *, const void *, size_t, size_t, @@ -33,5 +32,4 @@ int radix_sort_int32(int32_t *, size_t); int radix_sort_int64(int64_t *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ALG_ALG_H_ */ diff --git a/libc/mem/arraylist.internal.h b/libc/mem/arraylist.internal.h index 5a1cb5c03..8d7e0b890 100644 --- a/libc/mem/arraylist.internal.h +++ b/libc/mem/arraylist.internal.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_ALG_ARRAYLIST_H_ #define COSMOPOLITAN_LIBC_ALG_ARRAYLIST_H_ -#include "libc/intrin/bits.h" #include "libc/mem/internal.h" #include "libc/str/str.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /* TODO(jart): DELETE */ @@ -27,5 +25,4 @@ }) #endif /* concat */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ALG_ARRAYLIST_H_ */ diff --git a/libc/mem/arraylist2.internal.h b/libc/mem/arraylist2.internal.h index 1278c1b8f..4343df4c5 100644 --- a/libc/mem/arraylist2.internal.h +++ b/libc/mem/arraylist2.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_ALG_ARRAYLIST2_H_ #include "libc/mem/internal.h" #include "libc/str/str.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* TODO(jart): Fully develop these better macros. */ @@ -35,5 +34,4 @@ COSMOPOLITAN_C_START_ #endif /* CONCAT */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ALG_ARRAYLIST2_H_ */ diff --git a/libc/mem/bisect.internal.h b/libc/mem/bisect.internal.h index 1d97a9a62..2365f82cd 100644 --- a/libc/mem/bisect.internal.h +++ b/libc/mem/bisect.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_ALG_BISECT_H_ #define COSMOPOLITAN_LIBC_ALG_BISECT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ forceinline void *bisect(const void *k, const void *data, size_t n, size_t size, @@ -29,5 +28,4 @@ forceinline void *bisect(const void *k, const void *data, size_t n, size_t size, } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ALG_BISECT_H_ */ diff --git a/libc/mem/critbit0.h b/libc/mem/critbit0.h index 57cc963be..5e41c1c7e 100644 --- a/libc/mem/critbit0.h +++ b/libc/mem/critbit0.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ALG_CRITBIT0_H_ #define COSMOPOLITAN_LIBC_ALG_CRITBIT0_H_ #include "libc/stdbool.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § data structures » critical bit tree (for c strings) ─╬─│┼ @@ -24,5 +23,4 @@ intptr_t critbit0_allprefixed(struct critbit0 *, const char *, int critbit0_emplace(struct critbit0 *, const void *, size_t) paramsnonnull(); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ALG_CRITBIT0_H_ */ diff --git a/libc/mem/gc.h b/libc/mem/gc.h index a25317585..91b99d434 100644 --- a/libc/mem/gc.h +++ b/libc/mem/gc.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_MEM_GC_H_ #define COSMOPOLITAN_LIBC_MEM_GC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *_gc(void *); @@ -23,5 +22,4 @@ void _gc_free(void *); #endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_MEM_GC_H_ */ diff --git a/libc/mem/gc.internal.h b/libc/mem/gc.internal.h index ef7d6ee6d..2c0e24d6a 100644 --- a/libc/mem/gc.internal.h +++ b/libc/mem/gc.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_MEM_GC_INTERNAL_H_ #define COSMOPOLITAN_LIBC_MEM_GC_INTERNAL_H_ #include "libc/mem/gc.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define gc(THING) _gc(THING) #define defer(FN, ARG) _defer(FN, ARG) #define gclongjmp(JB, ARG) _gclongjmp(JB, ARG) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_MEM_GC_INTERNAL_H_ */ diff --git a/libc/mem/hook.internal.h b/libc/mem/hook.internal.h index b4b3b4471..037d61ecf 100644 --- a/libc/mem/hook.internal.h +++ b/libc/mem/hook.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_MEM_HOOK_H_ #define COSMOPOLITAN_LIBC_MEM_HOOK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern void (*hook_free)(void *); @@ -14,5 +13,4 @@ extern size_t (*hook_malloc_usable_size)(void *); extern size_t (*hook_bulk_free)(void *[], size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_MEM_HOOK_H_ */ diff --git a/libc/mem/internal.h b/libc/mem/internal.h index e98064516..4ad1ef3ff 100644 --- a/libc/mem/internal.h +++ b/libc/mem/internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_MEM_INTERNAL_H_ #define COSMOPOLITAN_LIBC_MEM_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct CritbitNode { @@ -13,5 +12,4 @@ int __putenv(char *, bool); bool __grow(void *, size_t *, size_t, size_t) paramsnonnull((1, 2)) libcesque; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_MEM_INTERNAL_H_ */ diff --git a/libc/mem/mem.h b/libc/mem/mem.h index ec78de68e..2c7115ab2 100644 --- a/libc/mem/mem.h +++ b/libc/mem/mem.h @@ -5,7 +5,6 @@ #define M_GRANULARITY (-2) #define M_MMAP_THRESHOLD (-3) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § dynamic memory ─╬─│┼ @@ -58,5 +57,4 @@ size_t malloc_set_footprint_limit(size_t); void malloc_inspect_all(void (*)(void *, void *, size_t, void *), void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_MEM_MEM_H_ */ diff --git a/libc/mem/realpath.c b/libc/mem/realpath.c index af4ba4b88..9bc83277e 100644 --- a/libc/mem/realpath.c +++ b/libc/mem/realpath.c @@ -28,7 +28,7 @@ #include "libc/assert.h" #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/safemacros.internal.h" #include "libc/limits.h" #include "libc/log/backtrace.internal.h" diff --git a/libc/mem/reverse.internal.h b/libc/mem/reverse.internal.h index 03bcc4027..07861b0ee 100644 --- a/libc/mem/reverse.internal.h +++ b/libc/mem/reverse.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_ALG_REVERSE_H_ #define COSMOPOLITAN_LIBC_ALG_REVERSE_H_ #include "libc/intrin/xchg.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Reverses array. @@ -27,5 +26,4 @@ Array; \ }) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ALG_REVERSE_H_ */ diff --git a/libc/mem/shuffle.internal.h b/libc/mem/shuffle.internal.h index 00dcda086..84fe18712 100644 --- a/libc/mem/shuffle.internal.h +++ b/libc/mem/shuffle.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_ #define COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_ #include "libc/intrin/xchg.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Fisher-Yates shuffle. @@ -19,5 +18,4 @@ } \ } while (0) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_ */ diff --git a/libc/mem/sortedints.internal.h b/libc/mem/sortedints.internal.h index a5ce6f6a3..f295b6132 100644 --- a/libc/mem/sortedints.internal.h +++ b/libc/mem/sortedints.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_MEM_SORTEDINTS_INTERNAL_H_ #define COSMOPOLITAN_LIBC_MEM_SORTEDINTS_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct SortedInts { @@ -15,5 +14,4 @@ int CountInt(const struct SortedInts *, int); int LeftmostInt(const struct SortedInts *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_MEM_SORTEDINTS_INTERNAL_H_ */ diff --git a/libc/nexgen32e/bench.h b/libc/nexgen32e/bench.h index b0c485b52..f13709195 100644 --- a/libc/nexgen32e/bench.h +++ b/libc/nexgen32e/bench.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_BENCH_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_BENCH_H_ #include "libc/nexgen32e/rdtsc.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * @fileoverview NexGen32e Microbenchmarking. @@ -73,5 +72,4 @@ Res; \ }) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_BENCH_H_ */ diff --git a/libc/nexgen32e/cachesize.h b/libc/nexgen32e/cachesize.h index e4e9dea6c..7a517a629 100644 --- a/libc/nexgen32e/cachesize.h +++ b/libc/nexgen32e/cachesize.h @@ -5,11 +5,9 @@ #define kCpuCacheTypeInstruction 2 #define kCpuCacheTypeUnified 3 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ unsigned _getcachesize(int, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_CACHESIZE_H_ */ diff --git a/libc/nexgen32e/cpuid4.internal.h b/libc/nexgen32e/cpuid4.internal.h index 613fd85a8..ef709cd0f 100644 --- a/libc/nexgen32e/cpuid4.internal.h +++ b/libc/nexgen32e/cpuid4.internal.h @@ -20,7 +20,6 @@ (CPUID4_WAYS_OF_ASSOCIATIVITY * CPUID4_PHYSICAL_LINE_PARTITIONS * \ CPUID4_SYSTEM_COHERENCY_LINE_SIZE * CPUID4_NUMBER_OF_SETS) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define CPUID4_ITERATE(I, FORM) \ @@ -47,5 +46,4 @@ COSMOPOLITAN_C_START_ } while (0) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_CPUID4_H_ */ diff --git a/libc/nexgen32e/crc32.h b/libc/nexgen32e/crc32.h index b87ae189c..2da22cf7c 100644 --- a/libc/nexgen32e/crc32.h +++ b/libc/nexgen32e/crc32.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_CRC32_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_CRC32_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint32_t kCrc32cTab[256]; @@ -9,5 +8,4 @@ void crc32init(uint32_t[hasatleast 256], uint32_t); uint32_t crc32c(uint32_t, const void *, size_t) nosideeffect; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_CRC32_H_ */ diff --git a/libc/nexgen32e/ffs.h b/libc/nexgen32e/ffs.h index 3fb7f6fda..ec5ec8757 100644 --- a/libc/nexgen32e/ffs.h +++ b/libc/nexgen32e/ffs.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_FFS_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_FFS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int ffs(int) pureconst; @@ -14,5 +13,4 @@ int ffsll(long long) pureconst; #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_FFS_H_ */ diff --git a/libc/nexgen32e/gc.internal.h b/libc/nexgen32e/gc.internal.h index 0bae234ed..cfc58a696 100644 --- a/libc/nexgen32e/gc.internal.h +++ b/libc/nexgen32e/gc.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_GC_INTERNAL_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_GC_INTERNAL_H_ #include "libc/nexgen32e/stackframe.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Garbage { @@ -19,5 +18,4 @@ struct Garbages { int64_t __gc(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_GC_INTERNAL_H_ */ diff --git a/libc/nexgen32e/hascharacter.internal.h b/libc/nexgen32e/hascharacter.internal.h index 505c624ee..d3ffe23ad 100644 --- a/libc/nexgen32e/hascharacter.internal.h +++ b/libc/nexgen32e/hascharacter.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_HASCHARACTER_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_HASCHARACTER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) forceinline bool HasCharacter(char c, const char *s) { unsigned i; @@ -32,5 +31,4 @@ forceinline bool HasCharacterWide(wchar_t c, const wchar_t *s) { return false; } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_HASCHARACTER_H_ */ diff --git a/libc/nexgen32e/kompressor.h b/libc/nexgen32e/kompressor.h index 948273911..faf9998c3 100644 --- a/libc/nexgen32e/kompressor.h +++ b/libc/nexgen32e/kompressor.h @@ -9,7 +9,6 @@ #define lz4len __lz4len #define lz4decode __lz4decode -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if 0 /*───────────────────────────────────────────────────────────────────────────│─╗ @@ -30,6 +29,5 @@ size_t lz4len(const void *blockdata, size_t blocksize); void *lz4decode(void *dest, const void *src); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _COSMO_SOURCE */ #endif /* COSMOPOLITAN_LIBC_KOMPRESSOR_KOMPRESSOR_H_ */ diff --git a/libc/nexgen32e/lz4.h b/libc/nexgen32e/lz4.h index fa63da86f..0505fab29 100644 --- a/libc/nexgen32e/lz4.h +++ b/libc/nexgen32e/lz4.h @@ -1,10 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_LZ4_H_ #define COSMOPOLITAN_LIBC_LZ4_H_ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § lz4 ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│─╝ - LZ4 is a framing format for REP MOVSB designed by Yann Collet. + LZ4 is a brilliant framing format for REP MOVSB designed by Yann Collet. @see https://github.com/lz4/lz4/blob/master/doc/lz4_Frame_format.md @see https://github.com/lz4/lz4/blob/master/doc/lz4_Block_format.md @@ -21,7 +21,6 @@ #define LZ4_BLOCKMAXSIZE_1MB 6 #define LZ4_BLOCKMAXSIZE_4MB 7 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § lz4 » frames ─╬─│┼ @@ -68,5 +67,4 @@ COSMOPOLITAN_C_START_ (LZ4_FRAME_BLOCKCHECKSUMFLAG(frame) ? sizeof(uint8_t) : 0)) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LZ4_H_ */ diff --git a/libc/nexgen32e/nexgen32e.h b/libc/nexgen32e/nexgen32e.h index 4a95f6002..f77d1d2ab 100644 --- a/libc/nexgen32e/nexgen32e.h +++ b/libc/nexgen32e/nexgen32e.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_NEXGEN32E_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_NEXGEN32E_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern long kHalfCache3; @@ -12,5 +11,4 @@ extern const unsigned char kTensIndex[64]; void CheckStackIsAligned(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_NEXGEN32E_H_ */ diff --git a/libc/nexgen32e/nt2sysv.h b/libc/nexgen32e/nt2sysv.h index 1ba5dc213..4b9373325 100644 --- a/libc/nexgen32e/nt2sysv.h +++ b/libc/nexgen32e/nt2sysv.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_NT2SYSV_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_NT2SYSV_H_ #include "libc/nexgen32e/trampoline.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Creates function to thunk FUNCTION from MSX64 to System V ABI. @@ -10,5 +9,4 @@ */ #define NT2SYSV(FUNCTION) TRAMPOLINE(FUNCTION, __nt2sysv) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_NT2SYSV_H_ */ diff --git a/libc/nexgen32e/rdtsc.h b/libc/nexgen32e/rdtsc.h index 46aef6718..8423d5ebd 100644 --- a/libc/nexgen32e/rdtsc.h +++ b/libc/nexgen32e/rdtsc.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_RDTSC_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_RDTSC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -63,5 +62,4 @@ COSMOPOLITAN_C_START_ #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_RDTSC_H_ */ diff --git a/libc/nexgen32e/rdtscp.h b/libc/nexgen32e/rdtscp.h index 053162ef0..7e8bfe779 100644 --- a/libc/nexgen32e/rdtscp.h +++ b/libc/nexgen32e/rdtscp.h @@ -3,7 +3,6 @@ #include "libc/dce.h" #include "libc/intrin/asmflag.h" #include "libc/nexgen32e/x86feature.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define TSC_AUX_CORE(MSR) ((MSR)&0xfff) @@ -61,5 +60,4 @@ COSMOPOLITAN_C_START_ }) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_RDTSCP_H_ */ diff --git a/libc/nexgen32e/sha.h b/libc/nexgen32e/sha.h index 4f022f05d..23287e9ac 100644 --- a/libc/nexgen32e/sha.h +++ b/libc/nexgen32e/sha.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_SHA_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_SHA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void sha1_transform_avx2(uint32_t[hasatleast 5], const void *, unsigned); @@ -9,5 +8,4 @@ void sha256_transform_rorx(uint32_t[hasatleast 8], const void *, unsigned); void sha256_transform_ni(uint32_t[hasatleast 8], const void *, unsigned); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_SHA_H_ */ diff --git a/libc/nexgen32e/stackframe.h b/libc/nexgen32e/stackframe.h index 04bd1e41e..895a109bd 100644 --- a/libc/nexgen32e/stackframe.h +++ b/libc/nexgen32e/stackframe.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_STACKFRAME_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_STACKFRAME_H_ #ifdef _COSMO_SOURCE -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct StackFrame { @@ -10,6 +9,5 @@ struct StackFrame { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _COSMO_SOURCE */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_STACKFRAME_H_ */ diff --git a/libc/nexgen32e/trampoline.h b/libc/nexgen32e/trampoline.h index a0c89aa8b..76612d40a 100644 --- a/libc/nexgen32e/trampoline.h +++ b/libc/nexgen32e/trampoline.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_TRAMPOLINE_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_TRAMPOLINE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define TRAMPOLINE(FUNCTION, THUNK) \ ({ \ @@ -16,5 +15,4 @@ Tramp; \ }) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_TRAMPOLINE_H_ */ diff --git a/libc/nexgen32e/vendor.internal.h b/libc/nexgen32e/vendor.internal.h index 949e0e865..fe313aa2c 100644 --- a/libc/nexgen32e/vendor.internal.h +++ b/libc/nexgen32e/vendor.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_VENDOR_H_ #define COSMOPOLITAN_LIBC_NEXGEN32E_VENDOR_H_ #include "libc/nexgen32e/kcpuids.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define IsAuthenticAMD() \ (kCpuids[KCPUIDS_0H][KCPUIDS_EBX] == 0x68747541 /* Auth */ && \ @@ -13,5 +12,4 @@ kCpuids[KCPUIDS_0H][KCPUIDS_EDX] == 0x49656e69 /* ineI */ && \ kCpuids[KCPUIDS_0H][KCPUIDS_ECX] == 0x6c65746e /* ntel */) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_VENDOR_H_ */ diff --git a/libc/nexgen32e/vidya.internal.h b/libc/nexgen32e/vidya.internal.h index 6891192a5..dfc24b783 100644 --- a/libc/nexgen32e/vidya.internal.h +++ b/libc/nexgen32e/vidya.internal.h @@ -17,7 +17,6 @@ #define VIDYA_SET_BLINKING 0x1003 #define VIDYA_SET_BLINKING_NONE 0x0000 -#if !(__ASSEMBLER__ + __LINKER__ + 0) enum VidyaMode { kVidyaModeMda = VIDYA_MODE_MDA, @@ -79,5 +78,4 @@ __far VidyaCell *vputs(__far VidyaCell *pos, const char *str); __far VidyaCell *vtput(__far VidyaCell *pos, const void *data, size_t size); __far VidyaCell *vscroll(__far VidyaCell *pos, size_t bytes); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_VIDYA_H_ */ diff --git a/libc/nt/accounting.h b/libc/nt/accounting.h index 616adaac6..36ff237d5 100644 --- a/libc/nt/accounting.h +++ b/libc/nt/accounting.h @@ -4,7 +4,6 @@ #include "libc/nt/struct/iocounters.h" #include "libc/nt/struct/memorystatusex.h" #include "libc/nt/thunk/msabi.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -70,5 +69,4 @@ int32_t SetProcessWorkingSetSizeEx(int64_t hProcess, #include "libc/nt/thunk/accounting.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ACCOUNTING_H_ */ diff --git a/libc/nt/automation.h b/libc/nt/automation.h index 7d2bd9189..f523bc5ee 100644 --- a/libc/nt/automation.h +++ b/libc/nt/automation.h @@ -27,7 +27,6 @@ │ cosmopolitan § new technology » aol hacking ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int64_t GetShellWindow(void); @@ -49,5 +48,4 @@ intptr_t CallNextHookEx(int64_t hhk, int nCode, uintptr_t wParam, intptr_t lParam); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_AUTOMATION_H_ */ diff --git a/libc/nt/comdlg.h b/libc/nt/comdlg.h index 66cd8ebdb..5d54629fe 100644 --- a/libc/nt/comdlg.h +++ b/libc/nt/comdlg.h @@ -26,12 +26,10 @@ │ cosmopolitan § new technology » common dialogs ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool32 GetOpenFileName(struct NtOpenFilename *arg); bool32 GetSaveFileName(struct NtOpenFilename *arg); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_COMDLG_H_ */ diff --git a/libc/nt/comms.h b/libc/nt/comms.h index 02b702f08..50267589b 100644 --- a/libc/nt/comms.h +++ b/libc/nt/comms.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_COMMS_H_ #define COSMOPOLITAN_LIBC_NT_COMMS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -32,5 +31,4 @@ bool32 TransmitCommChar(int64_t hFile, char cChar); bool32 ClearCommBreak(int64_t hFile); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_COMMS_H_ */ diff --git a/libc/nt/console.h b/libc/nt/console.h index 764ec1f65..36982c7ef 100644 --- a/libc/nt/console.h +++ b/libc/nt/console.h @@ -37,7 +37,6 @@ #define kNtAttachParentProcess -1u -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool32 WriteConsoleOutput(int64_t hConsoleOutput, @@ -111,5 +110,4 @@ bool32 SetConsoleCursorInfo( #include "libc/nt/thunk/console.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_CONSOLE_H_ */ diff --git a/libc/nt/createfile.h b/libc/nt/createfile.h index 82ee48e14..fe3ec4cab 100644 --- a/libc/nt/createfile.h +++ b/libc/nt/createfile.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_CREATEFILE_H_ #define COSMOPOLITAN_LIBC_NT_CREATEFILE_H_ #include "libc/nt/struct/securityattributes.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int64_t CreateFile( @@ -21,5 +20,4 @@ int64_t CreateFileA( int GetNtOpenFlags(int, int, uint32_t *, uint32_t *, uint32_t *, uint32_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_CREATEFILE_H_ */ diff --git a/libc/nt/debug.h b/libc/nt/debug.h index 1c3cc3ac8..2e6df954f 100644 --- a/libc/nt/debug.h +++ b/libc/nt/debug.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_DEBUG_H_ #define COSMOPOLITAN_LIBC_NT_DEBUG_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -37,5 +36,4 @@ int32_t ContinueDebugEvent(uint32_t dwProcessId, uint32_t dwThreadId, void FatalExit(int uExitCode); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_DEBUG_H_ */ diff --git a/libc/nt/dll.h b/libc/nt/dll.h index 21ab4eac1..860b0bf05 100644 --- a/libc/nt/dll.h +++ b/libc/nt/dll.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_DLL_H_ #define COSMOPOLITAN_LIBC_NT_DLL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -40,5 +39,4 @@ int32_t FreeLibrary(int64_t hLibModule); void *AddDllDirectory(const char16_t *NewDirectory); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_DLL_H_ */ diff --git a/libc/nt/efi.h b/libc/nt/efi.h index 3d6d02676..938cb0b3a 100644 --- a/libc/nt/efi.h +++ b/libc/nt/efi.h @@ -116,7 +116,6 @@ } \ } -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if defined(__GNUC__) && __GNUC__ >= 6 && !defined(__chibicc__) && \ @@ -565,5 +564,4 @@ typedef struct { } EFI_LOADED_IMAGE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_EFI_H_ */ diff --git a/libc/nt/enum/computernameformat.h b/libc/nt/enum/computernameformat.h index 4854d5edb..7fd014179 100644 --- a/libc/nt/enum/computernameformat.h +++ b/libc/nt/enum/computernameformat.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_COMPUTERNAMEFORMAT_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_COMPUTERNAMEFORMAT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define kNtComputerNameNetBios 0 #define kNtComputerNameDnsHostname 1 @@ -12,5 +11,4 @@ #define kNtComputerNamePhysicalDnsFullyQualified 7 #define kNtComputerName_MAX 8 -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_COMPUTERNAMEFORMAT_H_ */ diff --git a/libc/nt/enum/cw.h b/libc/nt/enum/cw.h index 4382aa7c5..4cb809b9d 100644 --- a/libc/nt/enum/cw.h +++ b/libc/nt/enum/cw.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_CW_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_CW_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define kNtCwUsedefault ((int)0x80000000) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_CW_H_ */ diff --git a/libc/nt/enum/fileinfobyhandleclass.h b/libc/nt/enum/fileinfobyhandleclass.h index 5de4cf8bc..4aa63c09e 100644 --- a/libc/nt/enum/fileinfobyhandleclass.h +++ b/libc/nt/enum/fileinfobyhandleclass.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_FILEINFOBYHANDLECLASS_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_FILEINFOBYHANDLECLASS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define kNtFileBasicInfo 0 /* struct NtFileBasicInformation */ #define kNtFileStandardInfo 1 /* struct NtFileStandardInformation */ @@ -27,5 +26,4 @@ #define kNtFileDispositionInfoEx 22 /* win10+ */ #define kNtFileRenameInfoEx 23 /* win10+ */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_FILEINFOBYHANDLECLASS_H_ */ diff --git a/libc/nt/enum/fillattribute.h b/libc/nt/enum/fillattribute.h index 83a5c33d3..02ec2f51e 100644 --- a/libc/nt/enum/fillattribute.h +++ b/libc/nt/enum/fillattribute.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_NTFILLATTRIBUTE_H_ #define COSMOPOLITAN_LIBC_NT_NTFILLATTRIBUTE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define kNtForegroundBlue 0x0001 #define kNtForegroundGreen 0x0002 @@ -11,5 +10,4 @@ #define kNtBackgroundRed 0x0040 #define kNtBackgroundIntensity 0x0080 -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NTFILLATTRIBUTE_H_ */ diff --git a/libc/nt/enum/idc.h b/libc/nt/enum/idc.h index 1cc625938..a25f313fc 100644 --- a/libc/nt/enum/idc.h +++ b/libc/nt/enum/idc.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_IDC_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_IDC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define kNtIdcArrow ((const char16_t *)32512) @@ -20,5 +19,4 @@ COSMOPOLITAN_C_START_ #define kNtIdcPerson ((const char16_t *)32672) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_IDC_H_ */ diff --git a/libc/nt/enum/importobjectnametype.h b/libc/nt/enum/importobjectnametype.h index 8b83c3793..fa5c9161a 100644 --- a/libc/nt/enum/importobjectnametype.h +++ b/libc/nt/enum/importobjectnametype.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_IMPORTOBJECTNAMETYPE_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_IMPORTOBJECTNAMETYPE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) enum NtImportObjectNameType { IMPORT_OBJECT_ORDINAL, @@ -10,5 +9,4 @@ enum NtImportObjectNameType { IMPORT_OBJECT_NAME_EXPORTAS }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_IMPORTOBJECTNAMETYPE_H_ */ diff --git a/libc/nt/enum/importobjecttype.h b/libc/nt/enum/importobjecttype.h index 9fbb3a6ed..d9bc905a9 100644 --- a/libc/nt/enum/importobjecttype.h +++ b/libc/nt/enum/importobjecttype.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_IMPORTOBJECTTYPE_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_IMPORTOBJECTTYPE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) enum NtImportObjectType { IMPORT_OBJECT_CODE, @@ -8,5 +7,4 @@ enum NtImportObjectType { IMPORT_OBJECT_CONST }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_IMPORTOBJECTTYPE_H_ */ diff --git a/libc/nt/enum/kwaitreason.h b/libc/nt/enum/kwaitreason.h index 1542a48e0..04d1a8b75 100644 --- a/libc/nt/enum/kwaitreason.h +++ b/libc/nt/enum/kwaitreason.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_KWAITREASON_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_KWAITREASON_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define kNtExecutive 0 #define kNtFreePage 1 @@ -31,5 +30,4 @@ #define kNtWrKernel 26 #define kNtMaximumWaitReason 27 -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_KWAITREASON_H_ */ diff --git a/libc/nt/enum/loadlibrarysearch.h b/libc/nt/enum/loadlibrarysearch.h index bd31e993d..8f5b58e15 100644 --- a/libc/nt/enum/loadlibrarysearch.h +++ b/libc/nt/enum/loadlibrarysearch.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_LOADLIBRARYSEARCH_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_LOADLIBRARYSEARCH_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define kNtLoadLibrarySearchApplicationDir 0x00000200u #define kNtLoadLibrarySearchSearchSystem32 0x00000800u #define kNtLoadLibrarySearchUserDirs 0x00000400u #define kNtLoadLibrarySearchDefaultDirs 0x00001000u -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_LOADLIBRARYSEARCH_H_ */ diff --git a/libc/nt/enum/mb.h b/libc/nt/enum/mb.h index edae1522b..b140661f1 100644 --- a/libc/nt/enum/mb.h +++ b/libc/nt/enum/mb.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_MB_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_MB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define kNtMbOk 0x00000000 #define kNtMbOkcancel 0x00000001 @@ -40,5 +39,4 @@ #define kNtMbModemask 0x00003000 #define kNtMbMiscmask 0x0000C000 -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_MB_H_ */ diff --git a/libc/nt/enum/sectioninherit.h b/libc/nt/enum/sectioninherit.h index 552e0ba5a..8b3d17dc0 100644 --- a/libc/nt/enum/sectioninherit.h +++ b/libc/nt/enum/sectioninherit.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_SECTIONINHERIT_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_SECTIONINHERIT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) enum NtSectionInherit { kNtViewShare = 1, kNtViewUnmap = 2 }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_SECTIONINHERIT_H_ */ diff --git a/libc/nt/enum/statfs.h b/libc/nt/enum/statfs.h index d626037b3..925237aec 100644 --- a/libc/nt/enum/statfs.h +++ b/libc/nt/enum/statfs.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_STATFS_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_STATFS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define kNtFileCasePreservedNames 0x00000002 @@ -25,5 +24,4 @@ COSMOPOLITAN_C_START_ #define kNtFileSupportsBlockRefcounting 0x08000000 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_STATFS_H_ */ diff --git a/libc/nt/enum/threadaccess.h b/libc/nt/enum/threadaccess.h index 1e7694be3..d2d4c0027 100644 --- a/libc/nt/enum/threadaccess.h +++ b/libc/nt/enum/threadaccess.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_THREADACCESS_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_THREADACCESS_H_ #include "libc/nt/enum/accessmask.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define kNtThreadTerminate 0x0001 #define kNtThreadSuspendResume 0x0002 @@ -17,5 +16,4 @@ #define kNtThreadResume 0x1000 #define kNtThreadAllAccess (kNtStandardRightsRequired | kNtSynchronize | 0xFFFF) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_THREADACCESS_H_ */ diff --git a/libc/nt/enum/threadinfoclass.h b/libc/nt/enum/threadinfoclass.h index 30b320b42..76e59b156 100644 --- a/libc/nt/enum/threadinfoclass.h +++ b/libc/nt/enum/threadinfoclass.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_THREADINFOCLASS_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_THREADINFOCLASS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) enum NtThreadInfoClass { kNtThreadBasicInformation, @@ -24,5 +23,4 @@ enum NtThreadInfoClass { kNtThreadInfoClass_MAX }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_THREADINFOCLASS_H_ */ diff --git a/libc/nt/enum/version.h b/libc/nt/enum/version.h index 48a45834f..f7201d81e 100644 --- a/libc/nt/enum/version.h +++ b/libc/nt/enum/version.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_VERSION_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_VERSION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Known versions of the New Technology executive. @@ -17,5 +16,4 @@ #define kNtVersionWindows2000 0x0500 /* the golden age */ #define kNtVersionFuture 0x0b00 -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_VERSION_H_ */ diff --git a/libc/nt/enum/wsaid.h b/libc/nt/enum/wsaid.h index 4fda23aa2..f0f81f683 100644 --- a/libc/nt/enum/wsaid.h +++ b/libc/nt/enum/wsaid.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_WSAID_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_WSAID_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define WSAID_WSAPOLL \ @@ -67,5 +66,4 @@ COSMOPOLITAN_C_START_ } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_WSAID_H_ */ diff --git a/libc/nt/events.h b/libc/nt/events.h index 4460eb0e9..c57389f22 100644 --- a/libc/nt/events.h +++ b/libc/nt/events.h @@ -28,7 +28,6 @@ │ cosmopolitan § new technology » events ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int32_t GetMessage(struct NtMsg *lpMsg, int64_t hWnd, uint32_t wMsgFilterMin, @@ -67,5 +66,4 @@ int32_t ResetEvent(int64_t hEvent); int32_t PulseEvent(int64_t hEvent); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_EVENTS_H_ */ diff --git a/libc/nt/files.h b/libc/nt/files.h index a6d50fbe2..fcbc294cb 100644 --- a/libc/nt/files.h +++ b/libc/nt/files.h @@ -44,7 +44,6 @@ #define kNtDuplicateCloseSource 1 #define kNtDuplicateSameAccess 2 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ intptr_t LoadResource(int64_t hModule, int64_t hResInfo); @@ -230,5 +229,4 @@ bool32 GetVolumeInformationByHandle(int64_t hFile, #include "libc/nt/thunk/files.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_FILES_H_ */ diff --git a/libc/nt/iocp.h b/libc/nt/iocp.h index ec261d6c5..e459d15ba 100644 --- a/libc/nt/iocp.h +++ b/libc/nt/iocp.h @@ -30,7 +30,6 @@ #define kNtFileSkipCompletionPortOnSuccess 1 #define kNtFileSkipSetEventOnHandle 2 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef void (*NtOverlappedCompletionRoutine)( @@ -73,5 +72,4 @@ bool32 WriteFileEx(int64_t hFile, const void *lpBuffer, NtOverlappedCompletionRoutine lpCompletionRoutine); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_IOCP_H_ */ diff --git a/libc/nt/ipc.h b/libc/nt/ipc.h index 96fda0771..9a93b9153 100644 --- a/libc/nt/ipc.h +++ b/libc/nt/ipc.h @@ -49,7 +49,6 @@ #define kNtPipeClientEnd 0x00000000 #define kNtPipeServerEnd 0x00000001 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool32 CreatePipe(int64_t *out_hReadPipe, int64_t *out_hWritePipe, @@ -91,5 +90,4 @@ bool32 GetNamedPipeInfo(int64_t hNamedPipe, uint32_t *opt_out_lpFlags, uint32_t *opt_out_lpMaxInstances); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_IPC_H_ */ diff --git a/libc/nt/iphlpapi.h b/libc/nt/iphlpapi.h index 4b55fe345..e6122c286 100644 --- a/libc/nt/iphlpapi.h +++ b/libc/nt/iphlpapi.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_IPHLPAPI_H_ #define COSMOPOLITAN_LIBC_NT_IPHLPAPI_H_ #include "libc/nt/struct/ipadapteraddresses.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -33,5 +32,4 @@ uint32_t GetAdaptersAddresses(uint32_t Family, uint32_t Flags, void *Reserved, uint32_t *SizePointer); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_IPHLPAPI_H_ */ diff --git a/libc/nt/memory.h b/libc/nt/memory.h index cfdc01ff1..b9c716f71 100644 --- a/libc/nt/memory.h +++ b/libc/nt/memory.h @@ -31,7 +31,6 @@ #define kNtNumaNoPreferredNode 0xffffffffu -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *LocalFree(void *hMem); @@ -93,5 +92,4 @@ void *GlobalFree(void *hMem); #include "libc/nt/thunk/memory.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_MEMORY_H_ */ diff --git a/libc/nt/messagebox.h b/libc/nt/messagebox.h index 309a5c132..aab368550 100644 --- a/libc/nt/messagebox.h +++ b/libc/nt/messagebox.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_MESSAGEBOX_H_ #define COSMOPOLITAN_LIBC_NT_MESSAGEBOX_H_ #include "libc/nt/enum/dialogresult.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int MessageBox(int64_t hWnd, const char16_t *lpText, const char16_t *lpCaption, @@ -11,5 +10,4 @@ int MessageBoxEx(int64_t hWnd, const char16_t *lpText, uint16_t wLanguageId); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_MESSAGEBOX_H_ */ diff --git a/libc/nt/nt/debug.h b/libc/nt/nt/debug.h index 8cf191a77..ac133875a 100644 --- a/libc/nt/nt/debug.h +++ b/libc/nt/nt/debug.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_NT_DEBUG_H_ #include "libc/nt/enum/status.h" #include "libc/nt/struct/context.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -36,5 +35,4 @@ COSMOPOLITAN_C_START_ NtStatus NtContinue(struct NtContext *Context, int32_t TestAlert); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_DEBUG_H_ */ diff --git a/libc/nt/nt/file.h b/libc/nt/nt/file.h index a34eeec90..ca9ac8988 100644 --- a/libc/nt/nt/file.h +++ b/libc/nt/nt/file.h @@ -5,7 +5,6 @@ #include "libc/nt/struct/iostatusblock.h" #include "libc/nt/thunk/msabi.h" #include "libc/nt/typedef/ioapcroutine.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -94,5 +93,4 @@ NtStatus RtlNtStatusToDosError(NtStatus Status); #include "libc/nt/thunk/ntfile.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_FILE_H_ */ diff --git a/libc/nt/nt/ipc.h b/libc/nt/nt/ipc.h index 3cf8357d9..2010fb983 100644 --- a/libc/nt/nt/ipc.h +++ b/libc/nt/nt/ipc.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_NT_IPC_H_ #define COSMOPOLITAN_LIBC_NT_NT_IPC_H_ #include "libc/nt/enum/status.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -46,5 +45,4 @@ NtStatus NtCreateNamedPipeFile(int64_t *out_FileHandle, uint32_t DesiredAccess, int64_t *opt_DefaultTimeout); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_IPC_H_ */ diff --git a/libc/nt/nt/key.h b/libc/nt/nt/key.h index 795e65c4b..f28cba0dd 100644 --- a/libc/nt/nt/key.h +++ b/libc/nt/nt/key.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_NT_EVENT_H_ #include "libc/nt/enum/status.h" #include "libc/nt/struct/objectattributes.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -44,5 +43,4 @@ NtStatus NtWaitForKeyedEvent(int64_t KeyedEventHandle, void *KeyValue, bool32 Alertable, int64_t *Timeout); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_EVENT_H_ */ diff --git a/libc/nt/nt/loader.h b/libc/nt/nt/loader.h index 2347fe042..59d8eb377 100644 --- a/libc/nt/nt/loader.h +++ b/libc/nt/nt/loader.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_NT_LOADER_H_ #include "libc/nt/enum/status.h" #include "libc/nt/typedef/wambda.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -50,5 +49,4 @@ NtStatus LdrGetDllHandle(const char16_t *opt_PathToFile, uint32_t opt_Unused, void **out_ModuleHandle); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_LOADER_H_ */ diff --git a/libc/nt/nt/memory.h b/libc/nt/nt/memory.h index afa9ac3f4..4fcca0e80 100644 --- a/libc/nt/nt/memory.h +++ b/libc/nt/nt/memory.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_NT_MEMORY_H_ #include "libc/nt/enum/memoryinformationclass.h" #include "libc/nt/enum/status.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -53,5 +52,4 @@ NtStatus NtWriteVirtualMemory(int64_t ProcessHandle, void *BaseAddress, size_t *opt_out_ReturnLength); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_MEMORY_H_ */ diff --git a/libc/nt/nt/process.h b/libc/nt/nt/process.h index 09878a764..a158c43d9 100644 --- a/libc/nt/nt/process.h +++ b/libc/nt/nt/process.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_NT_PROCESS_H_ #include "libc/nt/enum/status.h" #include "libc/nt/thunk/msabi.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -81,5 +80,4 @@ NtStatus RtlCloneUserProcess( #include "libc/nt/nt/thunk/process.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_PROCESS_H_ */ diff --git a/libc/nt/nt/sections.h b/libc/nt/nt/sections.h index ef09cef77..849451267 100644 --- a/libc/nt/nt/sections.h +++ b/libc/nt/nt/sections.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_NT_SECTIONS_H_ #include "libc/nt/enum/status.h" #include "libc/nt/struct/objectattributes.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ NtStatus NtCreateSection(int64_t *out_SectionHandle, uint32_t DesiredAccess, @@ -23,5 +22,4 @@ NtStatus NtQuerySection(int64_t SectionHandle, int SectionInformationClass, uint32_t *opt_out_ResultLength); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_SECTIONS_H_ */ diff --git a/libc/nt/nt/signing.h b/libc/nt/nt/signing.h index 59e6f22f2..fe4ca0cf1 100644 --- a/libc/nt/nt/signing.h +++ b/libc/nt/nt/signing.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_NT_SIGNING_H_ #define COSMOPOLITAN_LIBC_NT_NT_SIGNING_H_ #include "libc/nt/enum/status.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -36,5 +35,4 @@ NtStatus CsrClientCallServer(void *inout_Message, void *unknown, uint32_t Opcode, uint32_t Size); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_SIGNING_H_ */ diff --git a/libc/nt/nt/thread.h b/libc/nt/nt/thread.h index a309003b8..d191d186d 100644 --- a/libc/nt/nt/thread.h +++ b/libc/nt/nt/thread.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_NT_THREAD_H_ #include "libc/nt/enum/status.h" #include "libc/nt/enum/threadinfoclass.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -73,5 +72,4 @@ NtStatus NtSetInformationThread(int64_t ThreadHandle, uint32_t ThreadInformationLength); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_THREAD_H_ */ diff --git a/libc/nt/nt/time.h b/libc/nt/nt/time.h index 4694c5ed8..48aad1789 100644 --- a/libc/nt/nt/time.h +++ b/libc/nt/nt/time.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_NT_THREAD_H_ #include "libc/nt/enum/status.h" #include "libc/nt/thunk/msabi.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -39,5 +38,4 @@ NtStatus NtDelayExecution(bool32 alertable, int64_t *AbsCobolOrNegRelHectoNano); #include "libc/nt/nt/thunk/time.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NT_THREAD_H_ */ diff --git a/libc/nt/ntdll.h b/libc/nt/ntdll.h index e111c5b10..04a8e60f3 100644 --- a/libc/nt/ntdll.h +++ b/libc/nt/ntdll.h @@ -10,7 +10,6 @@ #include "libc/nt/thunk/msabi.h" #include "libc/nt/typedef/ioapcroutine.h" #include "libc/nt/typedef/pknormalroutine.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -229,5 +228,4 @@ NtStatus RtlWalkHeap(int64_t heap, void *out_Info); #include "libc/nt/thunk/ntdll.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NTDLL_H_ */ diff --git a/libc/nt/paint.h b/libc/nt/paint.h index 3d727ec63..6eafb2a84 100644 --- a/libc/nt/paint.h +++ b/libc/nt/paint.h @@ -4,7 +4,6 @@ #include "libc/nt/struct/paintstruct.h" #include "libc/nt/struct/rect.h" #include "libc/nt/thunk/msabi.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § new technology » cpu graphics ─╬─│┼ @@ -42,5 +41,4 @@ bool32 RestoreDC(int64_t hdc, int nSavedDC); #include "libc/nt/thunk/paint.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_PAINT_H_ */ diff --git a/libc/nt/pdh.h b/libc/nt/pdh.h index c3e0b09c5..1c51aff26 100644 --- a/libc/nt/pdh.h +++ b/libc/nt/pdh.h @@ -27,7 +27,6 @@ │ cosmopolitan § new technology » performance counters ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int PdhOpenQuery(const char16_t *opt_szDataSource, uint32_t *dwUserData, @@ -44,5 +43,4 @@ int PdhGetFormattedCounterValue(int64_t hCounter, uint32_t dwFormat, struct NtPdhFmtCountervalue *out_pValue); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_PDH_H_ */ diff --git a/libc/nt/privilege.h b/libc/nt/privilege.h index 988d9340f..95088a34a 100644 --- a/libc/nt/privilege.h +++ b/libc/nt/privilege.h @@ -32,7 +32,6 @@ #define kNtSePrivilegeRemoved 0x00000004u #define kNtSePrivilegeUsedForAccess 0x80000000u -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool32 LookupPrivilegeValue(const char16_t *opt_lpSystemName, @@ -48,5 +47,4 @@ bool32 ImpersonateSelf(int kNtSecurityImpersonationLevel); bool32 RevertToSelf(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_PRIVILEGE_H_ */ diff --git a/libc/nt/process.h b/libc/nt/process.h index 1d2ce2e02..407e2f0e0 100644 --- a/libc/nt/process.h +++ b/libc/nt/process.h @@ -31,7 +31,6 @@ │ cosmopolitan § new technology » processes ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool32 CreateProcess(const char16_t *opt_lpApplicationName, @@ -96,5 +95,4 @@ uint32_t GetModuleBaseName(int64_t hProcess, int64_t opt_hModule, #include "libc/nt/thunk/process.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_PROCESS_H_ */ diff --git a/libc/nt/registry.h b/libc/nt/registry.h index 58de3b629..d7f8abb99 100644 --- a/libc/nt/registry.h +++ b/libc/nt/registry.h @@ -44,7 +44,6 @@ #define kNtHkeyDynData 0x80000006l #define kNtHkeyCurrentUserLocalSettings 0x80000007l -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int RegOpenKey(int64_t hKey, const char16_t *opt_lpSubKey, @@ -133,5 +132,4 @@ int RegSetKeySecurity(int64_t hKey, uint32_t SecurityInformation, int RegUnLoadKey(int64_t hKey, const char16_t *lpSubKey); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_REGISTRY_H_ */ diff --git a/libc/nt/runtime.h b/libc/nt/runtime.h index cd2902bfa..5248816a3 100644 --- a/libc/nt/runtime.h +++ b/libc/nt/runtime.h @@ -20,7 +20,6 @@ #define GetCurrentProcess() -1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char16_t *GetCommandLine(void) nosideeffect; @@ -49,5 +48,4 @@ uint32_t GetModuleFileName(int64_t hModule, char16_t *lpFilename, #include "libc/nt/thunk/runtime.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_RUNTIME_H_ */ diff --git a/libc/nt/signals.h b/libc/nt/signals.h index 7ca3c71c3..e56d68606 100644 --- a/libc/nt/signals.h +++ b/libc/nt/signals.h @@ -28,7 +28,6 @@ │ cosmopolitan § new technology » signals ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef int (*NtTopLevelExceptionFilter)(const struct NtExceptionPointers *); @@ -51,5 +50,4 @@ NtTopLevelExceptionFilter SetUnhandledExceptionFilter( #include "libc/nt/thunk/signals.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_EXCEPTIONS_H_ */ diff --git a/libc/nt/startupinfo.h b/libc/nt/startupinfo.h index 791975e63..e03f8e0ee 100644 --- a/libc/nt/startupinfo.h +++ b/libc/nt/startupinfo.h @@ -3,7 +3,6 @@ #include "libc/nt/struct/procthreadattributelist.h" #include "libc/nt/struct/startupinfo.h" #include "libc/nt/thunk/msabi.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define kNtProcThreadAttributeParentProcess 0x00020000 @@ -25,5 +24,4 @@ void DeleteProcThreadAttributeList( #include "libc/nt/thunk/startupinfo.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_NTSTARTUPINFO_H_ */ diff --git a/libc/nt/struct/acl.h b/libc/nt/struct/acl.h index 9b374d9ed..78004ab58 100644 --- a/libc/nt/struct/acl.h +++ b/libc/nt/struct/acl.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_ACL_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_ACL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtAcl { uint8_t AclRevision; @@ -10,5 +9,4 @@ struct NtAcl { uint16_t Sbz2; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_ACL_H_ */ diff --git a/libc/nt/struct/afd.h b/libc/nt/struct/afd.h index 94c151ccd..71e412473 100644 --- a/libc/nt/struct/afd.h +++ b/libc/nt/struct/afd.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_AFD_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_AFD_H_ #include "libc/nt/enum/status.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtAfdPollHandleInfo { @@ -18,5 +17,4 @@ struct NtAfdPollInfo { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_AFD_H_ */ diff --git a/libc/nt/struct/ansistring.h b/libc/nt/struct/ansistring.h index 58195f4cf..6760c858f 100644 --- a/libc/nt/struct/ansistring.h +++ b/libc/nt/struct/ansistring.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_ANSISTRING_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_ANSISTRING_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtAnsiString { unsigned short Length; @@ -8,5 +7,4 @@ struct NtAnsiString { char *Buffer; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_ANSISTRING_H_ */ diff --git a/libc/nt/struct/byhandlefileinformation.h b/libc/nt/struct/byhandlefileinformation.h index 0a258e9a1..1cfdaabd0 100644 --- a/libc/nt/struct/byhandlefileinformation.h +++ b/libc/nt/struct/byhandlefileinformation.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_BYHANDLEFILEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_BYHANDLEFILEINFORMATION_H_ #include "libc/nt/struct/filetime.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtByHandleFileInformation { uint32_t dwFileAttributes; /* ←NtFileFlagAndAttributes */ @@ -16,5 +15,4 @@ struct NtByHandleFileInformation { uint32_t nFileIndexLow; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_BYHANDLEFILEINFORMATION_H_ */ diff --git a/libc/nt/struct/charinfo.h b/libc/nt/struct/charinfo.h index c66621db6..1ae411076 100644 --- a/libc/nt/struct/charinfo.h +++ b/libc/nt/struct/charinfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_CHARINFO_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_CHARINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtCharInfo { union { @@ -10,5 +9,4 @@ struct NtCharInfo { uint16_t Attributes; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_CHARINFO_H_ */ diff --git a/libc/nt/struct/clientid.h b/libc/nt/struct/clientid.h index 05b1e03f8..484c68060 100644 --- a/libc/nt/struct/clientid.h +++ b/libc/nt/struct/clientid.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_CLIENTID_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_CLIENTID_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtClientId { void *UniqueProcess; void *UniqueThread; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_CLIENTID_H_ */ diff --git a/libc/nt/struct/consolecursorinfo.h b/libc/nt/struct/consolecursorinfo.h index 2aca0f5b7..b54281a2b 100644 --- a/libc/nt/struct/consolecursorinfo.h +++ b/libc/nt/struct/consolecursorinfo.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_CONSOLECURSORINFO_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_CONSOLECURSORINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtConsoleCursorInfo { uint32_t dwSize; bool32 bVisible; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_CONSOLECURSORINFO_H_ */ diff --git a/libc/nt/struct/consolescreenbufferinfo.h b/libc/nt/struct/consolescreenbufferinfo.h index 3ca6757ea..234a4ef34 100644 --- a/libc/nt/struct/consolescreenbufferinfo.h +++ b/libc/nt/struct/consolescreenbufferinfo.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_CONSOLESCREENBUFFERINFO_H_ #include "libc/nt/struct/coord.h" #include "libc/nt/struct/smallrect.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtConsoleScreenBufferInfo { struct NtCoord dwSize; @@ -12,5 +11,4 @@ struct NtConsoleScreenBufferInfo { struct NtCoord dwMaximumWindowSize; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_CONSOLESCREENBUFFERINFO_H_ */ diff --git a/libc/nt/struct/consolescreenbufferinfoex.h b/libc/nt/struct/consolescreenbufferinfoex.h index 087f571a7..2f910a8d3 100644 --- a/libc/nt/struct/consolescreenbufferinfoex.h +++ b/libc/nt/struct/consolescreenbufferinfoex.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_CONSOLESCREENBUFFERINFOEX_H_ #include "libc/nt/struct/coord.h" #include "libc/nt/struct/smallrect.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtConsoleScreenBufferInfoEx { uint32_t cbSize; /* sizeof(struct NtConsoleScreenBufferInfoEx) */ @@ -16,5 +15,4 @@ struct NtConsoleScreenBufferInfoEx { uint32_t ColorTable[16]; /* 0x00BBGGRR */ }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_CONSOLESCREENBUFFERINFOEX_H_ */ diff --git a/libc/nt/struct/consoleselectioninfo.h b/libc/nt/struct/consoleselectioninfo.h index 270b30a56..160540429 100644 --- a/libc/nt/struct/consoleselectioninfo.h +++ b/libc/nt/struct/consoleselectioninfo.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_CONSOLESELECTIONINFO_H_ #include "libc/nt/struct/coord.h" #include "libc/nt/struct/smallrect.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtConsoleSelectionInfo { uint32_t dwFlags; @@ -10,5 +9,4 @@ struct NtConsoleSelectionInfo { struct NtSmallRect srSelection; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_CONSOLESELECTIONINFO_H_ */ diff --git a/libc/nt/struct/context.h b/libc/nt/struct/context.h index 6bb5e58e6..406b33c7c 100644 --- a/libc/nt/struct/context.h +++ b/libc/nt/struct/context.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_CONTEXT_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_CONTEXT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtM128A { uint64_t Low; @@ -55,5 +54,4 @@ struct NtContext { uint64_t LastExceptionFromRip; } forcealign(16); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_CONTEXT_H_ */ diff --git a/libc/nt/struct/coord.h b/libc/nt/struct/coord.h index e4c0d0c41..5c71b1f0c 100644 --- a/libc/nt/struct/coord.h +++ b/libc/nt/struct/coord.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_COORD_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_COORD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtCoord { int16_t X; int16_t Y; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_COORD_H_ */ diff --git a/libc/nt/struct/criticalsection.h b/libc/nt/struct/criticalsection.h index 350a061b5..9eb1e51fa 100644 --- a/libc/nt/struct/criticalsection.h +++ b/libc/nt/struct/criticalsection.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_CRITICALSECTION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_CRITICALSECTION_H_ #include "libc/nt/struct/criticalsectiondebug.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtCriticalSection { struct NtCriticalSectionDebug *DebugInfo; @@ -12,5 +11,4 @@ struct NtCriticalSection { uintptr_t SpinCount; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_CRITICALSECTION_H_ */ diff --git a/libc/nt/struct/criticalsectiondebug.h b/libc/nt/struct/criticalsectiondebug.h index 8d5cae634..a5e54c759 100644 --- a/libc/nt/struct/criticalsectiondebug.h +++ b/libc/nt/struct/criticalsectiondebug.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_CRITICALSECTIONDEBUG_H_ #include "libc/nt/struct/criticalsection.h" #include "libc/nt/struct/linkedlist.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtCriticalSectionDebug { uint16_t Type; @@ -14,5 +13,4 @@ struct NtCriticalSectionDebug { uint32_t Spare[2]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_CRITICALSECTIONDEBUG_H_ */ diff --git a/libc/nt/struct/drawtextparams.h b/libc/nt/struct/drawtextparams.h index 2be46c2f3..d5de38d06 100644 --- a/libc/nt/struct/drawtextparams.h +++ b/libc/nt/struct/drawtextparams.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_DRAWTEXTPARAMS_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_DRAWTEXTPARAMS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtDrawTextParams { @@ -12,5 +11,4 @@ struct NtDrawTextParams { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_DRAWTEXTPARAMS_H_ */ diff --git a/libc/nt/struct/editmenu.h b/libc/nt/struct/editmenu.h index 73209684e..a1ef81d7a 100644 --- a/libc/nt/struct/editmenu.h +++ b/libc/nt/struct/editmenu.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_EDITMENU_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_EDITMENU_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtEditMenu { int64_t hmenu; @@ -12,5 +11,4 @@ struct NtEditMenu { uint16_t idUndo; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_EDITMENU_H_ */ diff --git a/libc/nt/struct/exceptionframe.h b/libc/nt/struct/exceptionframe.h index 59449caca..23334db31 100644 --- a/libc/nt/struct/exceptionframe.h +++ b/libc/nt/struct/exceptionframe.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_EXCEPTIONFRAME_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_EXCEPTIONFRAME_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtExceptionFrame { struct NtExceptionFrame *Prev; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_EXCEPTIONFRAME_H_ */ diff --git a/libc/nt/struct/fdset.h b/libc/nt/struct/fdset.h index 73fd089e0..1f8a37c9c 100644 --- a/libc/nt/struct/fdset.h +++ b/libc/nt/struct/fdset.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FDSET_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FDSET_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtFdSet { @@ -9,5 +8,4 @@ struct NtFdSet { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FDSET_H_ */ diff --git a/libc/nt/struct/fileaccessinformation.h b/libc/nt/struct/fileaccessinformation.h index 4049ae986..eb70ff022 100644 --- a/libc/nt/struct/fileaccessinformation.h +++ b/libc/nt/struct/fileaccessinformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEACCESSINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEACCESSINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileAccessInformation { uint32_t AccessFlags; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEACCESSINFORMATION_H_ */ diff --git a/libc/nt/struct/filealignmentinformation.h b/libc/nt/struct/filealignmentinformation.h index 67008b930..d4966555c 100644 --- a/libc/nt/struct/filealignmentinformation.h +++ b/libc/nt/struct/filealignmentinformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEALIGNMENTINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEALIGNMENTINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileAlignmentInformation { uint32_t AlignmentRequirement; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEALIGNMENTINFORMATION_H_ */ diff --git a/libc/nt/struct/fileallinformation.h b/libc/nt/struct/fileallinformation.h index 4a6ebfeb7..6e81dac3a 100644 --- a/libc/nt/struct/fileallinformation.h +++ b/libc/nt/struct/fileallinformation.h @@ -9,7 +9,6 @@ #include "libc/nt/struct/filenameinformation.h" #include "libc/nt/struct/filepositioninformation.h" #include "libc/nt/struct/filestandardinformation.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileAllInformation { struct NtFileBasicInformation BasicInformation; @@ -23,5 +22,4 @@ struct NtFileAllInformation { struct NtFileNameInformation NameInformation; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEALLINFORMATION_H_ */ diff --git a/libc/nt/struct/fileallocationinformation.h b/libc/nt/struct/fileallocationinformation.h index d95fd274c..01921ff35 100644 --- a/libc/nt/struct/fileallocationinformation.h +++ b/libc/nt/struct/fileallocationinformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEALLOCATIONINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEALLOCATIONINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileAllocationInformation { int64_t AllocationSize; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEALLOCATIONINFORMATION_H_ */ diff --git a/libc/nt/struct/fileattributetaginformation.h b/libc/nt/struct/fileattributetaginformation.h index 76ce8e382..f75dc5403 100644 --- a/libc/nt/struct/fileattributetaginformation.h +++ b/libc/nt/struct/fileattributetaginformation.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEATTRIBUTETAGINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEATTRIBUTETAGINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileAttributeTagInformation { uint32_t FileAttributes; uint32_t ReparseTag; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEATTRIBUTETAGINFORMATION_H_ */ diff --git a/libc/nt/struct/filebasicinfo.h b/libc/nt/struct/filebasicinfo.h index 584b57382..83811dc79 100644 --- a/libc/nt/struct/filebasicinfo.h +++ b/libc/nt/struct/filebasicinfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEBASICINFO_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEBASICINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileBasicInfo { int64_t CreationTime; /* in 100ns units */ @@ -10,5 +9,4 @@ struct NtFileBasicInfo { uint32_t FileAttributes; /* kNtFileAttributeXXX */ }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEBASICINFO_H_ */ diff --git a/libc/nt/struct/filebasicinformation.h b/libc/nt/struct/filebasicinformation.h index d91db4ae0..b3de9fbdb 100644 --- a/libc/nt/struct/filebasicinformation.h +++ b/libc/nt/struct/filebasicinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEBASICINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEBASICINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileBasicInformation { int64_t CreationTime; /* in 100ns units */ @@ -10,5 +9,4 @@ struct NtFileBasicInformation { uint32_t FileAttributes; /* kNtFileAttributeXXX */ }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEBASICINFORMATION_H_ */ diff --git a/libc/nt/struct/filebothdirectoryinformation.h b/libc/nt/struct/filebothdirectoryinformation.h index 29087d630..9b22029b1 100644 --- a/libc/nt/struct/filebothdirectoryinformation.h +++ b/libc/nt/struct/filebothdirectoryinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEBOTHDIRECTORYINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEBOTHDIRECTORYINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtFileBothDirectoryInformation { @@ -21,5 +20,4 @@ struct NtFileBothDirectoryInformation { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEBOTHDIRECTORYINFORMATION_H_ */ diff --git a/libc/nt/struct/filecompressioninfo.h b/libc/nt/struct/filecompressioninfo.h index 58402826c..60ca84b03 100644 --- a/libc/nt/struct/filecompressioninfo.h +++ b/libc/nt/struct/filecompressioninfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILECOMPRESSIONINFO_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILECOMPRESSIONINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileCompressionInfo { int64_t CompressedFileSize; @@ -11,5 +10,4 @@ struct NtFileCompressionInfo { uint8_t Reserved[3]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILECOMPRESSIONINFO_H_ */ diff --git a/libc/nt/struct/filedirectoryinformation.h b/libc/nt/struct/filedirectoryinformation.h index badf4fd2d..bd067c38a 100644 --- a/libc/nt/struct/filedirectoryinformation.h +++ b/libc/nt/struct/filedirectoryinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEDIRECTORYINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEDIRECTORYINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileDirectoryInformation { uint32_t NextEntryOffset; @@ -16,5 +15,4 @@ struct NtFileDirectoryInformation { char16_t FileName[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEDIRECTORYINFORMATION_H_ */ diff --git a/libc/nt/struct/filedispositioninformation.h b/libc/nt/struct/filedispositioninformation.h index ed7b685f1..ea7b344ac 100644 --- a/libc/nt/struct/filedispositioninformation.h +++ b/libc/nt/struct/filedispositioninformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEDISPOSITIONINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEDISPOSITIONINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileDispositionInformation { bool32 DoDeleteFile; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEDISPOSITIONINFORMATION_H_ */ diff --git a/libc/nt/struct/fileeainformation.h b/libc/nt/struct/fileeainformation.h index 54597ba48..a7822fec5 100644 --- a/libc/nt/struct/fileeainformation.h +++ b/libc/nt/struct/fileeainformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEEAINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEEAINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileEaInformation { uint32_t EaSize; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEEAINFORMATION_H_ */ diff --git a/libc/nt/struct/fileendoffileinformation.h b/libc/nt/struct/fileendoffileinformation.h index 4c840ae36..a7c5989f4 100644 --- a/libc/nt/struct/fileendoffileinformation.h +++ b/libc/nt/struct/fileendoffileinformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEENDOFFILEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEENDOFFILEINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct FileEndOfFileInformation { int64_t EndOfFile; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEENDOFFILEINFORMATION_H_ */ diff --git a/libc/nt/struct/filefsfullsizeinformation.h b/libc/nt/struct/filefsfullsizeinformation.h index dfb7c0840..7ae65c245 100644 --- a/libc/nt/struct/filefsfullsizeinformation.h +++ b/libc/nt/struct/filefsfullsizeinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEFSFULLSIZEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEFSFULLSIZEINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtFileFsFullSizeInformation { @@ -12,5 +11,4 @@ struct NtFileFsFullSizeInformation { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEFSFULLSIZEINFORMATION_H_ */ diff --git a/libc/nt/struct/filefulldirectoryinformation.h b/libc/nt/struct/filefulldirectoryinformation.h index a07f12c47..24022709a 100644 --- a/libc/nt/struct/filefulldirectoryinformation.h +++ b/libc/nt/struct/filefulldirectoryinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEFULLDIRECTORYINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEFULLDIRECTORYINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileFullDirectoryInformation { uint32_t NextEntryOffset; @@ -17,5 +16,4 @@ struct NtFileFullDirectoryInformation { char16_t FileName[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEFULLDIRECTORYINFORMATION_H_ */ diff --git a/libc/nt/struct/filefulleainformation.h b/libc/nt/struct/filefulleainformation.h index f352d32dc..1ae46bb5d 100644 --- a/libc/nt/struct/filefulleainformation.h +++ b/libc/nt/struct/filefulleainformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEFULLEAINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEFULLEAINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileFullEaInformation { uint32_t NextEntryOffset; @@ -10,5 +9,4 @@ struct NtFileFullEaInformation { char EaName[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEFULLEAINFORMATION_H_ */ diff --git a/libc/nt/struct/fileinternalinformation.h b/libc/nt/struct/fileinternalinformation.h index 0b7e25326..2d119ab2a 100644 --- a/libc/nt/struct/fileinternalinformation.h +++ b/libc/nt/struct/fileinternalinformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEINTERNALINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEINTERNALINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileInternalInformation { int64_t IndexNumber; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEINTERNALINFORMATION_H_ */ diff --git a/libc/nt/struct/filemailslotqueryinformation.h b/libc/nt/struct/filemailslotqueryinformation.h index 2c442037f..fb674530d 100644 --- a/libc/nt/struct/filemailslotqueryinformation.h +++ b/libc/nt/struct/filemailslotqueryinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEMAILSLOTQUERYINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEMAILSLOTQUERYINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileMailslotQueryInformation { uint32_t MaximumMessageSize; @@ -10,5 +9,4 @@ struct NtFileMailslotQueryInformation { int64_t ReadTimeout; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEMAILSLOTQUERYINFORMATION_H_ */ diff --git a/libc/nt/struct/filemailslotsetinformation.h b/libc/nt/struct/filemailslotsetinformation.h index 8bf13d9eb..f2fa5f281 100644 --- a/libc/nt/struct/filemailslotsetinformation.h +++ b/libc/nt/struct/filemailslotsetinformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEMAILSLOTSETINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEMAILSLOTSETINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileMailslotSetInformation { int64_t ReadTimeout; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEMAILSLOTSETINFORMATION_H_ */ diff --git a/libc/nt/struct/filemodeinformation.h b/libc/nt/struct/filemodeinformation.h index d53330016..fc86143a6 100644 --- a/libc/nt/struct/filemodeinformation.h +++ b/libc/nt/struct/filemodeinformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEMODEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEMODEINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileModeInformation { uint32_t Mode; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEMODEINFORMATION_H_ */ diff --git a/libc/nt/struct/filenameinformation.h b/libc/nt/struct/filenameinformation.h index 0c0607f8b..a8f15be01 100644 --- a/libc/nt/struct/filenameinformation.h +++ b/libc/nt/struct/filenameinformation.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILENAMEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILENAMEINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileNameInformation { uint32_t FileNameLength; char16_t FileName[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILENAMEINFORMATION_H_ */ diff --git a/libc/nt/struct/filenamesinformation.h b/libc/nt/struct/filenamesinformation.h index 5bf976387..a87f5efd3 100644 --- a/libc/nt/struct/filenamesinformation.h +++ b/libc/nt/struct/filenamesinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILENAMESINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILENAMESINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileNamesInformation { uint32_t NextEntryOffset; @@ -9,5 +8,4 @@ struct NtFileNamesInformation { char16_t FileName[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILENAMESINFORMATION_H_ */ diff --git a/libc/nt/struct/filenetworkopeninformation.h b/libc/nt/struct/filenetworkopeninformation.h index c5e80423e..03f6987cf 100644 --- a/libc/nt/struct/filenetworkopeninformation.h +++ b/libc/nt/struct/filenetworkopeninformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILENETWORKOPENINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILENETWORKOPENINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileNetworkOpenInformation { int64_t CreationTime; @@ -12,5 +11,4 @@ struct NtFileNetworkOpenInformation { uint32_t FileAttributes; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILENETWORKOPENINFORMATION_H_ */ diff --git a/libc/nt/struct/filepipelocalinformation.h b/libc/nt/struct/filepipelocalinformation.h index 545d3b4cf..ab0ffce21 100644 --- a/libc/nt/struct/filepipelocalinformation.h +++ b/libc/nt/struct/filepipelocalinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEPIPELOCALINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEPIPELOCALINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFilePipeLocalInformation { uint32_t NamedPipeType; @@ -15,5 +14,4 @@ struct NtFilePipeLocalInformation { uint32_t NamedPipeEnd; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEPIPELOCALINFORMATION_H_ */ diff --git a/libc/nt/struct/filepositioninformation.h b/libc/nt/struct/filepositioninformation.h index 2c10a493a..def2d2f88 100644 --- a/libc/nt/struct/filepositioninformation.h +++ b/libc/nt/struct/filepositioninformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEPOSITIONINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEPOSITIONINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFilePositionInformation { int64_t CurrentByteOffset; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEPOSITIONINFORMATION_H_ */ diff --git a/libc/nt/struct/filerenameinformation.h b/libc/nt/struct/filerenameinformation.h index 03c99c2f7..6038fdea9 100644 --- a/libc/nt/struct/filerenameinformation.h +++ b/libc/nt/struct/filerenameinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILERENAMEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILERENAMEINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileRenameInformation { bool32 Replace; @@ -9,5 +8,4 @@ struct NtFileRenameInformation { char16_t FileName[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILERENAMEINFORMATION_H_ */ diff --git a/libc/nt/struct/filesegmentelement.h b/libc/nt/struct/filesegmentelement.h index 6e7e6a9ea..cc5e0991a 100644 --- a/libc/nt/struct/filesegmentelement.h +++ b/libc/nt/struct/filesegmentelement.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILESEGMENTELEMENT_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILESEGMENTELEMENT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) union NtFileSegmentElement { void *Buffer; uint64_t Alignment; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILESEGMENTELEMENT_H_ */ diff --git a/libc/nt/struct/filestandardinformation.h b/libc/nt/struct/filestandardinformation.h index 8bde3b4bb..d6687d35c 100644 --- a/libc/nt/struct/filestandardinformation.h +++ b/libc/nt/struct/filestandardinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILESTANDARDINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILESTANDARDINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileStandardInformation { int64_t AllocationSize; @@ -10,5 +9,4 @@ struct NtFileStandardInformation { bool32 Directory; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILESTANDARDINFORMATION_H_ */ diff --git a/libc/nt/struct/filestreaminformation.h b/libc/nt/struct/filestreaminformation.h index aa647aefa..593649b59 100644 --- a/libc/nt/struct/filestreaminformation.h +++ b/libc/nt/struct/filestreaminformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILESTREAMINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILESTREAMINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileStreamInformation { uint32_t NextEntryOffset; @@ -10,5 +9,4 @@ struct NtFileStreamInformation { char16_t StreamName[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILESTREAMINFORMATION_H_ */ diff --git a/libc/nt/struct/filetime.h b/libc/nt/struct/filetime.h index 882c7a74b..2382cafa4 100644 --- a/libc/nt/struct/filetime.h +++ b/libc/nt/struct/filetime.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_FILETIME_H_ #define COSMOPOLITAN_LIBC_NT_FILETIME_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileTime { uint32_t dwLowDateTime; uint32_t dwHighDateTime; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_FILETIME_H_ */ diff --git a/libc/nt/struct/filezerodatainformation.h b/libc/nt/struct/filezerodatainformation.h index 0204a5fca..2822af377 100644 --- a/libc/nt/struct/filezerodatainformation.h +++ b/libc/nt/struct/filezerodatainformation.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FILEZERODATAINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FILEZERODATAINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFileZeroDataInformation { uint64_t FileOffset; uint64_t BeyondFinalZero; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FILEZERODATAINFORMATION_H_ */ diff --git a/libc/nt/struct/fpodata.h b/libc/nt/struct/fpodata.h index 80eb982d6..fcd58d1ff 100644 --- a/libc/nt/struct/fpodata.h +++ b/libc/nt/struct/fpodata.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_FPODATA_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_FPODATA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtFpoData { /* TODO(jart): No bitfields. */ @@ -16,5 +15,4 @@ struct NtFpoData { uint16_t cbFrame : 2; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_FPODATA_H_ */ diff --git a/libc/nt/struct/genericmapping.h b/libc/nt/struct/genericmapping.h index 67a8f3fff..35598c772 100644 --- a/libc/nt/struct/genericmapping.h +++ b/libc/nt/struct/genericmapping.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_GENERICMAPPING_H_ #define COSMOPOLITAN_LIBC_NT_GENERICMAPPING_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtGenericMapping { unsigned int GenericRead; @@ -9,5 +8,4 @@ struct NtGenericMapping { unsigned int GenericAll; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_GENERICMAPPING_H_ */ diff --git a/libc/nt/struct/guid.h b/libc/nt/struct/guid.h index ce4cbe10a..517677743 100644 --- a/libc/nt/struct/guid.h +++ b/libc/nt/struct/guid.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_GUID_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_GUID_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtGuid { @@ -11,5 +10,4 @@ struct NtGuid { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_GUID_H_ */ diff --git a/libc/nt/struct/imagearchivememberheader.internal.h b/libc/nt/struct/imagearchivememberheader.internal.h index 0c0760d77..599418109 100644 --- a/libc/nt/struct/imagearchivememberheader.internal.h +++ b/libc/nt/struct/imagearchivememberheader.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEARCHIVEMEMBERHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEARCHIVEMEMBERHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageArchiveMemberHeader { uint8_t Name[16]; @@ -12,5 +11,4 @@ struct NtImageArchiveMemberHeader { uint8_t EndHeader[2]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEARCHIVEMEMBERHEADER_H_ */ diff --git a/libc/nt/struct/imageauxsymbol.internal.h b/libc/nt/struct/imageauxsymbol.internal.h index 615223e9e..546c10ab4 100644 --- a/libc/nt/struct/imageauxsymbol.internal.h +++ b/libc/nt/struct/imageauxsymbol.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEAUXSYMBOL_H_ #include "libc/nt/pedef.internal.h" #include "libc/nt/struct/imageauxsymboltokendef.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) union NtImageAuxSymbol { struct { @@ -45,5 +44,4 @@ union NtImageAuxSymbol { } CRC; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEAUXSYMBOL_H_ */ diff --git a/libc/nt/struct/imageauxsymbolex.internal.h b/libc/nt/struct/imageauxsymbolex.internal.h index 669458536..1c24942fb 100644 --- a/libc/nt/struct/imageauxsymbolex.internal.h +++ b/libc/nt/struct/imageauxsymbolex.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEAUXSYMBOLEX_H_ #include "libc/nt/struct/imageauxsymboltokendef.internal.h" #include "libc/nt/struct/imagesymbolex.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) union NtImageAuxSymbolEx { struct { @@ -34,5 +33,4 @@ union NtImageAuxSymbolEx { } CRC; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEAUXSYMBOLEX_H_ */ diff --git a/libc/nt/struct/imageauxsymboltokendef.internal.h b/libc/nt/struct/imageauxsymboltokendef.internal.h index 4ab4ed189..063daa349 100644 --- a/libc/nt/struct/imageauxsymboltokendef.internal.h +++ b/libc/nt/struct/imageauxsymboltokendef.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEAUXSYMBOLTOKENDEF_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEAUXSYMBOLTOKENDEF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageAuxSymbolTokenDef { uint8_t bAuxType; @@ -9,5 +8,4 @@ struct NtImageAuxSymbolTokenDef { uint8_t rgbReserved[12]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEAUXSYMBOLTOKENDEF_H_ */ diff --git a/libc/nt/struct/imagebaserelocation.internal.h b/libc/nt/struct/imagebaserelocation.internal.h index 19b6a1820..473bb135b 100644 --- a/libc/nt/struct/imagebaserelocation.internal.h +++ b/libc/nt/struct/imagebaserelocation.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEBASERELOCATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEBASERELOCATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageBaseRelocation { uint32_t VirtualAddress; uint32_t SizeOfBlock; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEBASERELOCATION_H_ */ diff --git a/libc/nt/struct/imageboundforwarderref.internal.h b/libc/nt/struct/imageboundforwarderref.internal.h index 59c17a856..3a4f75b3e 100644 --- a/libc/nt/struct/imageboundforwarderref.internal.h +++ b/libc/nt/struct/imageboundforwarderref.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEBOUNDFORWARDERREF_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEBOUNDFORWARDERREF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageBoundForwarderRef { uint32_t TimeDateStamp; @@ -8,5 +7,4 @@ struct NtImageBoundForwarderRef { uint16_t Reserved; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEBOUNDFORWARDERREF_H_ */ diff --git a/libc/nt/struct/imageboundimportdescriptor.internal.h b/libc/nt/struct/imageboundimportdescriptor.internal.h index 6b67c46dd..2b6d89964 100644 --- a/libc/nt/struct/imageboundimportdescriptor.internal.h +++ b/libc/nt/struct/imageboundimportdescriptor.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEBOUNDIMPORTDESCRIPTOR_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEBOUNDIMPORTDESCRIPTOR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageBoundImportDescriptor { uint32_t TimeDateStamp; @@ -8,5 +7,4 @@ struct NtImageBoundImportDescriptor { uint16_t NumberOfModuleForwarderRefs; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEBOUNDIMPORTDESCRIPTOR_H_ */ diff --git a/libc/nt/struct/imageceruntimefunctionentry.internal.h b/libc/nt/struct/imageceruntimefunctionentry.internal.h index 59c867ef0..bdca0316e 100644 --- a/libc/nt/struct/imageceruntimefunctionentry.internal.h +++ b/libc/nt/struct/imageceruntimefunctionentry.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGECERUNTIMEFUNCTIONENTRY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGECERUNTIMEFUNCTIONENTRY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageCeRuntimeFunctionEntry { uint32_t FuncStart; @@ -10,5 +9,4 @@ struct NtImageCeRuntimeFunctionEntry { uint32_t ExceptionFlag : 1; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGECERUNTIMEFUNCTIONENTRY_H_ */ diff --git a/libc/nt/struct/imagecoffsymbolsheader.internal.h b/libc/nt/struct/imagecoffsymbolsheader.internal.h index 7bed197ba..c594ad799 100644 --- a/libc/nt/struct/imagecoffsymbolsheader.internal.h +++ b/libc/nt/struct/imagecoffsymbolsheader.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGECOFFSYMBOLSHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGECOFFSYMBOLSHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageCoffSymbolsHeader { uint32_t NumberOfSymbols; @@ -13,5 +12,4 @@ struct NtImageCoffSymbolsHeader { uint32_t RvaToLastByteOfData; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGECOFFSYMBOLSHEADER_H_ */ diff --git a/libc/nt/struct/imagedatadirectory.internal.h b/libc/nt/struct/imagedatadirectory.internal.h index aa9553c63..6aeafd586 100644 --- a/libc/nt/struct/imagedatadirectory.internal.h +++ b/libc/nt/struct/imagedatadirectory.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDATADIRECTORY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDATADIRECTORY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageDataDirectory { uint32_t VirtualAddress; uint32_t Size; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDATADIRECTORY_H_ */ diff --git a/libc/nt/struct/imagedebugdirectory.internal.h b/libc/nt/struct/imagedebugdirectory.internal.h index abf7d860c..fd20dd9e6 100644 --- a/libc/nt/struct/imagedebugdirectory.internal.h +++ b/libc/nt/struct/imagedebugdirectory.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDEBUGDIRECTORY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDEBUGDIRECTORY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageDebugDirectory { uint32_t Characteristics; @@ -13,5 +12,4 @@ struct NtImageDebugDirectory { uint32_t PointerToRawData; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDEBUGDIRECTORY_H_ */ diff --git a/libc/nt/struct/imagedebugmisc.internal.h b/libc/nt/struct/imagedebugmisc.internal.h index 30a5c5a35..8e46bf381 100644 --- a/libc/nt/struct/imagedebugmisc.internal.h +++ b/libc/nt/struct/imagedebugmisc.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDEBUGMISC_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDEBUGMISC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageDebugMisc { uint32_t DataType; @@ -10,5 +9,4 @@ struct NtImageDebugMisc { uint8_t Data[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDEBUGMISC_H_ */ diff --git a/libc/nt/struct/imagedelayloaddescriptor.internal.h b/libc/nt/struct/imagedelayloaddescriptor.internal.h index 87f2a5f82..0b93b532c 100644 --- a/libc/nt/struct/imagedelayloaddescriptor.internal.h +++ b/libc/nt/struct/imagedelayloaddescriptor.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDELAYLOADDESCRIPTOR_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDELAYLOADDESCRIPTOR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageDelayloadDescriptor { union { @@ -19,5 +18,4 @@ struct NtImageDelayloadDescriptor { uint32_t TimeDateStamp; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDELAYLOADDESCRIPTOR_H_ */ diff --git a/libc/nt/struct/imagedosheader.internal.h b/libc/nt/struct/imagedosheader.internal.h index 858b77262..938482167 100644 --- a/libc/nt/struct/imagedosheader.internal.h +++ b/libc/nt/struct/imagedosheader.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDOSHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDOSHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageDosHeader { uint16_t e_magic; @@ -24,5 +23,4 @@ struct NtImageDosHeader { uint32_t e_lfanew; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDOSHEADER_H_ */ diff --git a/libc/nt/struct/imagedynamicrelocation.internal.h b/libc/nt/struct/imagedynamicrelocation.internal.h index df2102d93..cea2702f3 100644 --- a/libc/nt/struct/imagedynamicrelocation.internal.h +++ b/libc/nt/struct/imagedynamicrelocation.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDYNAMICRELOCATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDYNAMICRELOCATION_H_ #include "libc/nt/struct/imagebaserelocation.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageDynamicRelocation { uint64_t Symbol; @@ -9,5 +8,4 @@ struct NtImageDynamicRelocation { struct NtImageBaseRelocation BaseRelocations[0]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDYNAMICRELOCATION_H_ */ diff --git a/libc/nt/struct/imagedynamicrelocationtable.internal.h b/libc/nt/struct/imagedynamicrelocationtable.internal.h index 41f3fae41..1025c8fd2 100644 --- a/libc/nt/struct/imagedynamicrelocationtable.internal.h +++ b/libc/nt/struct/imagedynamicrelocationtable.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDYNAMICRELOCATIONTABLE_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDYNAMICRELOCATIONTABLE_H_ #include "libc/nt/struct/imagedynamicrelocation.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageDynamicRelocationTable { uint32_t Version; @@ -9,5 +8,4 @@ struct NtImageDynamicRelocationTable { struct NtImageDynamicRelocation DynamicRelocations[0]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDYNAMICRELOCATIONTABLE_H_ */ diff --git a/libc/nt/struct/imagedynamicrelocationv2.internal.h b/libc/nt/struct/imagedynamicrelocationv2.internal.h index 8b74684da..4a43f3ee1 100644 --- a/libc/nt/struct/imagedynamicrelocationv2.internal.h +++ b/libc/nt/struct/imagedynamicrelocationv2.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDYNAMICRELOCATIONV2_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDYNAMICRELOCATIONV2_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageDynamicRelocationV2 { uint32_t HeaderSize; @@ -11,5 +10,4 @@ struct NtImageDynamicRelocationV2 { uint8_t FixupInfo[0]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEDYNAMICRELOCATIONV2_H_ */ diff --git a/libc/nt/struct/imageenclaveconfig.internal.h b/libc/nt/struct/imageenclaveconfig.internal.h index 1617b6e42..79758b0ef 100644 --- a/libc/nt/struct/imageenclaveconfig.internal.h +++ b/libc/nt/struct/imageenclaveconfig.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEENCLAVECONFIG_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEENCLAVECONFIG_H_ #include "libc/nt/pedef.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageEnclaveConfig { uint32_t Size; @@ -19,5 +18,4 @@ struct NtImageEnclaveConfig { uint32_t EnclaveFlags; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEENCLAVECONFIG_H_ */ diff --git a/libc/nt/struct/imageenclaveimport.internal.h b/libc/nt/struct/imageenclaveimport.internal.h index 8ac8165a2..039ae0775 100644 --- a/libc/nt/struct/imageenclaveimport.internal.h +++ b/libc/nt/struct/imageenclaveimport.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEENCLAVEIMPORT_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEENCLAVEIMPORT_H_ #include "libc/nt/pedef.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageEnclaveImport { uint32_t MatchType; @@ -13,5 +12,4 @@ struct NtImageEnclaveImport { uint32_t Reserved; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEENCLAVEIMPORT_H_ */ diff --git a/libc/nt/struct/imageepiloguedynamicrelocationheader.internal.h b/libc/nt/struct/imageepiloguedynamicrelocationheader.internal.h index 33273f7a3..998460ed6 100644 --- a/libc/nt/struct/imageepiloguedynamicrelocationheader.internal.h +++ b/libc/nt/struct/imageepiloguedynamicrelocationheader.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEEPILOGUEDYNAMICRELOCATIONHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEEPILOGUEDYNAMICRELOCATIONHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageEpilogueDynamicRelocationHeader { uint32_t EpilogueCount; @@ -11,6 +10,5 @@ struct NtImageEpilogueDynamicRelocationHeader { /* uint8_t BranchDescriptorBitMap[...]; */ }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEEPILOGUEDYNAMICRELOCATIONHEADER_H_ \ */ diff --git a/libc/nt/struct/imageexportdirectory.internal.h b/libc/nt/struct/imageexportdirectory.internal.h index bbd9dc123..78bc5233d 100644 --- a/libc/nt/struct/imageexportdirectory.internal.h +++ b/libc/nt/struct/imageexportdirectory.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEEXPORTDIRECTORY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEEXPORTDIRECTORY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageExportDirectory { uint32_t Characteristics; @@ -16,5 +15,4 @@ struct NtImageExportDirectory { uint32_t AddressOfNameOrdinals; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEEXPORTDIRECTORY_H_ */ diff --git a/libc/nt/struct/imagefileheader.internal.h b/libc/nt/struct/imagefileheader.internal.h index e45267d10..9e7e4cb01 100644 --- a/libc/nt/struct/imagefileheader.internal.h +++ b/libc/nt/struct/imagefileheader.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEFILEHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEFILEHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageFileHeader { @@ -35,5 +34,4 @@ struct NtImageFileHeader { uint16_t Characteristics; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEFILEHEADER_H_ */ diff --git a/libc/nt/struct/imagehotpatchbase.internal.h b/libc/nt/struct/imagehotpatchbase.internal.h index 950519d84..3fe68e528 100644 --- a/libc/nt/struct/imagehotpatchbase.internal.h +++ b/libc/nt/struct/imagehotpatchbase.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEHOTPATCHBASE_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEHOTPATCHBASE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageHotPatchBase { uint32_t SequenceNumber; @@ -13,5 +12,4 @@ struct NtImageHotPatchBase { uint32_t BufferOffset; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEHOTPATCHBASE_H_ */ diff --git a/libc/nt/struct/imagehotpatchhashes.internal.h b/libc/nt/struct/imagehotpatchhashes.internal.h index 8e035f84b..45c758c13 100644 --- a/libc/nt/struct/imagehotpatchhashes.internal.h +++ b/libc/nt/struct/imagehotpatchhashes.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEHOTPATCHHASHES_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEHOTPATCHHASHES_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageHotPatchHashes { uint8_t SHA256[32]; uint8_t SHA1[20]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEHOTPATCHHASHES_H_ */ diff --git a/libc/nt/struct/imagehotpatchinfo.internal.h b/libc/nt/struct/imagehotpatchinfo.internal.h index d825f3b6f..0ba48e61d 100644 --- a/libc/nt/struct/imagehotpatchinfo.internal.h +++ b/libc/nt/struct/imagehotpatchinfo.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEHOTPATCHINFO_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEHOTPATCHINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageHotPatchInfo { uint32_t Version; @@ -11,5 +10,4 @@ struct NtImageHotPatchInfo { uint32_t BufferOffset; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEHOTPATCHINFO_H_ */ diff --git a/libc/nt/struct/imageimportbyname.internal.h b/libc/nt/struct/imageimportbyname.internal.h index b06bb0f9f..3fe8a5e34 100644 --- a/libc/nt/struct/imageimportbyname.internal.h +++ b/libc/nt/struct/imageimportbyname.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEIMPORTBYNAME_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEIMPORTBYNAME_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageImportByName { uint16_t Hint; char Name[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEIMPORTBYNAME_H_ */ diff --git a/libc/nt/struct/imageimportdescriptor.internal.h b/libc/nt/struct/imageimportdescriptor.internal.h index ec31d26ad..83ba8c131 100644 --- a/libc/nt/struct/imageimportdescriptor.internal.h +++ b/libc/nt/struct/imageimportdescriptor.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEIMPORTDESCRIPTOR_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEIMPORTDESCRIPTOR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageImportDescriptor { uint32_t ImportLookupTable; @@ -10,5 +9,4 @@ struct NtImageImportDescriptor { uint32_t ImportAddressTable; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEIMPORTDESCRIPTOR_H_ */ diff --git a/libc/nt/struct/imagelinenumber.internal.h b/libc/nt/struct/imagelinenumber.internal.h index 19a2ca380..2f5de445f 100644 --- a/libc/nt/struct/imagelinenumber.internal.h +++ b/libc/nt/struct/imagelinenumber.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGELINENUMBER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGELINENUMBER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageLinenumber { union { @@ -10,5 +9,4 @@ struct NtImageLinenumber { uint16_t Linenumber; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGELINENUMBER_H_ */ diff --git a/libc/nt/struct/imageloadconfigcodeintegrity.internal.h b/libc/nt/struct/imageloadconfigcodeintegrity.internal.h index c73fb55f4..06ef98d5a 100644 --- a/libc/nt/struct/imageloadconfigcodeintegrity.internal.h +++ b/libc/nt/struct/imageloadconfigcodeintegrity.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGELOADCONFIGCODEINTEGRITY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGELOADCONFIGCODEINTEGRITY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageLoadConfigCodeIntegrity { uint16_t Flags; @@ -9,5 +8,4 @@ struct NtImageLoadConfigCodeIntegrity { uint32_t Reserved; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGELOADCONFIGCODEINTEGRITY_H_ */ diff --git a/libc/nt/struct/imageloadconfigdirectory.internal.h b/libc/nt/struct/imageloadconfigdirectory.internal.h index 6a81801a5..fc2a9c4e2 100644 --- a/libc/nt/struct/imageloadconfigdirectory.internal.h +++ b/libc/nt/struct/imageloadconfigdirectory.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGELOADCONFIGDIRECTORY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGELOADCONFIGDIRECTORY_H_ #include "libc/nt/struct/imageloadconfigcodeintegrity.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageLoadConfigDirectory { uint32_t Size; @@ -47,5 +46,4 @@ struct NtImageLoadConfigDirectory { uint64_t EnclaveConfigurationPointer; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGELOADCONFIGDIRECTORY_H_ */ diff --git a/libc/nt/struct/imagentheaders.internal.h b/libc/nt/struct/imagentheaders.internal.h index 0b0ad503e..e5012ec7e 100644 --- a/libc/nt/struct/imagentheaders.internal.h +++ b/libc/nt/struct/imagentheaders.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGENTHEADERS_H_ #include "libc/nt/struct/imagefileheader.internal.h" #include "libc/nt/struct/imageoptionalheader.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageNtHeaders { uint32_t Signature; @@ -10,5 +9,4 @@ struct NtImageNtHeaders { struct NtImageOptionalHeader OptionalHeader; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGENTHEADERS_H_ */ diff --git a/libc/nt/struct/imageoptionalheader.internal.h b/libc/nt/struct/imageoptionalheader.internal.h index b6c5a5398..e1f757456 100644 --- a/libc/nt/struct/imageoptionalheader.internal.h +++ b/libc/nt/struct/imageoptionalheader.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEOPTIONALHEADER_H_ #include "libc/nt/pedef.internal.h" #include "libc/nt/struct/imagedatadirectory.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Portable Executable Optional Header. @@ -139,5 +138,4 @@ struct NtImageOptionalHeader { struct NtImageDataDirectory DataDirectory[]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEOPTIONALHEADER_H_ */ diff --git a/libc/nt/struct/imageprologuedynamicrelocationheader.internal.h b/libc/nt/struct/imageprologuedynamicrelocationheader.internal.h index 3e1e8c514..7c0144760 100644 --- a/libc/nt/struct/imageprologuedynamicrelocationheader.internal.h +++ b/libc/nt/struct/imageprologuedynamicrelocationheader.internal.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEPROLOGUEDYNAMICRELOCATIONHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEPROLOGUEDYNAMICRELOCATIONHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImagePrologueDynamicRelocationHeader { uint8_t PrologueByteCount; uint8_t PrologueBytes[0]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEPROLOGUEDYNAMICRELOCATIONHEADER_H_ \ */ diff --git a/libc/nt/struct/imagerelocation.internal.h b/libc/nt/struct/imagerelocation.internal.h index f94c70646..5797cbdd8 100644 --- a/libc/nt/struct/imagerelocation.internal.h +++ b/libc/nt/struct/imagerelocation.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERELOCATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERELOCATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageRelocation { union { @@ -11,5 +10,4 @@ struct NtImageRelocation { uint16_t Type; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERELOCATION_H_ */ diff --git a/libc/nt/struct/imageresourcedataentry.internal.h b/libc/nt/struct/imageresourcedataentry.internal.h index 03858aca5..3e59ee86a 100644 --- a/libc/nt/struct/imageresourcedataentry.internal.h +++ b/libc/nt/struct/imageresourcedataentry.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDATAENTRY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDATAENTRY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageResourceDataEntry { uint32_t OffsetToData; @@ -9,5 +8,4 @@ struct NtImageResourceDataEntry { uint32_t Reserved; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDATAENTRY_H_ */ diff --git a/libc/nt/struct/imageresourcedirectory.internal.h b/libc/nt/struct/imageresourcedirectory.internal.h index 5a1c1fb46..57e9d5feb 100644 --- a/libc/nt/struct/imageresourcedirectory.internal.h +++ b/libc/nt/struct/imageresourcedirectory.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDIRECTORY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDIRECTORY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageResourceDirectory { uint32_t Characteristics; @@ -11,5 +10,4 @@ struct NtImageResourceDirectory { uint16_t NumberOfIdEntries; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDIRECTORY_H_ */ diff --git a/libc/nt/struct/imageresourcedirectoryentry.internal.h b/libc/nt/struct/imageresourcedirectoryentry.internal.h index 1b1a357ab..12e651ff4 100644 --- a/libc/nt/struct/imageresourcedirectoryentry.internal.h +++ b/libc/nt/struct/imageresourcedirectoryentry.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDIRECTORYENTRY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDIRECTORYENTRY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageResourceDirectoryEntry { /* TODO(jart): No bitfields. */ @@ -21,5 +20,4 @@ struct NtImageResourceDirectoryEntry { }; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDIRECTORYENTRY_H_ */ diff --git a/libc/nt/struct/imageresourcedirstring.internal.h b/libc/nt/struct/imageresourcedirstring.internal.h index dce59e8d8..6a9fe3fab 100644 --- a/libc/nt/struct/imageresourcedirstring.internal.h +++ b/libc/nt/struct/imageresourcedirstring.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDIRSTRING_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDIRSTRING_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageResourceDirString { uint16_t Length; char16_t NameString[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERESOURCEDIRSTRING_H_ */ diff --git a/libc/nt/struct/imageromoptionalheader.internal.h b/libc/nt/struct/imageromoptionalheader.internal.h index 1cb5a08c0..7d9d65005 100644 --- a/libc/nt/struct/imageromoptionalheader.internal.h +++ b/libc/nt/struct/imageromoptionalheader.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEROMOPTIONALHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEROMOPTIONALHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageRomOptionalHeader { uint16_t Magic; @@ -18,5 +17,4 @@ struct NtImageRomOptionalHeader { uint32_t GpValue; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGEROMOPTIONALHEADER_H_ */ diff --git a/libc/nt/struct/imageruntimefunctionentry.internal.h b/libc/nt/struct/imageruntimefunctionentry.internal.h index cb0e6dee7..690d4f413 100644 --- a/libc/nt/struct/imageruntimefunctionentry.internal.h +++ b/libc/nt/struct/imageruntimefunctionentry.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERUNTIMEFUNCTIONENTRY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERUNTIMEFUNCTIONENTRY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageRuntimeFunctionEntry { uint32_t BeginAddress; @@ -11,5 +10,4 @@ struct NtImageRuntimeFunctionEntry { }; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGERUNTIMEFUNCTIONENTRY_H_ */ diff --git a/libc/nt/struct/imagesectionheader.internal.h b/libc/nt/struct/imagesectionheader.internal.h index 632232e8e..aa56a2169 100644 --- a/libc/nt/struct/imagesectionheader.internal.h +++ b/libc/nt/struct/imagesectionheader.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESECTIONHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESECTIONHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageSectionHeader { @@ -64,5 +63,4 @@ struct NtImageSectionHeader { uint32_t Characteristics; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESECTIONHEADER_H_ */ diff --git a/libc/nt/struct/imageseparatedebugheader.internal.h b/libc/nt/struct/imageseparatedebugheader.internal.h index f7bf1a519..ac3f4b55f 100644 --- a/libc/nt/struct/imageseparatedebugheader.internal.h +++ b/libc/nt/struct/imageseparatedebugheader.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESEPARATEDEBUGHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESEPARATEDEBUGHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageSeparateDebugHeader { uint16_t Signature; @@ -18,5 +17,4 @@ struct NtImageSeparateDebugHeader { uint32_t Reserved[2]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESEPARATEDEBUGHEADER_H_ */ diff --git a/libc/nt/struct/imagesymbol.internal.h b/libc/nt/struct/imagesymbol.internal.h index afadf3e83..34c161aa9 100644 --- a/libc/nt/struct/imagesymbol.internal.h +++ b/libc/nt/struct/imagesymbol.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESYMBOL_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESYMBOL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageSymbol { union { @@ -18,5 +17,4 @@ struct NtImageSymbol { uint8_t NumberOfAuxSymbols; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESYMBOL_H_ */ diff --git a/libc/nt/struct/imagesymbolex.internal.h b/libc/nt/struct/imagesymbolex.internal.h index e6220a662..1ecd04b2c 100644 --- a/libc/nt/struct/imagesymbolex.internal.h +++ b/libc/nt/struct/imagesymbolex.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESYMBOLEX_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESYMBOLEX_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageSymbolEx { union { @@ -18,5 +17,4 @@ struct NtImageSymbolEx { uint8_t NumberOfAuxSymbols; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGESYMBOLEX_H_ */ diff --git a/libc/nt/struct/imagethunkdata.internal.h b/libc/nt/struct/imagethunkdata.internal.h index d4067e322..9decda87a 100644 --- a/libc/nt/struct/imagethunkdata.internal.h +++ b/libc/nt/struct/imagethunkdata.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGETHUNKDATA_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGETHUNKDATA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageThunkData { union { @@ -11,5 +10,4 @@ struct NtImageThunkData { } u1; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGETHUNKDATA_H_ */ diff --git a/libc/nt/struct/imagetlsdirectory.internal.h b/libc/nt/struct/imagetlsdirectory.internal.h index 604a532d5..3df49e397 100644 --- a/libc/nt/struct/imagetlsdirectory.internal.h +++ b/libc/nt/struct/imagetlsdirectory.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMAGETLSDIRECTORY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMAGETLSDIRECTORY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImageTlsDirectory { uint64_t StartAddressOfRawData; @@ -11,5 +10,4 @@ struct NtImageTlsDirectory { uint32_t Characteristics; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMAGETLSDIRECTORY_H_ */ diff --git a/libc/nt/struct/importobjectheader.internal.h b/libc/nt/struct/importobjectheader.internal.h index ce658b6a2..7dacdd486 100644 --- a/libc/nt/struct/importobjectheader.internal.h +++ b/libc/nt/struct/importobjectheader.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IMPORTOBJECTHEADER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IMPORTOBJECTHEADER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtImportObjectHeader { /* TODO(jart): No bitfields. */ @@ -19,5 +18,4 @@ struct NtImportObjectHeader { uint16_t Reserved : 11; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IMPORTOBJECTHEADER_H_ */ diff --git a/libc/nt/struct/inputrecord.h b/libc/nt/struct/inputrecord.h index 6cf415d65..95336249d 100644 --- a/libc/nt/struct/inputrecord.h +++ b/libc/nt/struct/inputrecord.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_INPUTRECORD_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_INPUTRECORD_H_ #include "libc/nt/struct/coord.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtKeyEventRecord { bool32 bKeyDown; @@ -68,5 +67,4 @@ struct NtInputRecord { } Event; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_INPUTRECORD_H_ */ diff --git a/libc/nt/struct/iocounters.h b/libc/nt/struct/iocounters.h index 48fcf736c..8e58ab3a7 100644 --- a/libc/nt/struct/iocounters.h +++ b/libc/nt/struct/iocounters.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IOCOUNTERS_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IOCOUNTERS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtIoCounters { uint64_t ReadOperationCount; @@ -11,5 +10,4 @@ struct NtIoCounters { uint64_t OtherTransferCount; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IOCOUNTERS_H_ */ diff --git a/libc/nt/struct/iostatusblock.h b/libc/nt/struct/iostatusblock.h index 4ed41a759..69b70804b 100644 --- a/libc/nt/struct/iostatusblock.h +++ b/libc/nt/struct/iostatusblock.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IOSTATUSBLOCK_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IOSTATUSBLOCK_H_ #include "libc/nt/enum/status.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtIoStatusBlock { union { @@ -11,5 +10,4 @@ struct NtIoStatusBlock { uint32_t *Information; /* request dependent */ }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IOSTATUSBLOCK_H_ */ diff --git a/libc/nt/struct/iovec.h b/libc/nt/struct/iovec.h index 2eaaa6b44..b29f4bd8b 100644 --- a/libc/nt/struct/iovec.h +++ b/libc/nt/struct/iovec.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IOVEC_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IOVEC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtIovec { @@ -11,5 +10,4 @@ struct NtIovec { void DescribeIovNt(const struct NtIovec *, uint32_t, ssize_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IOVEC_H_ */ diff --git a/libc/nt/struct/ipadapteraddresses.h b/libc/nt/struct/ipadapteraddresses.h index 2c5cc448d..b6ed6250d 100644 --- a/libc/nt/struct/ipadapteraddresses.h +++ b/libc/nt/struct/ipadapteraddresses.h @@ -90,7 +90,6 @@ #define kNtTunnelTypeTeredo 14 #define kNtTunnelTypeIphttps 15 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* Inner Types --------------------------------------------------------- */ @@ -200,5 +199,4 @@ struct NtIpAdapterAddresses { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_IP_ADAPTER_ADDRESSES_H_ */ diff --git a/libc/nt/struct/kernelusertimes.h b/libc/nt/struct/kernelusertimes.h index 3e42abfac..360d570d3 100644 --- a/libc/nt/struct/kernelusertimes.h +++ b/libc/nt/struct/kernelusertimes.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_KERNELUSERTIMES_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_KERNELUSERTIMES_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtKernelUserTimes { uint64_t CreateFileTime; @@ -9,5 +8,4 @@ struct NtKernelUserTimes { int64_t UserTime; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_KERNELUSERTIMES_H_ */ diff --git a/libc/nt/struct/ldr.h b/libc/nt/struct/ldr.h index e2a692691..e2e9f1354 100644 --- a/libc/nt/struct/ldr.h +++ b/libc/nt/struct/ldr.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_LDR_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_LDR_H_ #include "libc/nt/struct/linkedlist.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtLdr { uint32_t SizeOfThis; /* msdn:reserved */ @@ -12,5 +11,4 @@ struct NtLdr { struct NtLinkedList InInitOrderModuleList; /* msdn:reserved */ }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_LDR_H_ */ diff --git a/libc/nt/struct/ldrdatatableentry.h b/libc/nt/struct/ldrdatatableentry.h index 14a707cc7..c9904ad3e 100644 --- a/libc/nt/struct/ldrdatatableentry.h +++ b/libc/nt/struct/ldrdatatableentry.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_LDRDATATABLEENTRY_H_ #include "libc/nt/struct/linkedlist.h" #include "libc/nt/struct/unicodestring.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtLdrDataTableEntry { struct NtLinkedList InLoadOrderLinks; /* msdn:reserved */ @@ -40,5 +39,4 @@ struct NtLdrDataTableEntry { int64_t LoadTime; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_LDRDATATABLEENTRY_H_ */ diff --git a/libc/nt/struct/linger.h b/libc/nt/struct/linger.h index 0267d205a..f029a49f4 100644 --- a/libc/nt/struct/linger.h +++ b/libc/nt/struct/linger.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_LINGER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_LINGER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct linger_nt { @@ -9,5 +8,4 @@ struct linger_nt { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_LINGER_H_ */ diff --git a/libc/nt/struct/linkedlist.h b/libc/nt/struct/linkedlist.h index 461c12355..c0f113e07 100644 --- a/libc/nt/struct/linkedlist.h +++ b/libc/nt/struct/linkedlist.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_LINKEDLIST_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_LINKEDLIST_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Dynamic linked list overlay. @@ -10,5 +9,4 @@ struct NtLinkedList { struct NtLinkedList *Prev; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_LINKEDLIST_H_ */ diff --git a/libc/nt/struct/luid.h b/libc/nt/struct/luid.h index c6f35d361..42a7a44ba 100644 --- a/libc/nt/struct/luid.h +++ b/libc/nt/struct/luid.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_LUID_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_LUID_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtLuid { uint32_t LowPart; int32_t HighPart; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_LUID_H_ */ diff --git a/libc/nt/struct/luidandattributes.h b/libc/nt/struct/luidandattributes.h index 8bf068ff7..179a6cf05 100644 --- a/libc/nt/struct/luidandattributes.h +++ b/libc/nt/struct/luidandattributes.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_LUIDANDATTRIBUTES_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_LUIDANDATTRIBUTES_H_ #include "libc/nt/struct/luid.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtLuidAndAttributes { struct NtLuid Luid; uint32_t Attributes; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_LUIDANDATTRIBUTES_H_ */ diff --git a/libc/nt/struct/memorybasicinformation.h b/libc/nt/struct/memorybasicinformation.h index c8895d9de..1b07af2a7 100644 --- a/libc/nt/struct/memorybasicinformation.h +++ b/libc/nt/struct/memorybasicinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_MEMORYBASICINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_MEMORYBASICINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtMemoryBasicInformation { void *BaseAddress; @@ -12,5 +11,4 @@ struct NtMemoryBasicInformation { uint32_t Type; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_MEMORYBASICINFORMATION_H_ */ diff --git a/libc/nt/struct/memoryrangeentry.h b/libc/nt/struct/memoryrangeentry.h index 637879814..450a33500 100644 --- a/libc/nt/struct/memoryrangeentry.h +++ b/libc/nt/struct/memoryrangeentry.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_MEMORYRANGEENTRY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_MEMORYRANGEENTRY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtMemoryRangeEntry { void *VirtualAddress; size_t NumberOfBytes; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_MEMORYRANGEENTRY_H_ */ diff --git a/libc/nt/struct/memorystatusex.h b/libc/nt/struct/memorystatusex.h index 9576f6576..e79b64a7b 100644 --- a/libc/nt/struct/memorystatusex.h +++ b/libc/nt/struct/memorystatusex.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_MEMORYSTATUSEX_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_MEMORYSTATUSEX_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtMemoryStatusEx { uint32_t dwLength; @@ -14,5 +13,4 @@ struct NtMemoryStatusEx { uint64_t ullAvailExtendedVirtual; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_MEMORYSTATUSEX_H_ */ diff --git a/libc/nt/struct/msg.h b/libc/nt/struct/msg.h index 91bf24403..443db8e2c 100644 --- a/libc/nt/struct/msg.h +++ b/libc/nt/struct/msg.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_MSG_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_MSG_H_ #include "libc/nt/struct/point.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtMsg { int64_t hwnd; @@ -12,5 +11,4 @@ struct NtMsg { struct NtPoint pt; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_MSG_H_ */ diff --git a/libc/nt/struct/nonpageddebuginfo.h b/libc/nt/struct/nonpageddebuginfo.h index f08c33cb3..0bd620801 100644 --- a/libc/nt/struct/nonpageddebuginfo.h +++ b/libc/nt/struct/nonpageddebuginfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_NONPAGEDDEBUGINFO_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_NONPAGEDDEBUGINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtNonPagedDebugInfo { uint16_t Signature; @@ -14,5 +13,4 @@ struct NtNonPagedDebugInfo { uint64_t ImageBase; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_NONPAGEDDEBUGINFO_H_ */ diff --git a/libc/nt/struct/ntexceptionpointers.h b/libc/nt/struct/ntexceptionpointers.h index ddcb2ce14..10a317c74 100644 --- a/libc/nt/struct/ntexceptionpointers.h +++ b/libc/nt/struct/ntexceptionpointers.h @@ -2,12 +2,10 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_NTEXCEPTIONPOINTERS_H_ #include "libc/nt/struct/context.h" #include "libc/nt/struct/ntexceptionrecord.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtExceptionPointers { struct NtExceptionRecord *ExceptionRecord; struct NtContext *ContextRecord; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_NTEXCEPTIONPOINTERS_H_ */ diff --git a/libc/nt/struct/ntexceptionrecord.h b/libc/nt/struct/ntexceptionrecord.h index ef07a7c10..08fad0ad1 100644 --- a/libc/nt/struct/ntexceptionrecord.h +++ b/libc/nt/struct/ntexceptionrecord.h @@ -4,7 +4,6 @@ #define kNtExceptionMaximumParameters 15 #define kNtExceptionNoncontinuable 1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtExceptionRecord { uint32_t ExceptionCode; /* kNtException... */ @@ -15,5 +14,4 @@ struct NtExceptionRecord { uint64_t ExceptionInformation[kNtExceptionMaximumParameters]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_NTEXCEPTIONRECORD_H_ */ diff --git a/libc/nt/struct/objectallinformation.h b/libc/nt/struct/objectallinformation.h index 387975146..d7aa4a40e 100644 --- a/libc/nt/struct/objectallinformation.h +++ b/libc/nt/struct/objectallinformation.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTALLINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTALLINFORMATION_H_ #include "libc/nt/struct/objecttypeinformation.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtObjectAllInformation { uint32_t NumberOfObjects; struct NtObjectTypeInformation ObjectTypeInformation[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTALLINFORMATION_H_ */ diff --git a/libc/nt/struct/objectattributes.h b/libc/nt/struct/objectattributes.h index e02f55585..c0e453611 100644 --- a/libc/nt/struct/objectattributes.h +++ b/libc/nt/struct/objectattributes.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_I_OBJECTATTRIBUTES_H_ #include "libc/nt/struct/rtluserprocessparameters.h" #include "libc/nt/struct/securityattributes.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtObjectAttributes { uint32_t Length; @@ -13,5 +12,4 @@ struct NtObjectAttributes { void *SecurityQualityOfService; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_I_OBJECTATTRIBUTES_H_ */ diff --git a/libc/nt/struct/objectbasicinformation.h b/libc/nt/struct/objectbasicinformation.h index 8eb056e8e..40756b230 100644 --- a/libc/nt/struct/objectbasicinformation.h +++ b/libc/nt/struct/objectbasicinformation.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTBASICINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTBASICINFORMATION_H_ #include "libc/nt/enum/accessmask.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtObjectBasicInformation { uint32_t Attributes; @@ -17,5 +16,4 @@ struct NtObjectBasicInformation { int64_t CreateTime; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTBASICINFORMATION_H_ */ diff --git a/libc/nt/struct/objectnameinformation.h b/libc/nt/struct/objectnameinformation.h index 4d942b669..55756d7a7 100644 --- a/libc/nt/struct/objectnameinformation.h +++ b/libc/nt/struct/objectnameinformation.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTNAMEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTNAMEINFORMATION_H_ #include "libc/nt/struct/unicodestring.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtObjectNameInformation { struct NtUnicodeString Name; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTNAMEINFORMATION_H_ */ diff --git a/libc/nt/struct/objecttypeinformation.h b/libc/nt/struct/objecttypeinformation.h index f153f1293..ea4a69357 100644 --- a/libc/nt/struct/objecttypeinformation.h +++ b/libc/nt/struct/objecttypeinformation.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTTYPEINFORMATION_H_ #include "libc/nt/struct/genericmapping.h" #include "libc/nt/struct/unicodestring.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtObjectTypeInformation { struct NtUnicodeString TypeName; @@ -28,5 +27,4 @@ struct NtObjectTypeInformation { uint32_t DefaultNonPagedPoolCharge; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_OBJECTTYPEINFORMATION_H_ */ diff --git a/libc/nt/struct/openfilename.h b/libc/nt/struct/openfilename.h index 8c0e18352..22269548e 100644 --- a/libc/nt/struct/openfilename.h +++ b/libc/nt/struct/openfilename.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_OPENFILENAME_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_OPENFILENAME_H_ #include "libc/nt/struct/editmenu.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtOpenFilename { uint32_t lStructSize; @@ -29,5 +28,4 @@ struct NtOpenFilename { uint32_t FlagsEx; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_OPENFILENAME_H_ */ diff --git a/libc/nt/struct/osversioninfo.h b/libc/nt/struct/osversioninfo.h index 50d8de4a6..5268cecfd 100644 --- a/libc/nt/struct/osversioninfo.h +++ b/libc/nt/struct/osversioninfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_OSVERSIONINFO_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_OSVERSIONINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtOsVersionInfo { @@ -18,5 +17,4 @@ struct NtOsVersionInfo { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_OSVERSIONINFO_H_ */ diff --git a/libc/nt/struct/overlapped.h b/libc/nt/struct/overlapped.h index 7580ddbf8..a1bd85837 100644 --- a/libc/nt/struct/overlapped.h +++ b/libc/nt/struct/overlapped.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_OVERLAPPED_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_OVERLAPPED_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtOverlapped { uintptr_t Internal; @@ -15,5 +14,4 @@ struct NtOverlapped { int64_t hEvent; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_OVERLAPPED_H_ */ diff --git a/libc/nt/struct/overlappedentry.h b/libc/nt/struct/overlappedentry.h index e567fa964..b65ef4488 100644 --- a/libc/nt/struct/overlappedentry.h +++ b/libc/nt/struct/overlappedentry.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_OVERLAPPEDENTRY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_OVERLAPPEDENTRY_H_ #include "libc/nt/struct/overlapped.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtOverlappedEntry { @@ -12,5 +11,4 @@ struct NtOverlappedEntry { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_OVERLAPPEDENTRY_H_ */ diff --git a/libc/nt/struct/paintstruct.h b/libc/nt/struct/paintstruct.h index c10e987ea..d1f7f876d 100644 --- a/libc/nt/struct/paintstruct.h +++ b/libc/nt/struct/paintstruct.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_PAINTSTRUCT_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_PAINTSTRUCT_H_ #include "libc/nt/struct/rect.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtPaintStruct { int64_t hdc; @@ -12,5 +11,4 @@ struct NtPaintStruct { uint8_t rgbReserved[32]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_PAINTSTRUCT_H_ */ diff --git a/libc/nt/struct/pdhfmtcountervalue.h b/libc/nt/struct/pdhfmtcountervalue.h index 644c98fb7..f89a6e4ef 100644 --- a/libc/nt/struct/pdhfmtcountervalue.h +++ b/libc/nt/struct/pdhfmtcountervalue.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_PDHFMTCOUNTERVALUE_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_PDHFMTCOUNTERVALUE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtPdhFmtCountervalue { @@ -15,5 +14,4 @@ struct NtPdhFmtCountervalue { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_PDHFMTCOUNTERVALUE_H_ */ diff --git a/libc/nt/struct/peb.h b/libc/nt/struct/peb.h index 371a6d204..ba7623938 100644 --- a/libc/nt/struct/peb.h +++ b/libc/nt/struct/peb.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_PEB_H_ #include "libc/nt/struct/ldr.h" #include "libc/nt/struct/unicodestring.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtPeb { union { @@ -92,5 +91,4 @@ struct NtPeb { uint64_t MinimumStackCommit; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_PEB_H_ */ diff --git a/libc/nt/struct/point.h b/libc/nt/struct/point.h index 9eddde869..368aab6ec 100644 --- a/libc/nt/struct/point.h +++ b/libc/nt/struct/point.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_POINT_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_POINT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtPoint { int32_t x; int32_t y; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_POINT_H_ */ diff --git a/libc/nt/struct/pollfd.h b/libc/nt/struct/pollfd.h index 5e71997cf..991b6aa4e 100644 --- a/libc/nt/struct/pollfd.h +++ b/libc/nt/struct/pollfd.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_POLLFD_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_POLLFD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct sys_pollfd_nt { int64_t handle; @@ -8,5 +7,4 @@ struct sys_pollfd_nt { int16_t revents; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_POLLFD_H_ */ diff --git a/libc/nt/struct/privilegeset.h b/libc/nt/struct/privilegeset.h index 3f027c051..3b32f78ec 100644 --- a/libc/nt/struct/privilegeset.h +++ b/libc/nt/struct/privilegeset.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_PRIVILEGESET_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_PRIVILEGESET_H_ #include "libc/nt/struct/luidandattributes.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtPrivilegeSet { uint32_t PrivilegeCount; @@ -9,5 +8,4 @@ struct NtPrivilegeSet { struct NtLuidAndAttributes Privilege[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_PRIVILEGESET_H_ */ diff --git a/libc/nt/struct/processbasicinformation.h b/libc/nt/struct/processbasicinformation.h index 1f34b751e..374e29e15 100644 --- a/libc/nt/struct/processbasicinformation.h +++ b/libc/nt/struct/processbasicinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSBASICINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSBASICINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtProcessBasicInformation { int32_t ExitStatus; @@ -11,5 +10,4 @@ struct NtProcessBasicInformation { int64_t InheritedFromUniqueProcessId; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSBASICINFORMATION_H_ */ diff --git a/libc/nt/struct/processentry32.h b/libc/nt/struct/processentry32.h index e6b481573..ac6734ff5 100644 --- a/libc/nt/struct/processentry32.h +++ b/libc/nt/struct/processentry32.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSENTRY32_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSENTRY32_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtProcessEntry32 { uint32_t dwSize; @@ -15,5 +14,4 @@ struct NtProcessEntry32 { char16_t szExeFile[260]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSENTRY32_H_ */ diff --git a/libc/nt/struct/processinformation.h b/libc/nt/struct/processinformation.h index cfe117496..f07170134 100644 --- a/libc/nt/struct/processinformation.h +++ b/libc/nt/struct/processinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtProcessInformation { int64_t hProcess; @@ -9,5 +8,4 @@ struct NtProcessInformation { uint32_t dwThreadId; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSINFORMATION_H_ */ diff --git a/libc/nt/struct/processmemorycounters.h b/libc/nt/struct/processmemorycounters.h index 43bad8814..e8ec33958 100644 --- a/libc/nt/struct/processmemorycounters.h +++ b/libc/nt/struct/processmemorycounters.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSMEMORYCOUNTERS_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSMEMORYCOUNTERS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtProcessMemoryCountersEx { @@ -18,5 +17,4 @@ struct NtProcessMemoryCountersEx { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_PROCESSMEMORYCOUNTERS_H_ */ diff --git a/libc/nt/struct/rect.h b/libc/nt/struct/rect.h index 6e6aca3eb..ca416893b 100644 --- a/libc/nt/struct/rect.h +++ b/libc/nt/struct/rect.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_RECT_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_RECT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtRect { int32_t left; @@ -9,5 +8,4 @@ struct NtRect { int32_t bottom; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_RECT_H_ */ diff --git a/libc/nt/struct/reparsedatabuffer.h b/libc/nt/struct/reparsedatabuffer.h index 11dc29a7b..d50a659fa 100644 --- a/libc/nt/struct/reparsedatabuffer.h +++ b/libc/nt/struct/reparsedatabuffer.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_REPARSEDATABUFFER_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_REPARSEDATABUFFER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtReparseDataBuffer { @@ -30,5 +29,4 @@ struct NtReparseDataBuffer { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_REPARSEDATABUFFER_H_ */ diff --git a/libc/nt/struct/rtluserprocessinformation.h b/libc/nt/struct/rtluserprocessinformation.h index fdce24f61..0e10f0240 100644 --- a/libc/nt/struct/rtluserprocessinformation.h +++ b/libc/nt/struct/rtluserprocessinformation.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_RTLUSERPROCESSINFORMATION_H_ #include "libc/nt/struct/clientid.h" #include "libc/nt/struct/sectionimageinformation.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtRtlUserProcessInformation { uint32_t SizeOfThis; @@ -12,5 +11,4 @@ struct NtRtlUserProcessInformation { struct NtSectionImageInformation ImageInformation; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_RTLUSERPROCESSINFORMATION_H_ */ diff --git a/libc/nt/struct/rtluserprocessparameters.h b/libc/nt/struct/rtluserprocessparameters.h index b5d0d45be..ecd831935 100644 --- a/libc/nt/struct/rtluserprocessparameters.h +++ b/libc/nt/struct/rtluserprocessparameters.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_RTLUSERPROCESSPARAMETERS_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_RTLUSERPROCESSPARAMETERS_H_ #include "libc/nt/struct/unicodestring.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtRtlUserProcessParameters { uint32_t MaximumLength; @@ -34,5 +33,4 @@ struct NtRtlUserProcessParameters { struct NtUnicodeString *RuntimeData; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_RTLUSERPROCESSPARAMETERS_H_ */ diff --git a/libc/nt/struct/sectionimageinformation.h b/libc/nt/struct/sectionimageinformation.h index b516df32e..0737a9e4a 100644 --- a/libc/nt/struct/sectionimageinformation.h +++ b/libc/nt/struct/sectionimageinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SECTIONIMAGEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SECTIONIMAGEINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSectionImageInformation { void *EntryPoint; @@ -18,5 +17,4 @@ struct NtSectionImageInformation { uint32_t __wut2[3]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SECTIONIMAGEINFORMATION_H_ */ diff --git a/libc/nt/struct/securityattributes.h b/libc/nt/struct/securityattributes.h index ed17a2594..e481ede22 100644 --- a/libc/nt/struct/securityattributes.h +++ b/libc/nt/struct/securityattributes.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_SECURITYATTRIBUTES_H_ #include "libc/mem/alloca.h" #include "libc/nt/struct/securitydescriptor.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSecurityAttributes { uint32_t nLength; @@ -15,5 +14,4 @@ const char *DescribeNtSecurityAttributes(char[32], #define DescribeNtSecurityAttributes(x) \ DescribeNtSecurityAttributes(alloca(32), x) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SECURITYATTRIBUTES_H_ */ diff --git a/libc/nt/struct/securitydescriptor.h b/libc/nt/struct/securitydescriptor.h index 2fbc853ca..066e0862c 100644 --- a/libc/nt/struct/securitydescriptor.h +++ b/libc/nt/struct/securitydescriptor.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SECURITYDESCRIPTOR_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SECURITYDESCRIPTOR_H_ #include "libc/nt/struct/acl.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSecurityDescriptor { uint8_t Revision; @@ -13,5 +12,4 @@ struct NtSecurityDescriptor { struct NtAcl *Dacl; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SECURITYDESCRIPTOR_H_ */ diff --git a/libc/nt/struct/size.h b/libc/nt/struct/size.h index 3476162a0..e3c77a37d 100644 --- a/libc/nt/struct/size.h +++ b/libc/nt/struct/size.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SIZE_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SIZE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtSize { @@ -9,5 +8,4 @@ struct NtSize { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SIZE_H_ */ diff --git a/libc/nt/struct/smallrect.h b/libc/nt/struct/smallrect.h index d5c3765e4..bc9bbda4c 100644 --- a/libc/nt/struct/smallrect.h +++ b/libc/nt/struct/smallrect.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_ENUM_SMALLRECT_H_ #define COSMOPOLITAN_LIBC_NT_ENUM_SMALLRECT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSmallRect { int16_t Left; @@ -9,5 +8,4 @@ struct NtSmallRect { int16_t Bottom; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_ENUM_SMALLRECT_H_ */ diff --git a/libc/nt/struct/startupinfo.h b/libc/nt/struct/startupinfo.h index f14346a5d..8a448d345 100644 --- a/libc/nt/struct/startupinfo.h +++ b/libc/nt/struct/startupinfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_STARTUPINFO_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_STARTUPINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtStartupInfo { uint32_t cb /* = sizeof(struct NtStartupInfo) */; @@ -28,5 +27,4 @@ struct NtStartupInfo { }; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_STARTUPINFO_H_ */ diff --git a/libc/nt/struct/startupinfoex.h b/libc/nt/struct/startupinfoex.h index 0a9beb72d..f6ddc1a59 100644 --- a/libc/nt/struct/startupinfoex.h +++ b/libc/nt/struct/startupinfoex.h @@ -2,12 +2,10 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_STARTUPINFOEX_H_ #include "libc/nt/struct/procthreadattributelist.h" #include "libc/nt/struct/startupinfo.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtStartupInfoEx { struct NtStartupInfo StartupInfo; struct NtProcThreadAttributeList *lpAttributeList; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_STARTUPINFOEX_H_ */ diff --git a/libc/nt/struct/systembasicinformation.h b/libc/nt/struct/systembasicinformation.h index 8f2affa86..57d52c88e 100644 --- a/libc/nt/struct/systembasicinformation.h +++ b/libc/nt/struct/systembasicinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMBASICINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMBASICINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemBasicInformation { unsigned char Reserved1[4]; @@ -16,5 +15,4 @@ struct NtSystemBasicInformation { char NumberOfProcessors; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMBASICINFORMATION_H_ */ diff --git a/libc/nt/struct/systemexceptioninformation.h b/libc/nt/struct/systemexceptioninformation.h index 8dfa4f101..1cf299384 100644 --- a/libc/nt/struct/systemexceptioninformation.h +++ b/libc/nt/struct/systemexceptioninformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMEXCEPTIONINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMEXCEPTIONINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemExceptionInformation { unsigned char Reserved1[16]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMEXCEPTIONINFORMATION_H_ */ diff --git a/libc/nt/struct/systemhandleentry.h b/libc/nt/struct/systemhandleentry.h index e6e6ead02..03806cfc1 100644 --- a/libc/nt/struct/systemhandleentry.h +++ b/libc/nt/struct/systemhandleentry.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMHANDLEENTRY_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMHANDLEENTRY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemHandleEntry { uint32_t OwnerPid; @@ -11,5 +10,4 @@ struct NtSystemHandleEntry { uint32_t AccessMask; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMHANDLEENTRY_H_ */ diff --git a/libc/nt/struct/systemhandleinformation.h b/libc/nt/struct/systemhandleinformation.h index ec5c2e79d..2bfee9f88 100644 --- a/libc/nt/struct/systemhandleinformation.h +++ b/libc/nt/struct/systemhandleinformation.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMHANDLEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMHANDLEINFORMATION_H_ #include "libc/nt/struct/systemhandleentry.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemHandleInformation { uint32_t Count; struct NtSystemHandleEntry Handle[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMHANDLEINFORMATION_H_ */ diff --git a/libc/nt/struct/systeminfo.h b/libc/nt/struct/systeminfo.h index efa33c205..3f57fdaec 100644 --- a/libc/nt/struct/systeminfo.h +++ b/libc/nt/struct/systeminfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMINFO_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemInfo { union { @@ -21,5 +20,4 @@ struct NtSystemInfo { uint16_t wProcessorRevision; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMINFO_H_ */ diff --git a/libc/nt/struct/systeminterruptinformation.h b/libc/nt/struct/systeminterruptinformation.h index 316109b25..02d5643c4 100644 --- a/libc/nt/struct/systeminterruptinformation.h +++ b/libc/nt/struct/systeminterruptinformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMINTERRUPTINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMINTERRUPTINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemInterruptInformation { unsigned char Reserved1[24]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMINTERRUPTINFORMATION_H_ */ diff --git a/libc/nt/struct/systemlookasideinformation.h b/libc/nt/struct/systemlookasideinformation.h index 8df8e6e39..b69fe6406 100644 --- a/libc/nt/struct/systemlookasideinformation.h +++ b/libc/nt/struct/systemlookasideinformation.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMLOOKASIDEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMLOOKASIDEINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemLookasideInformation { unsigned char Reserved1[32]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMLOOKASIDEINFORMATION_H_ */ diff --git a/libc/nt/struct/systemperformanceinformation.h b/libc/nt/struct/systemperformanceinformation.h index 116121bff..3e1511b92 100644 --- a/libc/nt/struct/systemperformanceinformation.h +++ b/libc/nt/struct/systemperformanceinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPERFORMANCEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPERFORMANCEINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemPerformanceInformation { int64_t IdleTime; @@ -79,5 +78,4 @@ struct NtSystemPerformanceInformation { uint32_t SystemCalls; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPERFORMANCEINFORMATION_H_ */ diff --git a/libc/nt/struct/systemprocessinformation.h b/libc/nt/struct/systemprocessinformation.h index 41c4d8742..2a8cce28e 100644 --- a/libc/nt/struct/systemprocessinformation.h +++ b/libc/nt/struct/systemprocessinformation.h @@ -3,7 +3,6 @@ #include "libc/nt/struct/iocounters.h" #include "libc/nt/struct/unicodestring.h" #include "libc/nt/struct/vmcounters.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemProcessInformation { uint32_t NextEntryOffset; @@ -24,5 +23,4 @@ struct NtSystemProcessInformation { struct NtIoCounters IoCounters; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPROCESSINFORMATION_H_ */ diff --git a/libc/nt/struct/systemprocessorinformation.h b/libc/nt/struct/systemprocessorinformation.h index 7854230bf..d2e20a6c3 100644 --- a/libc/nt/struct/systemprocessorinformation.h +++ b/libc/nt/struct/systemprocessorinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPROCESSORINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPROCESSORINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemProcessorInformation { unsigned short ProcessorArchitecture; @@ -10,5 +9,4 @@ struct NtSystemProcessorInformation { uint32_t FeatureBits; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPROCESSORINFORMATION_H_ */ diff --git a/libc/nt/struct/systemprocessorperformanceinformation.h b/libc/nt/struct/systemprocessorperformanceinformation.h index b2ce8368b..641d36d6c 100644 --- a/libc/nt/struct/systemprocessorperformanceinformation.h +++ b/libc/nt/struct/systemprocessorperformanceinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPROCESSORPERFORMANCEINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPROCESSORPERFORMANCEINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemProcessorPerformanceInformation { int64_t IdleTime; @@ -10,5 +9,4 @@ struct NtSystemProcessorPerformanceInformation { uint32_t Reserved2; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMPROCESSORPERFORMANCEINFORMATION_H_*/ diff --git a/libc/nt/struct/systemregistryquotainformation.h b/libc/nt/struct/systemregistryquotainformation.h index a6188c8b5..df07acae6 100644 --- a/libc/nt/struct/systemregistryquotainformation.h +++ b/libc/nt/struct/systemregistryquotainformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMREGISTRYQUOTAINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMREGISTRYQUOTAINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemRegistryQuotaInformation { uint32_t RegistryQuotaAllowed; @@ -8,5 +7,4 @@ struct NtSystemRegistryQuotaInformation { void *Reserved1; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMREGISTRYQUOTAINFORMATION_H_ */ diff --git a/libc/nt/struct/systemthreads.h b/libc/nt/struct/systemthreads.h index 18d496d9c..1cffd785f 100644 --- a/libc/nt/struct/systemthreads.h +++ b/libc/nt/struct/systemthreads.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMTHREADS_H_ #include "libc/nt/enum/kwaitreason.h" #include "libc/nt/struct/clientid.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemThreads { int64_t KernelTime; @@ -18,5 +17,4 @@ struct NtSystemThreads { uint32_t WaitReason; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMTHREADS_H_ */ diff --git a/libc/nt/struct/systemtime.h b/libc/nt/struct/systemtime.h index 26074d70a..6722fa1f2 100644 --- a/libc/nt/struct/systemtime.h +++ b/libc/nt/struct/systemtime.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMTIME_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMTIME_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemTime { uint16_t wYear; @@ -13,5 +12,4 @@ struct NtSystemTime { uint16_t wMilliseconds; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMTIME_H_ */ diff --git a/libc/nt/struct/systemtimeofdayinformation.h b/libc/nt/struct/systemtimeofdayinformation.h index 9bb3be388..1e06859a3 100644 --- a/libc/nt/struct/systemtimeofdayinformation.h +++ b/libc/nt/struct/systemtimeofdayinformation.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMTIMEOFDAYINFORMATION_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMTIMEOFDAYINFORMATION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtSystemTimeofdayInformation { int64_t BootTime; @@ -10,5 +9,4 @@ struct NtSystemTimeofdayInformation { unsigned char Reserved1[20]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_SYSTEMTIMEOFDAYINFORMATION_H_ */ diff --git a/libc/nt/struct/teb.h b/libc/nt/struct/teb.h index 8b643af79..a232b4f43 100644 --- a/libc/nt/struct/teb.h +++ b/libc/nt/struct/teb.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_TEB_H_ #include "libc/intrin/segmentation.h" #include "libc/nt/struct/peb.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #if defined(__GNUC__) && !defined(__STRICT_ANSI__) /* @@ -24,5 +23,4 @@ #define _NtGetTls() gs((void **)(0x58)) /* cf. gs((long *)0x1480 + i0..64) */ #endif /* __GNUC__ && !__STRICT_ANSI__ */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TEB_H_ */ diff --git a/libc/nt/struct/timeval.h b/libc/nt/struct/timeval.h index 9f53ddcc0..b5ee6c28e 100644 --- a/libc/nt/struct/timeval.h +++ b/libc/nt/struct/timeval.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_TIMEVAL_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_TIMEVAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtTimeval { @@ -9,5 +8,4 @@ struct NtTimeval { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_TIMEVAL_H_ */ diff --git a/libc/nt/struct/tokenprivileges.h b/libc/nt/struct/tokenprivileges.h index 69b41afcd..f1600d9df 100644 --- a/libc/nt/struct/tokenprivileges.h +++ b/libc/nt/struct/tokenprivileges.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_TOKENPRIVILEGES_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_TOKENPRIVILEGES_H_ #include "libc/nt/struct/luidandattributes.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtTokenPrivileges { uint32_t PrivilegeCount; struct NtLuidAndAttributes Privileges[1]; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_TOKENPRIVILEGES_H_ */ diff --git a/libc/nt/struct/unicodestring.h b/libc/nt/struct/unicodestring.h index ce01321f4..986b9b6c2 100644 --- a/libc/nt/struct/unicodestring.h +++ b/libc/nt/struct/unicodestring.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_UNICODE_H_ #define COSMOPOLITAN_LIBC_NT_UNICODE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtUnicodeString { uint16_t Length; @@ -8,5 +7,4 @@ struct NtUnicodeString { char16_t *Data; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_UNICODE_H_ */ diff --git a/libc/nt/struct/userstack.h b/libc/nt/struct/userstack.h index 6d9e882c9..f86f8ae5f 100644 --- a/libc/nt/struct/userstack.h +++ b/libc/nt/struct/userstack.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_NTUSERSTACK_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_NTUSERSTACK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtUserStack { void *FixedStackBase; @@ -10,5 +9,4 @@ struct NtUserStack { void *ExpandableStackBottom; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_NTUSERSTACK_H_ */ diff --git a/libc/nt/struct/valent.h b/libc/nt/struct/valent.h index 972684c6d..fe78c7f80 100644 --- a/libc/nt/struct/valent.h +++ b/libc/nt/struct/valent.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_VALENT_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_VALENT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtValent { char16_t *ve_valuename; @@ -9,5 +8,4 @@ struct NtValent { uint32_t ve_type; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_VALENT_H_ */ diff --git a/libc/nt/struct/vmcounters.h b/libc/nt/struct/vmcounters.h index bc92e1fda..f05749ebb 100644 --- a/libc/nt/struct/vmcounters.h +++ b/libc/nt/struct/vmcounters.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_VMCOUNTERS_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_VMCOUNTERS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtVmCounters { size_t PeakVirtualSize; @@ -16,5 +15,4 @@ struct NtVmCounters { size_t PeakPagefileUsage; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_VMCOUNTERS_H_ */ diff --git a/libc/nt/struct/win32fileattributedata.h b/libc/nt/struct/win32fileattributedata.h index 17001f368..cbf782bcc 100644 --- a/libc/nt/struct/win32fileattributedata.h +++ b/libc/nt/struct/win32fileattributedata.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_WIN32FILEATTRIBUTEDATA_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_WIN32FILEATTRIBUTEDATA_H_ #include "libc/nt/struct/filetime.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtWin32FileAttributeData { uint32_t dwFileAttributes; /* ←NtFileFlagAndAttributes */ @@ -12,5 +11,4 @@ struct NtWin32FileAttributeData { uint32_t nFileSizeLow; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_WIN32FILEATTRIBUTEDATA_H_ */ diff --git a/libc/nt/struct/win32finddata.h b/libc/nt/struct/win32finddata.h index 3842bc2ed..5b4810295 100644 --- a/libc/nt/struct/win32finddata.h +++ b/libc/nt/struct/win32finddata.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_WIN32FINDDATA_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_WIN32FINDDATA_H_ #include "libc/nt/struct/filetime.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtWin32FindData { uint32_t dwFileAttributes; @@ -19,5 +18,4 @@ struct NtWin32FindData { uint16_t wFinderFlags; /* obsolete */ }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_WIN32FINDDATA_H_ */ diff --git a/libc/nt/struct/windowplacement.h b/libc/nt/struct/windowplacement.h index a249f6b6f..d0802fd3f 100644 --- a/libc/nt/struct/windowplacement.h +++ b/libc/nt/struct/windowplacement.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_STRUCT_WINDOWPLACEMENT_H_ #include "libc/nt/struct/point.h" #include "libc/nt/struct/rect.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct NtWindowPlacement { uint32_t length; @@ -14,5 +13,4 @@ struct NtWindowPlacement { struct NtRect rcDevice; }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_WINDOWPLACEMENT_H_ */ diff --git a/libc/nt/struct/wndclass.h b/libc/nt/struct/wndclass.h index fd0642659..d94375f87 100644 --- a/libc/nt/struct/wndclass.h +++ b/libc/nt/struct/wndclass.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_WNDCLASS_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_WNDCLASS_H_ #include "libc/nt/typedef/wndproc.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtWndClass { @@ -18,5 +17,4 @@ struct NtWndClass { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_WNDCLASS_H_ */ diff --git a/libc/nt/struct/wndclassex.h b/libc/nt/struct/wndclassex.h index 033f6a517..1f3a2df50 100644 --- a/libc/nt/struct/wndclassex.h +++ b/libc/nt/struct/wndclassex.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_WNDCLASSEX_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_WNDCLASSEX_H_ #include "libc/nt/typedef/wndproc.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtWndClassEx { @@ -20,5 +19,4 @@ struct NtWndClassEx { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_STRUCT_WNDCLASSEX_H_ */ diff --git a/libc/nt/synchronization.h b/libc/nt/synchronization.h index bbcff07b1..e5a768859 100644 --- a/libc/nt/synchronization.h +++ b/libc/nt/synchronization.h @@ -7,7 +7,6 @@ #include "libc/nt/struct/securityattributes.h" #include "libc/nt/struct/systemtime.h" #include "libc/nt/thunk/msabi.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -120,5 +119,4 @@ bool32 GetSystemTimeAdjustment(uint32_t *lpTimeAdjustment, #include "libc/nt/thunk/synchronization.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_SYNCHRONIZATION_H_ */ diff --git a/libc/nt/system.h b/libc/nt/system.h index bdfe7567a..131cf9218 100644 --- a/libc/nt/system.h +++ b/libc/nt/system.h @@ -24,7 +24,6 @@ ╔────────────────────────────────────────────────────────────────▀▀▀─────────│─╗ │ cosmopolitan § new technology » system control ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool32 SetSuspendState(bool32 bHibernate, bool32 bForce, @@ -35,5 +34,4 @@ uint32_t InitiateShutdown(const char16_t *lpMachineName, uint32_t dwShutdownFlags, uint32_t dwReason); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_SYSTEM_H_ */ diff --git a/libc/nt/systeminfo.h b/libc/nt/systeminfo.h index c569a07b2..e6b061c39 100644 --- a/libc/nt/systeminfo.h +++ b/libc/nt/systeminfo.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_NT_INFO_H_ #include "libc/nt/struct/systeminfo.h" #include "libc/nt/thunk/msabi.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void GetSystemInfo(struct NtSystemInfo *lpSystemInfo); @@ -18,5 +17,4 @@ bool32 GetComputerNameEx(/* enum/computernameformat.h */ int NameType, #include "libc/nt/thunk/systeminfo.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_INFO_H_ */ diff --git a/libc/nt/thread.h b/libc/nt/thread.h index a15968095..6f5ae1bc9 100644 --- a/libc/nt/thread.h +++ b/libc/nt/thread.h @@ -4,7 +4,6 @@ #include "libc/nt/struct/overlapped.h" #include "libc/nt/struct/securityattributes.h" #include "libc/nt/thunk/msabi.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* ░░░░ ▒▒▒░░░▒▒▒▒▒▒▒▓▓▓░ @@ -75,5 +74,4 @@ void *GetThreadDescription(int64_t hThread, #include "libc/nt/thunk/thread.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_THREADS_H_ */ diff --git a/libc/nt/thunk/msabi.h b/libc/nt/thunk/msabi.h index 0891f83b8..24dc92c9d 100644 --- a/libc/nt/thunk/msabi.h +++ b/libc/nt/thunk/msabi.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_NT_THUNK_MSABI_H_ #define COSMOPOLITAN_LIBC_NT_THUNK_MSABI_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef __x86_64__ #if !defined(__STRICT_ANSI__) && \ @@ -33,5 +32,4 @@ #define ShouldUseMsabiAttribute() 0 #endif #endif /* __x86_64__ */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_THUNK_MSABI_H_ */ diff --git a/libc/nt/typedef/exceptionhandler.h b/libc/nt/typedef/exceptionhandler.h index ac9da9d4a..e45ac15ee 100644 --- a/libc/nt/typedef/exceptionhandler.h +++ b/libc/nt/typedef/exceptionhandler.h @@ -3,7 +3,6 @@ #include "libc/nt/struct/context.h" #include "libc/nt/struct/exceptionframe.h" #include "libc/nt/struct/ntexceptionrecord.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef unsigned (*NtExceptionHandler)(struct NtExceptionRecord *, @@ -11,5 +10,4 @@ typedef unsigned (*NtExceptionHandler)(struct NtExceptionRecord *, struct NtContext *, void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TYPEDEF_EXCEPTIONHANDLER_H_ */ diff --git a/libc/nt/typedef/handlerroutine.h b/libc/nt/typedef/handlerroutine.h index 52140e60e..49119fd19 100644 --- a/libc/nt/typedef/handlerroutine.h +++ b/libc/nt/typedef/handlerroutine.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_NT_TYPEDEF_HANDLERROUTINE_H_ #define COSMOPOLITAN_LIBC_NT_TYPEDEF_HANDLERROUTINE_H_ #include "libc/nt/enum/ctrlevent.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef bool32 (*NtHandlerRoutine)(uint32_t); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TYPEDEF_HANDLERROUTINE_H_ */ diff --git a/libc/nt/typedef/hookproc.h b/libc/nt/typedef/hookproc.h index 3f612e029..9227ea2df 100644 --- a/libc/nt/typedef/hookproc.h +++ b/libc/nt/typedef/hookproc.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_TYPEDEF_HOOKPROC_H_ #define COSMOPOLITAN_LIBC_NT_TYPEDEF_HOOKPROC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef intptr_t (*NtHookProc)(int code, uintptr_t wParam, intptr_t lParam); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TYPEDEF_HOOKPROC_H_ */ diff --git a/libc/nt/typedef/imagetlscallback.h b/libc/nt/typedef/imagetlscallback.h index 3315209ca..a89582aa8 100644 --- a/libc/nt/typedef/imagetlscallback.h +++ b/libc/nt/typedef/imagetlscallback.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_NT_TYPEDEF_IMAGETLSCALLBACK_H_ #define COSMOPOLITAN_LIBC_NT_TYPEDEF_IMAGETLSCALLBACK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef void (*NtImageTlsCallback)(void *DllHandle, uint32_t Reason, void *Reserved); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TYPEDEF_IMAGETLSCALLBACK_H_ */ diff --git a/libc/nt/typedef/ioapcroutine.h b/libc/nt/typedef/ioapcroutine.h index f74bf00a5..bd0d72cab 100644 --- a/libc/nt/typedef/ioapcroutine.h +++ b/libc/nt/typedef/ioapcroutine.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_NT_TYPEDEF_IOAPCROUTINE_H_ #define COSMOPOLITAN_LIBC_NT_TYPEDEF_IOAPCROUTINE_H_ #include "libc/nt/struct/iostatusblock.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef void (*NtIoApcRoutine)(void *ApcContext, struct NtIoStatusBlock *IoStatusBlock, uint32_t Reserved); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TYPEDEF_IOAPCROUTINE_H_ */ diff --git a/libc/nt/typedef/pknormalroutine.h b/libc/nt/typedef/pknormalroutine.h index 78cbef04e..9a8aa8784 100644 --- a/libc/nt/typedef/pknormalroutine.h +++ b/libc/nt/typedef/pknormalroutine.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_LIBC_NT_TYPEDEF_PKNORMALROUTINE_H_ #define COSMOPOLITAN_LIBC_NT_TYPEDEF_PKNORMALROUTINE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef void (*NtPkNormalRoutine)(void *NormalContext, void *SystemArgument1, void *SystemArgument2); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TYPEDEF_PKNORMALROUTINE_H_ */ diff --git a/libc/nt/typedef/timerproc.h b/libc/nt/typedef/timerproc.h index 154ac7352..940fbcd4e 100644 --- a/libc/nt/typedef/timerproc.h +++ b/libc/nt/typedef/timerproc.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_TYPEDEF_TIMERPROC_H_ #define COSMOPOLITAN_LIBC_NT_TYPEDEF_TIMERPROC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef void (*NtTimerProc)(int64_t, uint32_t, uintptr_t, uint32_t); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TYPEDEF_TIMERPROC_H_ */ diff --git a/libc/nt/typedef/wambda.h b/libc/nt/typedef/wambda.h index 4cb817b54..4f592ed0e 100644 --- a/libc/nt/typedef/wambda.h +++ b/libc/nt/typedef/wambda.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_WAMBDA_H_ #define COSMOPOLITAN_LIBC_NT_WAMBDA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef intptr_t (*wambda)(); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_WAMBDA_H_ */ diff --git a/libc/nt/typedef/wndenumproc.h b/libc/nt/typedef/wndenumproc.h index 6f5ac154b..91102f3af 100644 --- a/libc/nt/typedef/wndenumproc.h +++ b/libc/nt/typedef/wndenumproc.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_TYPEDEF_WNDENUMPROC_H_ #define COSMOPOLITAN_LIBC_NT_TYPEDEF_WNDENUMPROC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef int (*NtWndEnumProc)(int64_t foo, intptr_t bar); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TYPEDEF_WNDENUMPROC_H_ */ diff --git a/libc/nt/typedef/wndproc.h b/libc/nt/typedef/wndproc.h index 37a256a18..f96856c44 100644 --- a/libc/nt/typedef/wndproc.h +++ b/libc/nt/typedef/wndproc.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_NT_TYPEDEF_WNDPROC_H_ #define COSMOPOLITAN_LIBC_NT_TYPEDEF_WNDPROC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef int64_t (*NtWndProc)(int64_t, uint32_t, uint64_t, int64_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_TYPEDEF_WNDPROC_H_ */ diff --git a/libc/nt/version.h b/libc/nt/version.h index 38b18afd6..77572bd89 100644 --- a/libc/nt/version.h +++ b/libc/nt/version.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_NT_VERSION_H_ #define COSMOPOLITAN_LIBC_NT_VERSION_H_ #include "libc/nt/struct/osversioninfo.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool32 IsAtLeastWindows10(void) pureconst; @@ -20,5 +19,4 @@ bool32 GetVersionEx(struct NtOsVersionInfo *lpVersionInformation); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_VERSION_H_ */ diff --git a/libc/nt/windows.h b/libc/nt/windows.h index 68f79e62f..e8c6de3b9 100644 --- a/libc/nt/windows.h +++ b/libc/nt/windows.h @@ -28,7 +28,6 @@ ╔────────────────────────────────────────────────────────────────▀▀▀─────────│─╗ │ cosmopolitan § new technology » windows ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int64_t CreateWindowEx(uint32_t dwExStyle, const char16_t *lpClassName, @@ -97,5 +96,4 @@ int WideCharToMultiByte(unsigned int CodePage, uint32_t dwFlags, uint16_t *lpDefaultChar, int *lpUsedDefaultChar); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_WINDOWS_H_ */ diff --git a/libc/nt/winsock.h b/libc/nt/winsock.h index 6a7a808be..1b1ac434c 100644 --- a/libc/nt/winsock.h +++ b/libc/nt/winsock.h @@ -71,7 +71,6 @@ #define kNtNspNotifyPort 3 #define kNtNspNotifyApc 4 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct NtMsgHdr { @@ -505,5 +504,4 @@ bool32 DisconnectEx(int64_t s, struct NtOverlapped *inout_opt_lpOverlapped, #include "libc/nt/thunk/winsock.inc" #endif /* ShouldUseMsabiAttribute() */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_NT_WINSOCK_H_ */ diff --git a/libc/proc/cocmd.c b/libc/proc/cocmd.c index 44b7bbc47..5cc91580c 100644 --- a/libc/proc/cocmd.c +++ b/libc/proc/cocmd.c @@ -25,7 +25,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/fmt/magnumstrs.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/getenv.internal.h" #include "libc/intrin/weaken.h" #include "libc/limits.h" diff --git a/libc/proc/describefds.internal.h b/libc/proc/describefds.internal.h index 8e9f67997..0bd1d7033 100644 --- a/libc/proc/describefds.internal.h +++ b/libc/proc/describefds.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_PROC_DESCRIBEFDS_INTERNAL_H_ #include "libc/calls/struct/fd.internal.h" #include "libc/nt/struct/startupinfo.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool __is_cloexec(const struct Fd *); @@ -11,5 +10,4 @@ char *__describe_fds(const struct Fd *, size_t, struct NtStartupInfo *, int64_t, int64_t **, uint32_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_PROC_DESCRIBEFDS_INTERNAL_H_ */ diff --git a/libc/proc/execve-sysv.c b/libc/proc/execve-sysv.c index d4d7fa254..982c3c8df 100644 --- a/libc/proc/execve-sysv.c +++ b/libc/proc/execve-sysv.c @@ -27,7 +27,6 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/magnumstrs.internal.h" -#include "libc/intrin/bits.h" #include "libc/intrin/describeflags.internal.h" #include "libc/intrin/safemacros.internal.h" #include "libc/intrin/strace.internal.h" diff --git a/libc/proc/execve.internal.h b/libc/proc/execve.internal.h index da99c4a38..f9213ff5c 100644 --- a/libc/proc/execve.internal.h +++ b/libc/proc/execve.internal.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_EXECVE_SYSV_H_ #define COSMOPOLITAN_LIBC_CALLS_EXECVE_SYSV_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool IsApeLoadable(char[8]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_EXECVE_SYSV_H_ */ diff --git a/libc/proc/ntspawn.h b/libc/proc/ntspawn.h index 9c9d154ac..5a4de12b5 100644 --- a/libc/proc/ntspawn.h +++ b/libc/proc/ntspawn.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_NTSPAWN_H_ #include "libc/nt/struct/processinformation.h" #include "libc/nt/struct/startupinfo.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void mungentpath(char *); @@ -13,5 +12,4 @@ int ntspawn(int64_t, const char *, char *const[], char *const[], char *const[], const struct NtStartupInfo *, struct NtProcessInformation *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_NTSPAWN_H_ */ diff --git a/libc/proc/posix_spawn.h b/libc/proc/posix_spawn.h index 9bc0cfd93..1e8f1a485 100644 --- a/libc/proc/posix_spawn.h +++ b/libc/proc/posix_spawn.h @@ -14,7 +14,6 @@ #define POSIX_SPAWN_SETSID 128 #define POSIX_SPAWN_SETRLIMIT 256 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct _posix_spawna *posix_spawnattr_t; @@ -55,5 +54,4 @@ int posix_spawnattr_getrlimit(const posix_spawnattr_t *, int, struct rlimit *); int posix_spawnattr_setrlimit(posix_spawnattr_t *, int, const struct rlimit *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_SPAWN_H_ */ diff --git a/libc/proc/posix_spawn.internal.h b/libc/proc/posix_spawn.internal.h index 6dce26533..3d3b8ba39 100644 --- a/libc/proc/posix_spawn.internal.h +++ b/libc/proc/posix_spawn.internal.h @@ -11,7 +11,6 @@ #define _POSIX_SPAWN_CHDIR 4 #define _POSIX_SPAWN_FCHDIR 5 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct _posix_spawna { @@ -43,5 +42,4 @@ int __posix_spawn_add_file_action(posix_spawn_file_actions_t *, struct _posix_faction); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_SPAWNA_INTERNAL_H_ */ diff --git a/libc/proc/proc.internal.h b/libc/proc/proc.internal.h index 1d9417d10..d2971d470 100644 --- a/libc/proc/proc.internal.h +++ b/libc/proc/proc.internal.h @@ -6,7 +6,6 @@ #include "libc/intrin/dll.h" #include "libc/thread/thread.h" #include "third_party/nsync/mu.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define PROC_ALIVE 0 @@ -56,5 +55,4 @@ int __proc_harvest(struct Proc *, bool); int sys_wait4_nt(int, int *, int, struct rusage *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_PROC_H_ */ diff --git a/libc/runtime/clktck.h b/libc/runtime/clktck.h index 3ab13648a..34b591d96 100644 --- a/libc/runtime/clktck.h +++ b/libc/runtime/clktck.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_RUNTIME_CLKTCK_H_ #define COSMOPOLITAN_LIBC_RUNTIME_CLKTCK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define CLK_TCK (__clk_tck()) @@ -8,5 +7,4 @@ COSMOPOLITAN_C_START_ int __clk_tck(void) pureconst; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_CLKTCK_H_ */ diff --git a/libc/runtime/efimain.greg.c b/libc/runtime/efimain.greg.c index e71704e2e..2f97c4cf7 100644 --- a/libc/runtime/efimain.greg.c +++ b/libc/runtime/efimain.greg.c @@ -19,7 +19,6 @@ #include "ape/relocations.h" #include "ape/sections.internal.h" #include "libc/dce.h" -#include "libc/intrin/bits.h" #include "libc/intrin/newbie.h" #include "libc/intrin/weaken.h" #include "libc/macros.internal.h" diff --git a/libc/runtime/fenv.h b/libc/runtime/fenv.h index 3a20b1a6c..ac9b33c47 100644 --- a/libc/runtime/fenv.h +++ b/libc/runtime/fenv.h @@ -65,7 +65,6 @@ typedef double fenv_t; #define FLT_EVAL_METHOD 0 #endif -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define FLT_ROUNDS (__flt_rounds()) @@ -85,5 +84,4 @@ int __flt_rounds(void); int __fesetround(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_FENV_H_ */ diff --git a/libc/runtime/getdosenviron.c b/libc/runtime/getdosenviron.c index 4744c1ace..c4bcf7509 100644 --- a/libc/runtime/getdosenviron.c +++ b/libc/runtime/getdosenviron.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" #include "libc/str/utf16.h" diff --git a/libc/runtime/getsymboltable.c b/libc/runtime/getsymboltable.c index a683177ae..343e65069 100644 --- a/libc/runtime/getsymboltable.c +++ b/libc/runtime/getsymboltable.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/intrin/bits.h" #include "libc/intrin/promises.internal.h" #include "libc/intrin/strace.internal.h" #include "libc/intrin/weaken.h" diff --git a/libc/runtime/grow.c b/libc/runtime/grow.c index dac2f89b5..95518578c 100644 --- a/libc/runtime/grow.c +++ b/libc/runtime/grow.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" #include "libc/intrin/weaken.h" #include "libc/macros.internal.h" #include "libc/mem/mem.h" diff --git a/libc/runtime/init.S b/libc/runtime/init.S index 6aa6ce963..a754eb8bb 100644 --- a/libc/runtime/init.S +++ b/libc/runtime/init.S @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/macros.internal.h" -#include "libc/runtime/internal.h" #include "libc/sysv/consts/prot.h" #include "libc/dce.h" diff --git a/libc/runtime/internal.h b/libc/runtime/internal.h index 77d160463..a77d85ff0 100644 --- a/libc/runtime/internal.h +++ b/libc/runtime/internal.h @@ -10,7 +10,6 @@ #define RUNLEVEL_MALLOC 1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern int __pid; @@ -50,6 +49,5 @@ void __on_arithmetic_overflow(void); void __init_fds(int, char **, char **); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* ANSI */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_INTERNAL_H_ */ diff --git a/libc/runtime/memtrack.internal.h b/libc/runtime/memtrack.internal.h index 1c7bf301e..7217c93ea 100644 --- a/libc/runtime/memtrack.internal.h +++ b/libc/runtime/memtrack.internal.h @@ -8,7 +8,6 @@ #include "libc/runtime/stack.h" #include "libc/sysv/consts/ss.h" #include "libc/thread/tls.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define kAutomapStart 0x100080040000 @@ -188,5 +187,4 @@ forceinline pureconst bool OverlapsShadowSpace(const void *p, size_t n) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_MEMTRACK_H_ */ diff --git a/libc/runtime/metalprintf.internal.h b/libc/runtime/metalprintf.internal.h index 0dd23224f..69f5e7ae6 100644 --- a/libc/runtime/metalprintf.internal.h +++ b/libc/runtime/metalprintf.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_RUNTIME_METALPRINTF_H_ #define COSMOPOLITAN_LIBC_RUNTIME_METALPRINTF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void MetalPrintf(const char *, ...); @@ -12,5 +11,4 @@ void MetalPrintf(const char *, ...); } while (0) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_METALPRINTF_H_ */ diff --git a/libc/runtime/mman.internal.h b/libc/runtime/mman.internal.h index 8530aaf0b..7a6a300e1 100644 --- a/libc/runtime/mman.internal.h +++ b/libc/runtime/mman.internal.h @@ -1,6 +1,14 @@ #ifndef COSMOPOLITAN_LIBC_RUNTIME_MMAN_H_ #define COSMOPOLITAN_LIBC_RUNTIME_MMAN_H_ #include "libc/runtime/e820.internal.h" + +/* Values for mman::pc_video_type. */ +#define PC_VIDEO_TEXT 0 +#define PC_VIDEO_BGR565 1 +#define PC_VIDEO_BGR555 2 +#define PC_VIDEO_BGRX8888 3 +#define PC_VIDEO_RGBX8888 4 + #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ @@ -39,22 +47,14 @@ struct mman { struct { /* 0x1d48 — starting cursor pos. */ unsigned short y, x; } pc_video_curs_info; - unsigned short pc_video_char_height; /* 0x1d4c — character height (useful - for setting cursor shape - in text mode) */ - uint64_t pc_acpi_rsdp; /* 0x1d50 — pointer to ACPI RSDP; - NULL means to search for - it in legacy BIOS areas */ + unsigned short pc_video_char_height; /* 0x1d4c — character height (useful + for setting cursor shape + in text mode) */ + uint64_t pc_acpi_rsdp; /* 0x1d50 — pointer to ACPI RSDP; + NULL means to search for + it in legacy BIOS areas */ }; COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ - -/* Values for mman::pc_video_type. */ -#define PC_VIDEO_TEXT 0 -#define PC_VIDEO_BGR565 1 -#define PC_VIDEO_BGR555 2 -#define PC_VIDEO_BGRX8888 3 -#define PC_VIDEO_RGBX8888 4 - #endif /* COSMOPOLITAN_LIBC_RUNTIME_MMAN_H_ */ diff --git a/libc/runtime/mmap.c b/libc/runtime/mmap.c index 683d777ab..5c532a6b6 100644 --- a/libc/runtime/mmap.c +++ b/libc/runtime/mmap.c @@ -25,7 +25,6 @@ #include "libc/errno.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/asancodes.h" -#include "libc/intrin/bits.h" #include "libc/intrin/bsr.h" #include "libc/intrin/describeflags.internal.h" #include "libc/intrin/directmap.internal.h" diff --git a/libc/runtime/morph_tls.c b/libc/runtime/morph_tls.c index 7a8958635..203a14dc0 100644 --- a/libc/runtime/morph_tls.c +++ b/libc/runtime/morph_tls.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "ape/sections.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/runtime/internal.h" #include "libc/runtime/runtime.h" #include "libc/thread/tls.h" diff --git a/libc/runtime/opensymboltable.greg.c b/libc/runtime/opensymboltable.greg.c index 665364ed6..b9ad1e426 100644 --- a/libc/runtime/opensymboltable.greg.c +++ b/libc/runtime/opensymboltable.greg.c @@ -22,7 +22,6 @@ #include "libc/dce.h" #include "libc/elf/tinyelf.internal.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/intrin/strace.internal.h" #include "libc/limits.h" #include "libc/log/libfatal.internal.h" diff --git a/libc/runtime/pathconf.h b/libc/runtime/pathconf.h index 4d86fc668..d569e070a 100644 --- a/libc/runtime/pathconf.h +++ b/libc/runtime/pathconf.h @@ -23,12 +23,10 @@ #define _PC_SYMLINK_MAX 19 #define _PC_2_SYMLINKS 20 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ long fpathconf(int, int); long pathconf(const char *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_PATHCONF_H_ */ diff --git a/libc/runtime/runtime.h b/libc/runtime/runtime.h index 7fd10305a..364f4d26d 100644 --- a/libc/runtime/runtime.h +++ b/libc/runtime/runtime.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_RUNTIME_RUNTIME_H_ #define COSMOPOLITAN_LIBC_RUNTIME_RUNTIME_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § runtime ─╬─│┼ @@ -148,5 +147,4 @@ __funline int __trace_disabled(int x) { #endif /* _COSMO_SOURCE */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_RUNTIME_H_ */ diff --git a/libc/runtime/stack.h b/libc/runtime/stack.h index 4d04850c1..6d89da176 100644 --- a/libc/runtime/stack.h +++ b/libc/runtime/stack.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_RUNTIME_STACK_H_ #define COSMOPOLITAN_LIBC_RUNTIME_STACK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE /** @@ -158,5 +157,4 @@ int FreeCosmoStack(void *) libcesque; COSMOPOLITAN_C_END_ #endif /* GNU ELF */ #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_STACK_H_ */ diff --git a/libc/runtime/symbols.internal.h b/libc/runtime/symbols.internal.h index 6030d103b..cb5ab5138 100644 --- a/libc/runtime/symbols.internal.h +++ b/libc/runtime/symbols.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYMBOLS_H_ #define COSMOPOLITAN_LIBC_SYMBOLS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define SYMBOLS_MAGIC 0x544d5953 /* SYMT */ @@ -36,5 +35,4 @@ int __get_symbol(struct SymbolTable *, intptr_t); char *__get_symbol_name(struct SymbolTable *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYMBOLS_H_ */ diff --git a/libc/runtime/sysconf.h b/libc/runtime/sysconf.h index 6da479458..c44138c09 100644 --- a/libc/runtime/sysconf.h +++ b/libc/runtime/sysconf.h @@ -145,11 +145,9 @@ #define _SC_SIGSTKSZ 249 #define _SC_MINSIGSTKSZ 250 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ long sysconf(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_SYSCONF_H_ */ diff --git a/libc/runtime/syslib.internal.h b/libc/runtime/syslib.internal.h index 0b65332b3..01e129464 100644 --- a/libc/runtime/syslib.internal.h +++ b/libc/runtime/syslib.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_RUNTIME_SYSLIB_H_ #define COSMOPOLITAN_LIBC_RUNTIME_SYSLIB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -80,5 +79,4 @@ struct Syslib { extern struct Syslib *__syslib; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_SYSLIB_H_ */ diff --git a/libc/runtime/unwind.h b/libc/runtime/unwind.h index 43c6127d2..4570446f6 100644 --- a/libc/runtime/unwind.h +++ b/libc/runtime/unwind.h @@ -3,7 +3,6 @@ #define UNW_TDEP_CURSOR_LEN 127 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef enum { @@ -38,5 +37,4 @@ _Unwind_Reason_Code _Unwind_Backtrace(_Unwind_Trace_Fn, void *); void *_Unwind_FindEnclosingFunction(void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_UNWIND_H_ */ diff --git a/libc/runtime/utmp.h b/libc/runtime/utmp.h index 2c69a24bb..6dbfa8c7d 100644 --- a/libc/runtime/utmp.h +++ b/libc/runtime/utmp.h @@ -8,7 +8,6 @@ #define UT_HOSTSIZE 256 #define UT_LINESIZE 32 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct lastlog { @@ -43,5 +42,4 @@ void updwtmp(const char *, const struct utmp *); #define WTMP_FILENAME _PATH_WTMP COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_UTMP_H_ */ diff --git a/libc/runtime/utmpx.h b/libc/runtime/utmpx.h index 78fcb405f..0320200bd 100644 --- a/libc/runtime/utmpx.h +++ b/libc/runtime/utmpx.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_RUNTIME_UTMPX_H_ #include "libc/calls/struct/timeval.h" #include "libc/calls/weirdtypes.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct utmpx { @@ -47,5 +46,4 @@ int utmpxname(const char *); #define DEAD_PROCESS 8 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_UTMPX_H_ */ diff --git a/libc/runtime/winargs.internal.h b/libc/runtime/winargs.internal.h index 3d1e563d0..c123cd613 100644 --- a/libc/runtime/winargs.internal.h +++ b/libc/runtime/winargs.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_RUNTIME_WINARGS_INTERNAL_H_ #define COSMOPOLITAN_LIBC_RUNTIME_WINARGS_INTERNAL_H_ #include "libc/limits.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct WinArgs { @@ -14,5 +13,4 @@ struct WinArgs { } forcealign(16); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_WINARGS_INTERNAL_H_ */ diff --git a/libc/runtime/winmain.greg.c b/libc/runtime/winmain.greg.c index 1ab8f350c..7d8ea8842 100644 --- a/libc/runtime/winmain.greg.c +++ b/libc/runtime/winmain.greg.c @@ -19,7 +19,7 @@ #include "libc/assert.h" #include "libc/calls/internal.h" #include "libc/calls/syscall_support-nt.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/nomultics.internal.h" #include "libc/intrin/weaken.h" #include "libc/limits.h" diff --git a/libc/runtime/zipos-get.c b/libc/runtime/zipos-get.c index 0a2385a32..72002322b 100644 --- a/libc/runtime/zipos-get.c +++ b/libc/runtime/zipos-get.c @@ -29,6 +29,7 @@ #include "libc/mem/alg.h" #include "libc/runtime/runtime.h" #include "libc/runtime/zipos.internal.h" +#include "libc/str/str.h" #include "libc/sysv/consts/auxv.h" #include "libc/sysv/consts/f.h" #include "libc/sysv/consts/map.h" diff --git a/libc/runtime/zipos-open.c b/libc/runtime/zipos-open.c index e87414c88..fa87508c3 100644 --- a/libc/runtime/zipos-open.c +++ b/libc/runtime/zipos-open.c @@ -36,6 +36,7 @@ #include "libc/runtime/internal.h" #include "libc/runtime/memtrack.internal.h" #include "libc/runtime/zipos.internal.h" +#include "libc/str/str.h" #include "libc/sysv/consts/f.h" #include "libc/sysv/consts/fd.h" #include "libc/sysv/consts/map.h" diff --git a/libc/runtime/zipos-read.c b/libc/runtime/zipos-read.c index bbf28add5..efcc42425 100644 --- a/libc/runtime/zipos-read.c +++ b/libc/runtime/zipos-read.c @@ -19,6 +19,8 @@ #include "libc/assert.h" #include "libc/calls/struct/iovec.h" #include "libc/runtime/zipos.internal.h" +#include "libc/stdio/sysparam.h" +#include "libc/str/str.h" #include "libc/sysv/consts/s.h" #include "libc/sysv/errfuns.h" #include "libc/thread/tls.h" diff --git a/libc/runtime/zipos.internal.h b/libc/runtime/zipos.internal.h index 2e82e59e3..a28ffc38d 100644 --- a/libc/runtime/zipos.internal.h +++ b/libc/runtime/zipos.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_ZIPOS_ZIPOS_H_ #define COSMOPOLITAN_LIBC_ZIPOS_ZIPOS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define ZIPOS_PATH_MAX 1024 @@ -59,5 +58,4 @@ void *__zipos_mmap(void *, uint64_t, int32_t, int32_t, struct ZiposHandle *, int64_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ZIPOS_ZIPOS_H_ */ diff --git a/libc/intrin/bits.h b/libc/serialize.h similarity index 67% rename from libc/intrin/bits.h rename to libc/serialize.h index 787aa9460..97d530a71 100644 --- a/libc/intrin/bits.h +++ b/libc/serialize.h @@ -1,60 +1,73 @@ -#ifndef COSMOPOLITAN_LIBC_BITS_H_ -#define COSMOPOLITAN_LIBC_BITS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) +#ifndef COSMOPOLITAN_SERIALIZE_H_ +#define COSMOPOLITAN_SERIALIZE_H_ #ifdef _COSMO_SOURCE -COSMOPOLITAN_C_START_ -int _bitreverse8(int) pureconst; -int _bitreverse16(int) pureconst; -uint32_t _bitreverse32(uint32_t) pureconst; -uint64_t _bitreverse64(uint64_t) pureconst; +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#define __SWAPBE16(x) (x) +#define __SWAPBE32(x) (x) +#define __SWAPBE64(x) (x) +#else +#define __SWAPBE16(x) __builtin_bswap16(x) +#define __SWAPBE32(x) __builtin_bswap32(x) +#define __SWAPBE64(x) __builtin_bswap64(x) +#endif + +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#define __SWAPLE16(x) (x) +#define __SWAPLE32(x) (x) +#define __SWAPLE64(x) (x) +#else +#define __SWAPLE16(x) __builtin_bswap16(x) +#define __SWAPLE32(x) __builtin_bswap32(x) +#define __SWAPLE64(x) __builtin_bswap64(x) +#endif #define READ16LE(P) \ (__extension__({ \ uint16_t __x; \ __builtin_memcpy(&__x, P, 16 / 8); \ - __x; \ + __SWAPLE16(__x); \ })) #define READ16BE(P) \ (__extension__({ \ uint16_t __x; \ __builtin_memcpy(&__x, P, 16 / 8); \ - __builtin_bswap16(__x); \ + __SWAPBE16(__x); \ })) #define READ32LE(P) \ (__extension__({ \ uint32_t __x; \ __builtin_memcpy(&__x, P, 32 / 8); \ - __x; \ + __SWAPLE32(__x); \ })) #define READ32BE(P) \ (__extension__({ \ uint32_t __x; \ __builtin_memcpy(&__x, P, 32 / 8); \ - __builtin_bswap32(__x); \ + __SWAPBE32(__x); \ })) #define READ64LE(P) \ (__extension__({ \ uint64_t __x; \ __builtin_memcpy(&__x, P, 64 / 8); \ - __x; \ + __SWAPLE32(__x); \ })) #define READ64BE(P) \ (__extension__({ \ uint64_t __x; \ __builtin_memcpy(&__x, P, 64 / 8); \ - __builtin_bswap64(__x); \ + __SWAPBE64(__x); \ })) #define WRITE16LE(P, X) \ (__extension__({ \ __typeof__(&(P)[0]) __p = (P); \ - uint16_t __x = (X); \ + uint16_t __x = __SWAPLE16(X); \ __builtin_memcpy(__p, &__x, 16 / 8); \ __p + 16 / 8; \ })) @@ -62,7 +75,7 @@ uint64_t _bitreverse64(uint64_t) pureconst; #define WRITE16BE(P, X) \ (__extension__({ \ __typeof__(&(P)[0]) __p = (P); \ - uint16_t __x = __builtin_bswap16(X); \ + uint16_t __x = __SWAPBE16(X); \ __builtin_memcpy(__p, &__x, 16 / 8); \ __p + 16 / 8; \ })) @@ -70,7 +83,7 @@ uint64_t _bitreverse64(uint64_t) pureconst; #define WRITE32LE(P, X) \ (__extension__({ \ __typeof__(&(P)[0]) __p = (P); \ - uint32_t __x = (X); \ + uint32_t __x = __SWAPLE32(X); \ __builtin_memcpy(__p, &__x, 32 / 8); \ __p + 32 / 8; \ })) @@ -78,7 +91,7 @@ uint64_t _bitreverse64(uint64_t) pureconst; #define WRITE32BE(P, X) \ (__extension__({ \ __typeof__(&(P)[0]) __p = (P); \ - uint32_t __x = __builtin_bswap32(X); \ + uint32_t __x = __SWAPBE32(X); \ __builtin_memcpy(__p, &__x, 32 / 8); \ __p + 32 / 8; \ })) @@ -86,7 +99,7 @@ uint64_t _bitreverse64(uint64_t) pureconst; #define WRITE64LE(P, X) \ (__extension__({ \ __typeof__(&(P)[0]) __p = (P); \ - uint64_t __x = (X); \ + uint64_t __x = __SWAPLE64(X); \ __builtin_memcpy(__p, &__x, 64 / 8); \ __p + 64 / 8; \ })) @@ -94,12 +107,10 @@ uint64_t _bitreverse64(uint64_t) pureconst; #define WRITE64BE(P, X) \ (__extension__({ \ __typeof__(&(P)[0]) __p = (P); \ - uint64_t __x = __builtin_bswap64(X); \ + uint64_t __x = __SWAPBE64(X); \ __builtin_memcpy(__p, &__x, 64 / 8); \ __p + 64 / 8; \ })) -COSMOPOLITAN_C_END_ #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_BITS_H_ */ +#endif /* COSMOPOLITAN_SERIALIZE_H_ */ diff --git a/libc/sock/alg.h b/libc/sock/alg.h index 0bb5affd4..d4b858eda 100644 --- a/libc/sock/alg.h +++ b/libc/sock/alg.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_ALG_H_ #define COSMOPOLITAN_LIBC_SOCK_ALG_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sockaddr_alg { @@ -25,5 +24,4 @@ struct af_alg_iv { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_ALG_H_ */ diff --git a/libc/sock/epoll.h b/libc/sock/epoll.h index 6a0994388..6f0023dda 100644 --- a/libc/sock/epoll.h +++ b/libc/sock/epoll.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_WEPOLL_H_ #define COSMOPOLITAN_LIBC_SOCK_WEPOLL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #include "libc/calls/struct/sigset.h" @@ -23,5 +22,4 @@ int epoll_wait(int, struct epoll_event *, int, int); int epoll_pwait(int, struct epoll_event *, int, int, const sigset_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_WEPOLL_H_ */ diff --git a/libc/sock/gethostips.c b/libc/sock/gethostips.c index 7bd82696a..7dd4d25c5 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/intrin/bits.h" +#include "libc/serialize.h" #include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nt/errors.h" diff --git a/libc/sock/goodsocket.internal.h b/libc/sock/goodsocket.internal.h index 8c2509893..fd89109d4 100644 --- a/libc/sock/goodsocket.internal.h +++ b/libc/sock/goodsocket.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_GOODSOCKET_H_ #define COSMOPOLITAN_LIBC_SOCK_GOODSOCKET_H_ #include "libc/calls/struct/timeval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int GoodSocket(int, int, int, bool, const struct timeval *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_GOODSOCKET_H_ */ diff --git a/libc/sock/ifaddrs.h b/libc/sock/ifaddrs.h index a333a2df7..50da11bcb 100644 --- a/libc/sock/ifaddrs.h +++ b/libc/sock/ifaddrs.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_IFADDRS_H_ #define COSMOPOLITAN_LIBC_SOCK_IFADDRS_H_ #include "libc/sock/struct/sockaddr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct ifaddrs { @@ -21,5 +20,4 @@ void freeifaddrs(struct ifaddrs *); int getifaddrs(struct ifaddrs **); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_IFADDRS_H_ */ diff --git a/libc/sock/inet_pton.c b/libc/sock/inet_pton.c index 289f05a59..62eda4b7a 100644 --- a/libc/sock/inet_pton.c +++ b/libc/sock/inet_pton.c @@ -56,7 +56,11 @@ static int inet_pton_inet6_impl(const char *src, uint8_t *dst) { if (zeroFound) { return 0; } - res = resTemp << (4 * digitsLeft); + if (digitsLeft == 32) { + res = 0; + } else { + res = resTemp << (4 * digitsLeft); + } resTemp = 0; digitsLeft -= 4; zeroFound = true; diff --git a/libc/sock/internal.h b/libc/sock/internal.h index 5914d91a1..3cc13b061 100644 --- a/libc/sock/internal.h +++ b/libc/sock/internal.h @@ -8,7 +8,6 @@ #include "libc/sock/select.h" #include "libc/sock/sock.h" #include "libc/sock/struct/sockaddr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define kNtFdRead 1 @@ -83,5 +82,4 @@ int64_t GetNtBaseSocket(int64_t); int sys_close_epoll(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_INTERNAL_H_ */ diff --git a/libc/sock/ipclassify.internal.h b/libc/sock/ipclassify.internal.h index a0afd99e3..e2dd743a0 100644 --- a/libc/sock/ipclassify.internal.h +++ b/libc/sock/ipclassify.internal.h @@ -5,7 +5,6 @@ #include "libc/sysv/consts/af.h" #include "libc/sysv/consts/inaddr.h" #include "libc/sysv/errfuns.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -65,6 +64,5 @@ forceinline bool ispublicip(int sin_family, void *sin_addr) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* !ANSI */ #endif /* COSMOPOLITAN_LIBC_SOCK_IPCLASSIFY_H_ */ diff --git a/libc/sock/select.h b/libc/sock/select.h index f469e95bc..b6f0e0cbd 100644 --- a/libc/sock/select.h +++ b/libc/sock/select.h @@ -7,7 +7,6 @@ #define FD_SETSIZE 1024 /* it's 64 on windows */ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct fd_set { @@ -25,5 +24,4 @@ int pselect(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_SELECT_H_ */ diff --git a/libc/sock/select.internal.h b/libc/sock/select.internal.h index a1d767372..ecf5606ac 100644 --- a/libc/sock/select.internal.h +++ b/libc/sock/select.internal.h @@ -2,12 +2,10 @@ #define COSMOPOLITAN_LIBC_SOCK_SELECT_INTERNAL_H_ #include "libc/mem/alloca.h" #include "libc/sock/select.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ const char *DescribeFdSet(char[100], ssize_t, int, fd_set *); #define DescribeFdSet(x, y, z) DescribeFdSet(alloca(100), x, y, z) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_SELECT_INTERNAL_H_ */ diff --git a/libc/sock/sendfile.internal.h b/libc/sock/sendfile.internal.h index 56f5b8cb4..2cfe5f48a 100644 --- a/libc/sock/sendfile.internal.h +++ b/libc/sock/sendfile.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_SENDFILE_INTERNAL_H_ #define COSMOPOLITAN_LIBC_SOCK_SENDFILE_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_sendfile_xnu(int32_t infd, int32_t outfd, int64_t offset, @@ -12,5 +11,4 @@ int sys_sendfile_freebsd(int32_t infd, int32_t outfd, int64_t offset, int64_t *out_opt_sbytes, int32_t flags); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_SENDFILE_INTERNAL_H_ */ diff --git a/libc/sock/sock.h b/libc/sock/sock.h index 1c624ce7a..a1d2a7384 100644 --- a/libc/sock/sock.h +++ b/libc/sock/sock.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_SOCK_H_ #define COSMOPOLITAN_LIBC_SOCK_SOCK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define INET_ADDRSTRLEN 22 @@ -35,5 +34,4 @@ int socketpair(int, int, int, int[2]); int sockatmark(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_SOCK_H_ */ diff --git a/libc/sock/struct/arphdr.h b/libc/sock/struct/arphdr.h index 67db829ca..b3fdeeb56 100644 --- a/libc/sock/struct/arphdr.h +++ b/libc/sock/struct/arphdr.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_ARPHDR_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_ARPHDR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct arphdr { @@ -12,5 +11,4 @@ struct arphdr { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_ARPHDR_H_ */ diff --git a/libc/sock/struct/arpreq.h b/libc/sock/struct/arpreq.h index af7312733..3d25fb301 100644 --- a/libc/sock/struct/arpreq.h +++ b/libc/sock/struct/arpreq.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_ARPREQ_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_ARPREQ_H_ #include "libc/sock/struct/sockaddr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct arpreq { @@ -13,5 +12,4 @@ struct arpreq { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_ARPREQ_H_ */ diff --git a/libc/sock/struct/cmsghdr.h b/libc/sock/struct/cmsghdr.h index bdd1d1274..12d3259e4 100644 --- a/libc/sock/struct/cmsghdr.h +++ b/libc/sock/struct/cmsghdr.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_CMSGHDR_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_CMSGHDR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define CMSG_DATA(cmsg) ((unsigned char *)(((struct cmsghdr *)(cmsg)) + 1)) @@ -38,5 +37,4 @@ struct cmsghdr { /* linux abi */ }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_CMSGHDR_H_ */ diff --git a/libc/sock/struct/cmsghdr.internal.h b/libc/sock/struct/cmsghdr.internal.h index 291f79ef4..bfb609616 100644 --- a/libc/sock/struct/cmsghdr.internal.h +++ b/libc/sock/struct/cmsghdr.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_CMSGHDR_INTERNAL_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_CMSGHDR_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct cmsghdr_bsd { @@ -10,5 +9,4 @@ struct cmsghdr_bsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_CMSGHDR_INTERNAL_H_ */ diff --git a/libc/sock/struct/ether_header.h b/libc/sock/struct/ether_header.h index dedb1b95f..cfe0db1ed 100644 --- a/libc/sock/struct/ether_header.h +++ b/libc/sock/struct/ether_header.h @@ -3,7 +3,6 @@ #define ETH_ALEN 6 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct ether_addr { @@ -17,5 +16,4 @@ struct ether_header { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_ETHER_HEADER_H_ */ diff --git a/libc/sock/struct/ifconf.h b/libc/sock/struct/ifconf.h index c51833d3c..f7e37745c 100644 --- a/libc/sock/struct/ifconf.h +++ b/libc/sock/struct/ifconf.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_IFCONF_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_IFCONF_H_ #include "libc/sock/struct/ifreq.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* @@ -24,5 +23,4 @@ struct ifconf { #define ifc_req ifc_ifcu.ifcu_req /* array of structures */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_IFCONF_H_ */ diff --git a/libc/sock/struct/ifreq.h b/libc/sock/struct/ifreq.h index 3a3bd7209..50d98102c 100644 --- a/libc/sock/struct/ifreq.h +++ b/libc/sock/struct/ifreq.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_IFREQ_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_IFREQ_H_ #include "libc/sock/struct/sockaddr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define IF_NAMESIZE 16 @@ -29,5 +28,4 @@ struct ifreq { #define ifr_flags ifr_ifru.ifru_flags /* flags */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_IFREQ_H_ */ diff --git a/libc/sock/struct/in6_pktinfo.h b/libc/sock/struct/in6_pktinfo.h index 30ac7985f..c4657ebe9 100644 --- a/libc/sock/struct/in6_pktinfo.h +++ b/libc/sock/struct/in6_pktinfo.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_IN6_PKTINFO_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_IN6_PKTINFO_H_ #include "libc/sock/struct/sockaddr6.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct in6_pktinfo { @@ -10,5 +9,4 @@ struct in6_pktinfo { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_IN6_PKTINFO_H_ */ diff --git a/libc/sock/struct/in_pktinfo.h b/libc/sock/struct/in_pktinfo.h index 31f538146..2c14a5172 100644 --- a/libc/sock/struct/in_pktinfo.h +++ b/libc/sock/struct/in_pktinfo.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_IN_PKTINFO_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_IN_PKTINFO_H_ #include "libc/sock/struct/sockaddr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct in_pktinfo { @@ -11,5 +10,4 @@ struct in_pktinfo { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_IN_PKTINFO_H_ */ diff --git a/libc/sock/struct/ip_mreq.h b/libc/sock/struct/ip_mreq.h index 28eb1e089..441503b15 100644 --- a/libc/sock/struct/ip_mreq.h +++ b/libc/sock/struct/ip_mreq.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_IP_MREQ_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_IP_MREQ_H_ #include "libc/sock/struct/sockaddr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct ip_mreq { @@ -10,5 +9,4 @@ struct ip_mreq { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_IP_MREQ_H_ */ diff --git a/libc/sock/struct/linger.h b/libc/sock/struct/linger.h index e5eb952a5..d171b9fa9 100644 --- a/libc/sock/struct/linger.h +++ b/libc/sock/struct/linger.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_LINGER_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_LINGER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct linger { /* Linux+XNU+BSD ABI */ @@ -9,5 +8,4 @@ struct linger { /* Linux+XNU+BSD ABI */ }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_LINGER_H_ */ diff --git a/libc/sock/struct/msghdr.h b/libc/sock/struct/msghdr.h index 98e64dd34..12d747b09 100644 --- a/libc/sock/struct/msghdr.h +++ b/libc/sock/struct/msghdr.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_MSGHDR_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_MSGHDR_H_ #include "libc/calls/struct/iovec.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct msghdr { /* Linux+NT ABI */ @@ -18,5 +17,4 @@ ssize_t recvmsg(int, struct msghdr *, int); ssize_t sendmsg(int, const struct msghdr *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_MSGHDR_H_ */ diff --git a/libc/sock/struct/msghdr.internal.h b/libc/sock/struct/msghdr.internal.h index d369bbe3e..091be19b7 100644 --- a/libc/sock/struct/msghdr.internal.h +++ b/libc/sock/struct/msghdr.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_MSGHDR_INTERNAL_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_MSGHDR_INTERNAL_H_ #include "libc/sock/struct/msghdr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct msghdr_bsd { @@ -19,5 +18,4 @@ ssize_t sys_recvmsg(int, struct msghdr *, int); bool __asan_is_valid_msghdr(const struct msghdr *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_MSGHDR_INTERNAL_H_ */ diff --git a/libc/sock/struct/pollfd.h b/libc/sock/struct/pollfd.h index 79cd56e09..43bb1f28b 100644 --- a/libc/sock/struct/pollfd.h +++ b/libc/sock/struct/pollfd.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_POLLFD_H_ #include "libc/calls/struct/sigset.h" #include "libc/calls/struct/timespec.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct pollfd { @@ -15,5 +14,4 @@ int poll(struct pollfd *, uint64_t, int32_t); int ppoll(struct pollfd *, uint64_t, const struct timespec *, const sigset_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_POLLFD_H_ */ diff --git a/libc/sock/struct/pollfd.internal.h b/libc/sock/struct/pollfd.internal.h index adaec48cb..70b452258 100644 --- a/libc/sock/struct/pollfd.internal.h +++ b/libc/sock/struct/pollfd.internal.h @@ -4,7 +4,6 @@ #include "libc/calls/struct/timespec.h" #include "libc/mem/alloca.h" #include "libc/sock/struct/pollfd.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int32_t sys_poll(struct pollfd *, uint64_t, signed); @@ -18,5 +17,4 @@ const char *DescribePollFds(char[300], ssize_t, struct pollfd *, size_t); #define DescribePollFds(x, y, z) DescribePollFds(alloca(300), x, y, z) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_POLLFD_INTERNAL_H_ */ diff --git a/libc/sock/struct/sockaddr.h b/libc/sock/struct/sockaddr.h index b9477668b..21297aa3d 100644 --- a/libc/sock/struct/sockaddr.h +++ b/libc/sock/struct/sockaddr.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sockaddr { /* Linux+NT ABI */ @@ -46,5 +45,4 @@ ssize_t sendto(int, const void *, size_t, int, const struct sockaddr *, uint32_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR_H_ */ diff --git a/libc/sock/struct/sockaddr.internal.h b/libc/sock/struct/sockaddr.internal.h index 73208f30f..59d996d4a 100644 --- a/libc/sock/struct/sockaddr.internal.h +++ b/libc/sock/struct/sockaddr.internal.h @@ -3,7 +3,6 @@ #include "libc/mem/alloca.h" #include "libc/sock/struct/sockaddr.h" #include "libc/sock/struct/sockaddr6-bsd.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sockaddr_bsd { @@ -55,5 +54,4 @@ void sockaddr2linux(const union sockaddr_storage_bsd *, uint32_t, union sockaddr_storage_linux *, uint32_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR_INTERNAL_H_ */ diff --git a/libc/sock/struct/sockaddr6-bsd.internal.h b/libc/sock/struct/sockaddr6-bsd.internal.h index a12b6a598..b21b7fd0d 100644 --- a/libc/sock/struct/sockaddr6-bsd.internal.h +++ b/libc/sock/struct/sockaddr6-bsd.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR6_BSD_INTERNAL_H_ #define COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR6_BSD_INTERNAL_H_ #include "libc/sock/struct/sockaddr6.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sockaddr_in6_bsd { @@ -14,5 +13,4 @@ struct sockaddr_in6_bsd { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR6_BSD_INTERNAL_H_ */ diff --git a/libc/sock/struct/sockaddr6.h b/libc/sock/struct/sockaddr6.h index 333135def..d10ce8855 100644 --- a/libc/sock/struct/sockaddr6.h +++ b/libc/sock/struct/sockaddr6.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SOCKADDR6_H_ #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SOCKADDR6_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) struct in6_addr { union { @@ -18,5 +17,4 @@ struct sockaddr_in6 { /* Linux+NT ABI */ uint32_t sin6_scope_id; /* rfc2553 */ }; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SOCKADDR6_H_ */ diff --git a/libc/sock/syscall_fd.internal.h b/libc/sock/syscall_fd.internal.h index 4c40867e2..ef898b72e 100644 --- a/libc/sock/syscall_fd.internal.h +++ b/libc/sock/syscall_fd.internal.h @@ -4,7 +4,6 @@ #include "libc/calls/struct/iovec.h" #include "libc/nt/struct/overlapped.h" #include "libc/sock/struct/sockaddr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void sys_connect_nt_cleanup(struct Fd *, bool); @@ -23,5 +22,4 @@ ssize_t sys_recvfrom_nt(int, const struct iovec *, size_t, uint32_t, void *, uint32_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_SYSCALL_INTERNAL_H_ */ diff --git a/libc/sock/syslog.h b/libc/sock/syslog.h index 5a6bf346b..e26a57298 100644 --- a/libc/sock/syslog.h +++ b/libc/sock/syslog.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_SYSLOG_H_ #define COSMOPOLITAN_LIBC_SOCK_SYSLOG_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int setlogmask(int); @@ -10,5 +9,4 @@ void closelog(void); void vsyslog(int, const char *, va_list); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_SYSLOG_H_ */ diff --git a/libc/sock/wsaid.internal.h b/libc/sock/wsaid.internal.h index 6c41710de..659ba57cd 100644 --- a/libc/sock/wsaid.internal.h +++ b/libc/sock/wsaid.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_WSAID_INTERNAL_H_ #define COSMOPOLITAN_LIBC_SOCK_WSAID_INTERNAL_H_ #include "libc/nt/struct/guid.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *__get_wsaid(const struct NtGuid *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SOCK_WSAID_INTERNAL_H_ */ diff --git a/libc/stdckdint.h b/libc/stdckdint.h index 9af1aebd6..2f9afb785 100644 --- a/libc/stdckdint.h +++ b/libc/stdckdint.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STDCKDINT_H_ #define COSMOPOLITAN_LIBC_STDCKDINT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) /* clang-format off */ /** @@ -625,5 +624,4 @@ __ckd_declare_mul(__ckd_mul_uint128, unsigned __int128) #define ckd_mul(res, x, y) (*(res) = (x) * (y), 0) #endif /* GNU */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDCKDINT_H_ */ diff --git a/libc/stdio/append.h b/libc/stdio/append.h index e51b9cf78..662653281 100644 --- a/libc/stdio/append.h +++ b/libc/stdio/append.h @@ -14,7 +14,6 @@ #define kappendf __kappendf #define kvappendf __kvappendf -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct appendz { @@ -33,6 +32,5 @@ ssize_t kappendf(char **, const char *, ...); ssize_t kvappendf(char **, const char *, va_list); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _COSMO_SOURCE */ #endif /* COSMOPOLITAN_LIBC_STDIO_APPEND_H_ */ diff --git a/libc/stdio/appendw.c b/libc/stdio/appendw.c index 3c765b772..68d8a825d 100644 --- a/libc/stdio/appendw.c +++ b/libc/stdio/appendw.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/dce.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsr.h" #include "libc/macros.internal.h" #include "libc/mem/mem.h" diff --git a/libc/stdio/dprintf.h b/libc/stdio/dprintf.h index 67d35f7ab..c310c098e 100644 --- a/libc/stdio/dprintf.h +++ b/libc/stdio/dprintf.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_DPRINTF_H_ #define COSMOPOLITAN_LIBC_CALLS_DPRINTF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int dprintf(int, const char *, ...) paramsnonnull((2)); int vdprintf(int, const char *, va_list) paramsnonnull(); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_DPRINTF_H_ */ diff --git a/libc/stdio/fflush.internal.h b/libc/stdio/fflush.internal.h index 4942e608a..75e3f3fc2 100644 --- a/libc/stdio/fflush.internal.h +++ b/libc/stdio/fflush.internal.h @@ -3,7 +3,6 @@ #include "libc/stdio/stdio.h" #include "libc/thread/thread.h" #include "libc/thread/tls.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct StdioFlushHandles { @@ -23,5 +22,4 @@ void __fflush_lock(void); void __fflush_unlock(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_FFLUSH_H_ */ diff --git a/libc/stdio/fflush_unlocked.c b/libc/stdio/fflush_unlocked.c index f744be323..ff9490048 100644 --- a/libc/stdio/fflush_unlocked.c +++ b/libc/stdio/fflush_unlocked.c @@ -19,7 +19,6 @@ #include "libc/calls/calls.h" #include "libc/cxxabi.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/intrin/pushpop.internal.h" #include "libc/macros.internal.h" #include "libc/mem/arraylist.internal.h" diff --git a/libc/stdio/fmt.c b/libc/stdio/fmt.c index d9d0f9bde..485864fb2 100644 --- a/libc/stdio/fmt.c +++ b/libc/stdio/fmt.c @@ -43,7 +43,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/divmod10.internal.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsr.h" #include "libc/intrin/nomultics.internal.h" #include "libc/intrin/safemacros.internal.h" diff --git a/libc/stdio/ftw.h b/libc/stdio/ftw.h index 91eaf0267..627ae6dcd 100644 --- a/libc/stdio/ftw.h +++ b/libc/stdio/ftw.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MUSL_FTW_H_ #define COSMOPOLITAN_THIRD_PARTY_MUSL_FTW_H_ #include "libc/calls/struct/stat.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -86,5 +85,4 @@ int nftw(const char *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MUSL_FTW_H_ */ diff --git a/libc/stdio/hex.internal.h b/libc/stdio/hex.internal.h index f4740417d..70a955743 100644 --- a/libc/stdio/hex.internal.h +++ b/libc/stdio/hex.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_STDIO_HEX_INTERNAL_H_ #define COSMOPOLITAN_LIBC_STDIO_HEX_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *DumpHex(const char *, size_t, size_t *); char *DumpHexc(const char *, size_t, size_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_HEX_INTERNAL_H_ */ diff --git a/libc/stdio/iconv.h b/libc/stdio/iconv.h index 0d62bdb4a..6862dc3a9 100644 --- a/libc/stdio/iconv.h +++ b/libc/stdio/iconv.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STDIO_ICONV_H_ #define COSMOPOLITAN_LIBC_STDIO_ICONV_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef void *iconv_t; @@ -10,5 +9,4 @@ size_t iconv(iconv_t, char **, size_t *, char **, size_t *); int iconv_close(iconv_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_ICONV_H_ */ diff --git a/libc/stdio/internal.h b/libc/stdio/internal.h index 7a7b3ee31..e5f848f80 100644 --- a/libc/stdio/internal.h +++ b/libc/stdio/internal.h @@ -5,7 +5,6 @@ #define PUSHBACK 12 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct FILE { @@ -37,5 +36,4 @@ FILE *__stdio_alloc(void); void __stdio_free(FILE *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_INTERNAL_H_ */ diff --git a/libc/stdio/lcg.internal.h b/libc/stdio/lcg.internal.h index 84416d0af..0c0baef70 100644 --- a/libc/stdio/lcg.internal.h +++ b/libc/stdio/lcg.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_LCG_H_ #define COSMOPOLITAN_LIBC_LCG_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE forceinline uint64_t KnuthLinearCongruentialGenerator(uint64_t prev[1]) { @@ -12,5 +11,4 @@ forceinline uint64_t KnuthLinearCongruentialGenerator(uint64_t prev[1]) { } #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_LCG_H_ */ diff --git a/libc/stdio/rand.h b/libc/stdio/rand.h index 0ddb1f6f6..49174e359 100644 --- a/libc/stdio/rand.h +++ b/libc/stdio/rand.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_RAND_RAND_H_ #define COSMOPOLITAN_LIBC_RAND_RAND_H_ #define RAND_MAX __INT_MAX__ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § random ─╬─│┼ @@ -46,5 +45,4 @@ void rt_end(double *, double *, double *, double *, double *); #endif /* _COSMO_SOURCE */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RAND_RAND_H_ */ diff --git a/libc/stdio/stdio.h b/libc/stdio/stdio.h index e495d740f..a7341130f 100644 --- a/libc/stdio/stdio.h +++ b/libc/stdio/stdio.h @@ -16,7 +16,6 @@ #define TMP_MAX 10000 #define BUFSIZ 4096 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ @@ -181,5 +180,4 @@ int vfprintf_unlocked(FILE *, const char *, va_list) paramsnonnull() dontthrow nocallback; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_H_ */ diff --git a/libc/stdio/stdio_ext.h b/libc/stdio/stdio_ext.h index a744c10e8..8ddfb9739 100644 --- a/libc/stdio/stdio_ext.h +++ b/libc/stdio/stdio_ext.h @@ -6,7 +6,6 @@ #define FSETLOCKING_INTERNAL 1 #define FSETLOCKING_BYCALLER 2 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ size_t __fbufsize(FILE *); @@ -25,5 +24,4 @@ size_t __freadahead(FILE *); void __freadptrinc(FILE *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_STDIO_EXT_H_ */ diff --git a/libc/stdio/strlist.internal.h b/libc/stdio/strlist.internal.h index cfb270353..3e05d1445 100644 --- a/libc/stdio/strlist.internal.h +++ b/libc/stdio/strlist.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STDIO_STRLIST_H_ #define COSMOPOLITAN_LIBC_STDIO_STRLIST_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct StrList { @@ -14,5 +13,4 @@ void SortStrList(struct StrList *); int JoinStrList(struct StrList *, char **, uint64_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_STRLIST_H_ */ diff --git a/libc/stdio/syscall.h b/libc/stdio/syscall.h index 7e0043ff9..dfef5caa2 100644 --- a/libc/stdio/syscall.h +++ b/libc/stdio/syscall.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STDIO_SYSCALL_H_ #define COSMOPOLITAN_LIBC_STDIO_SYSCALL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define SYS_gettid 186 @@ -9,5 +8,4 @@ COSMOPOLITAN_C_START_ long syscall(long, ...); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDIO_SYSCALL_H_ */ diff --git a/libc/stdio/sysparam.h b/libc/stdio/sysparam.h index 1cdcb44fc..26fb72bab 100644 --- a/libc/stdio/sysparam.h +++ b/libc/stdio/sysparam.h @@ -13,7 +13,6 @@ #define DEV_BSIZE 512 #define NOGROUP (-1) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define __bitop(x, i, o) ((x)[(i) / 8] o(1 << (i) % 8)) @@ -38,5 +37,4 @@ COSMOPOLITAN_C_START_ #define MAX(a, b) (((a) > (b)) ? (a) : (b)) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSPARAM_H_ */ diff --git a/libc/stdlib.h b/libc/stdlib.h index c69f90e05..1c1fad34e 100644 --- a/libc/stdlib.h +++ b/libc/stdlib.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STDLIB_H_ #define COSMOPOLITAN_LIBC_STDLIB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *fcvt(double, int, int *, int *); @@ -8,5 +7,4 @@ char *ecvt(double, int, int *, int *); char *gcvt(double, int, char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STDLIB_H_ */ diff --git a/libc/str/blake2.h b/libc/str/blake2.h index 8f94db521..c1b1a24a8 100644 --- a/libc/str/blake2.h +++ b/libc/str/blake2.h @@ -10,7 +10,6 @@ #define BLAKE2B256_Final __BLAKE2B256_Final #define BLAKE2B256 __BLAKE2B256 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Blake2b { @@ -31,5 +30,4 @@ int BLAKE2B256_Final(struct Blake2b *, uint8_t[BLAKE2B256_DIGEST_LENGTH]); int BLAKE2B256(const void *, size_t, uint8_t[BLAKE2B256_DIGEST_LENGTH]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_BLAKE2_H_ */ diff --git a/libc/str/crc32c.c b/libc/str/crc32c.c index 399e7e343..28dac37fc 100644 --- a/libc/str/crc32c.c +++ b/libc/str/crc32c.c @@ -24,7 +24,6 @@ * * x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1 * 0b00011110110111000110111101000001 - * _bitreverse32(0x1edc6f41) * * @param init is the initial hash value * @param data points to the data diff --git a/libc/str/getcachesize.c b/libc/str/getcachesize.c index 96eda56e5..4a4c1d62b 100644 --- a/libc/str/getcachesize.c +++ b/libc/str/getcachesize.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/dce.h" -#include "libc/intrin/bits.h" #include "libc/nexgen32e/cachesize.h" #include "libc/nexgen32e/cpuid4.internal.h" #ifdef __x86_64__ diff --git a/libc/str/getzipcdircomment.c b/libc/str/getzipcdircomment.c index 95ccc0e06..13318e70b 100644 --- a/libc/str/getzipcdircomment.c +++ b/libc/str/getzipcdircomment.c @@ -22,7 +22,7 @@ * Returns comment of zip central directory. */ const void *GetZipCdirComment(const uint8_t *eocd) { - if (READ32LE(eocd) == kZipCdir64HdrMagic && ZIP_CDIR64_COMMENTSIZE(eocd)) { + if (ZIP_READ32(eocd) == kZipCdir64HdrMagic && ZIP_CDIR64_COMMENTSIZE(eocd)) { return ZIP_CDIR64_COMMENT(eocd); } else { return ZIP_CDIR_COMMENT(eocd); diff --git a/libc/str/getzipcdircommentsize.c b/libc/str/getzipcdircommentsize.c index e0b2fc867..93c6311c6 100644 --- a/libc/str/getzipcdircommentsize.c +++ b/libc/str/getzipcdircommentsize.c @@ -22,7 +22,7 @@ * Returns comment of zip central directory. */ uint64_t GetZipCdirCommentSize(const uint8_t *eocd) { - if (READ32LE(eocd) == kZipCdir64HdrMagic && ZIP_CDIR64_COMMENTSIZE(eocd)) { + if (ZIP_READ32(eocd) == kZipCdir64HdrMagic && ZIP_CDIR64_COMMENTSIZE(eocd)) { return ZIP_CDIR64_COMMENTSIZE(eocd); } else { return ZIP_CDIR_COMMENTSIZE(eocd); diff --git a/libc/str/getzipcdiroffset.c b/libc/str/getzipcdiroffset.c index 1728b8bf6..42e93501f 100644 --- a/libc/str/getzipcdiroffset.c +++ b/libc/str/getzipcdiroffset.c @@ -22,7 +22,7 @@ * Returns offset of zip central directory. */ uint64_t GetZipCdirOffset(const uint8_t *eocd) { - if (READ32LE(eocd) == kZipCdir64HdrMagic) { + if (ZIP_READ32(eocd) == kZipCdir64HdrMagic) { return ZIP_CDIR64_OFFSET(eocd); } else { return ZIP_CDIR_OFFSET(eocd); diff --git a/libc/str/getzipcdirrecords.c b/libc/str/getzipcdirrecords.c index 8093a536b..b5bb47ed7 100644 --- a/libc/str/getzipcdirrecords.c +++ b/libc/str/getzipcdirrecords.c @@ -22,7 +22,7 @@ * Returns number of records in zip central directory. */ uint64_t GetZipCdirRecords(const uint8_t *eocd) { - if (READ32LE(eocd) == kZipCdir64HdrMagic) { + if (ZIP_READ32(eocd) == kZipCdir64HdrMagic) { return ZIP_CDIR64_RECORDS(eocd); } else { return ZIP_CDIR_RECORDS(eocd); diff --git a/libc/str/getzipcdirsize.c b/libc/str/getzipcdirsize.c index 45b70868a..28d88ed27 100644 --- a/libc/str/getzipcdirsize.c +++ b/libc/str/getzipcdirsize.c @@ -22,7 +22,7 @@ * Returns size of zip central directory. */ uint64_t GetZipCdirSize(const uint8_t *eocd) { - if (READ32LE(eocd) == kZipCdir64HdrMagic) { + if (ZIP_READ32(eocd) == kZipCdir64HdrMagic) { return ZIP_CDIR64_SIZE(eocd); } else { return ZIP_CDIR_SIZE(eocd); diff --git a/libc/str/getzipcfilecompressedsize.c b/libc/str/getzipcfilecompressedsize.c index 0523a631a..f4a73fb67 100644 --- a/libc/str/getzipcfilecompressedsize.c +++ b/libc/str/getzipcfilecompressedsize.c @@ -30,7 +30,7 @@ int64_t GetZipCfileCompressedSize(const uint8_t *z) { for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p)) { if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64) { if (8 <= ZIP_EXTRA_CONTENTSIZE(p)) { - return READ64LE(ZIP_EXTRA_CONTENT(p)); + return ZIP_READ64(ZIP_EXTRA_CONTENT(p)); } } } diff --git a/libc/str/getzipcfileoffset.c b/libc/str/getzipcfileoffset.c index 8ece121c3..7e45aa690 100644 --- a/libc/str/getzipcfileoffset.c +++ b/libc/str/getzipcfileoffset.c @@ -37,7 +37,7 @@ int64_t GetZipCfileOffset(const uint8_t *z) { offset += 8; } if (offset + 8 <= ZIP_EXTRA_CONTENTSIZE(p)) { - return READ64LE(ZIP_EXTRA_CONTENT(p) + offset); + return ZIP_READ64(ZIP_EXTRA_CONTENT(p) + offset); } } } diff --git a/libc/str/getzipcfiletimestamps.c b/libc/str/getzipcfiletimestamps.c index 44d0c0a3b..692f999bc 100644 --- a/libc/str/getzipcfiletimestamps.c +++ b/libc/str/getzipcfiletimestamps.c @@ -43,18 +43,18 @@ void GetZipCfileTimestamps(const uint8_t *cf, struct timespec *mtim, p += ZIP_EXTRA_SIZE(p)) { if (ZIP_EXTRA_HEADERID(p) == kZipExtraNtfs && ZIP_EXTRA_CONTENTSIZE(p) >= 4 + 4 + 8 && - READ16LE(ZIP_EXTRA_CONTENT(p) + 4) == 1 && - READ16LE(ZIP_EXTRA_CONTENT(p) + 6) >= 8) { + ZIP_READ16(ZIP_EXTRA_CONTENT(p) + 4) == 1 && + ZIP_READ16(ZIP_EXTRA_CONTENT(p) + 6) >= 8) { if (mtim) { - *mtim = WindowsTimeToTimeSpec(READ64LE(ZIP_EXTRA_CONTENT(p) + 8)); + *mtim = WindowsTimeToTimeSpec(ZIP_READ64(ZIP_EXTRA_CONTENT(p) + 8)); } if (atim && ZIP_EXTRA_CONTENTSIZE(p) >= 4 + 4 + 8 * 2 && - READ16LE(ZIP_EXTRA_CONTENT(p) + 6) >= 16) { - *atim = WindowsTimeToTimeSpec(READ64LE(ZIP_EXTRA_CONTENT(p) + 8 * 2)); + ZIP_READ16(ZIP_EXTRA_CONTENT(p) + 6) >= 16) { + *atim = WindowsTimeToTimeSpec(ZIP_READ64(ZIP_EXTRA_CONTENT(p) + 8 * 2)); } if (ctim && ZIP_EXTRA_CONTENTSIZE(p) >= 4 + 4 + 8 * 3 && - READ16LE(ZIP_EXTRA_CONTENT(p) + 6) >= 24) { - *ctim = WindowsTimeToTimeSpec(READ64LE(ZIP_EXTRA_CONTENT(p) + 8 * 3)); + ZIP_READ16(ZIP_EXTRA_CONTENT(p) + 6) >= 24) { + *ctim = WindowsTimeToTimeSpec(ZIP_READ64(ZIP_EXTRA_CONTENT(p) + 8 * 3)); } return; } @@ -66,7 +66,7 @@ void GetZipCfileTimestamps(const uint8_t *cf, struct timespec *mtim, ZIP_EXTRA_CONTENTSIZE(p) == 1 + 4 * pop(*ZIP_EXTRA_CONTENT(p) & 7)) { if (mtim) { if (*ZIP_EXTRA_CONTENT(p) & 1) { - mtim->tv_sec = (int32_t)READ32LE(ZIP_EXTRA_CONTENT(p) + 1); + mtim->tv_sec = (int32_t)ZIP_READ32(ZIP_EXTRA_CONTENT(p) + 1); } else { mtim->tv_sec = DosDateTimeToUnix(ZIP_CFILE_LASTMODIFIEDDATE(cf), ZIP_CFILE_LASTMODIFIEDTIME(cf)) - @@ -74,12 +74,12 @@ void GetZipCfileTimestamps(const uint8_t *cf, struct timespec *mtim, } } if (atim && (*ZIP_EXTRA_CONTENT(p) & 2)) { - atim->tv_sec = (int32_t)READ32LE(ZIP_EXTRA_CONTENT(p) + 1 + - 4 * (*ZIP_EXTRA_CONTENT(p) & 1)); + atim->tv_sec = (int32_t)ZIP_READ32(ZIP_EXTRA_CONTENT(p) + 1 + + 4 * (*ZIP_EXTRA_CONTENT(p) & 1)); } if (ctim && (*ZIP_EXTRA_CONTENT(p) & 4)) { - ctim->tv_sec = (int32_t)READ32LE(ZIP_EXTRA_CONTENT(p) + 1 + - 4 * pop(*ZIP_EXTRA_CONTENT(p) & 3)); + ctim->tv_sec = (int32_t)ZIP_READ32(ZIP_EXTRA_CONTENT(p) + 1 + + 4 * pop(*ZIP_EXTRA_CONTENT(p) & 3)); } return; } @@ -88,8 +88,8 @@ void GetZipCfileTimestamps(const uint8_t *cf, struct timespec *mtim, p += ZIP_EXTRA_SIZE(p)) { if (ZIP_EXTRA_HEADERID(p) == kZipExtraUnix && ZIP_EXTRA_CONTENTSIZE(p) >= 4 + 4) { - if (atim) atim->tv_sec = (int32_t)READ32LE(ZIP_EXTRA_CONTENT(p) + 0); - if (mtim) mtim->tv_sec = (int32_t)READ32LE(ZIP_EXTRA_CONTENT(p) + 4); + if (atim) atim->tv_sec = (int32_t)ZIP_READ32(ZIP_EXTRA_CONTENT(p) + 0); + if (mtim) mtim->tv_sec = (int32_t)ZIP_READ32(ZIP_EXTRA_CONTENT(p) + 4); return; } } diff --git a/libc/str/getzipcfileuncompressedsize.c b/libc/str/getzipcfileuncompressedsize.c index c410fffdf..afdea0b96 100644 --- a/libc/str/getzipcfileuncompressedsize.c +++ b/libc/str/getzipcfileuncompressedsize.c @@ -34,7 +34,7 @@ int64_t GetZipCfileUncompressedSize(const uint8_t *z) { offset += 8; } if (offset + 8 <= ZIP_EXTRA_CONTENTSIZE(p)) { - return READ64LE(ZIP_EXTRA_CONTENT(p) + offset); + return ZIP_READ64(ZIP_EXTRA_CONTENT(p) + offset); } } } diff --git a/libc/str/getzipeocd.c b/libc/str/getzipeocd.c index 45f0dbfd3..913acf617 100644 --- a/libc/str/getzipeocd.c +++ b/libc/str/getzipeocd.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/zip.internal.h" typedef char v16qi __attribute__((__vector_size__(16))); @@ -48,8 +47,9 @@ void *GetZipEocd(const void *f, size_t n, int *e) { do { #if defined(__x86_64__) && defined(__GNUC__) && !defined(__llvm__) && \ !defined(__chibicc__) - v8hi pk = {READ16LE("PK"), READ16LE("PK"), READ16LE("PK"), READ16LE("PK"), - READ16LE("PK"), READ16LE("PK"), READ16LE("PK"), READ16LE("PK")}; + v8hi pk = {ZIP_READ16("PK"), ZIP_READ16("PK"), ZIP_READ16("PK"), + ZIP_READ16("PK"), ZIP_READ16("PK"), ZIP_READ16("PK"), + ZIP_READ16("PK"), ZIP_READ16("PK")}; asm("" : "+x"(pk)); if (i >= 14) { v2di x = *(const v2di *)(p + i - 14); @@ -62,9 +62,9 @@ void *GetZipEocd(const void *f, size_t n, int *e) { } } #endif - while (magic = READ32LE(p + i), magic != kZipCdir64LocatorMagic && - magic != kZipCdirHdrMagic && - i + 0x10000 + 0x1000 >= n && i > 0) { + while (magic = ZIP_READ32(p + i), magic != kZipCdir64LocatorMagic && + magic != kZipCdirHdrMagic && + i + 0x10000 + 0x1000 >= n && i > 0) { --i; } if (magic == kZipCdir64LocatorMagic && i + kZipCdir64LocatorSize <= n && @@ -74,7 +74,7 @@ void *GetZipEocd(const void *f, size_t n, int *e) { (err = IsZipEocd32(p, n, i)) == kZipOk) { j = i; do { - if (READ32LE(p + j) == kZipCdir64LocatorMagic && + if (ZIP_READ32(p + j) == kZipCdir64LocatorMagic && j + kZipCdir64LocatorSize <= n && IsZipEocd64(p, n, ZIP_LOCATE64_OFFSET(p + j)) == kZipOk) { return (void *)(p + ZIP_LOCATE64_OFFSET(p + j)); diff --git a/libc/str/getziplfilecompressedsize.c b/libc/str/getziplfilecompressedsize.c index c398dfe98..e30105df8 100644 --- a/libc/str/getziplfilecompressedsize.c +++ b/libc/str/getziplfilecompressedsize.c @@ -30,7 +30,7 @@ int64_t GetZipLfileCompressedSize(const uint8_t *z) { for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p)) { if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64) { if (8 <= ZIP_EXTRA_CONTENTSIZE(p)) { - return READ64LE(ZIP_EXTRA_CONTENT(p)); + return ZIP_READ64(ZIP_EXTRA_CONTENT(p)); } } } diff --git a/libc/str/getziplfileuncompressedsize.c b/libc/str/getziplfileuncompressedsize.c index 13b23f1d4..7a049bc31 100644 --- a/libc/str/getziplfileuncompressedsize.c +++ b/libc/str/getziplfileuncompressedsize.c @@ -34,7 +34,7 @@ int64_t GetZipLfileUncompressedSize(const uint8_t *z) { offset += 8; } if (offset + 8 <= ZIP_EXTRA_CONTENTSIZE(p)) { - return READ64LE(ZIP_EXTRA_CONTENT(p) + offset); + return ZIP_READ64(ZIP_EXTRA_CONTENT(p) + offset); } } } diff --git a/libc/str/highwayhash64.c b/libc/str/highwayhash64.c index 5d5df3a85..e4f11d854 100644 --- a/libc/str/highwayhash64.c +++ b/libc/str/highwayhash64.c @@ -16,7 +16,7 @@ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/highwayhash64.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" asm(".ident\t\"\\n\\n\ HighwayHash (Apache 2.0)\\n\ diff --git a/libc/str/highwayhash64.h b/libc/str/highwayhash64.h index d16aacc2d..c2ff2b2c2 100644 --- a/libc/str/highwayhash64.h +++ b/libc/str/highwayhash64.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_LIBC_STR_HIGHWAYHASH64_H_ #define COSMOPOLITAN_LIBC_STR_HIGHWAYHASH64_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ uint64_t HighwayHash64(const void *, size_t, const uint64_t[4]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_HIGHWAYHASH64_H_ */ diff --git a/libc/str/iszipeocd32.c b/libc/str/iszipeocd32.c index 20c368504..80d8de0d8 100644 --- a/libc/str/iszipeocd32.c +++ b/libc/str/iszipeocd32.c @@ -27,7 +27,7 @@ int IsZipEocd32(const uint8_t *p, size_t n, size_t i) { if (i > n || n - i < kZipCdirHdrMinSize) { return kZipErrorEocdOffsetOverflow; } - if (READ32LE(p + i) != kZipCdirHdrMagic) { + if (ZIP_READ32(p + i) != kZipCdirHdrMagic) { return kZipErrorEocdMagicNotFound; } if (i + ZIP_CDIR_HDRSIZE(p + i) > n) { diff --git a/libc/str/iszipeocd64.c b/libc/str/iszipeocd64.c index b5415a39c..827ea1299 100644 --- a/libc/str/iszipeocd64.c +++ b/libc/str/iszipeocd64.c @@ -28,7 +28,7 @@ int IsZipEocd64(const uint8_t *p, size_t n, size_t i) { if (i > n || i + kZipCdir64HdrMinSize > n) { return kZipErrorEocdOffsetOverflow; } - if (READ32LE(p + i) != kZipCdir64HdrMagic) { + if (ZIP_READ32(p + i) != kZipCdir64HdrMagic) { return kZipErrorEocdMagicNotFound; } if (ckd_add(&loc, i, ZIP_CDIR64_HDRSIZE(p + i)) || // diff --git a/libc/str/kx86processormodels.c b/libc/str/kx86processormodels.c index 9cd1c3926..4635a77a7 100644 --- a/libc/str/kx86processormodels.c +++ b/libc/str/kx86processormodels.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/macros.internal.h" #include "libc/nexgen32e/x86info.h" diff --git a/libc/str/langinfo.h b/libc/str/langinfo.h index 82db4442d..edb8ce75e 100644 --- a/libc/str/langinfo.h +++ b/libc/str/langinfo.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STR_LANGINFO_H_ #define COSMOPOLITAN_LIBC_STR_LANGINFO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define ABDAY_1 0x20000 @@ -82,5 +81,4 @@ COSMOPOLITAN_C_START_ char *nl_langinfo(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_LANGINFO_H_ */ diff --git a/libc/str/locale.h b/libc/str/locale.h index e9d5e7939..6a2a18e56 100644 --- a/libc/str/locale.h +++ b/libc/str/locale.h @@ -19,7 +19,6 @@ #define LC_ALL_MASK 0x1fbf #define LOCALE_NAME_MAX 23 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define LC_GLOBAL_LOCALE ((locale_t)-1) @@ -85,5 +84,4 @@ int strncasecmp_l(const char *, const char *, size_t, locale_t); ssize_t strfmon_l(char *, size_t, locale_t, const char *, ...); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_LOCALE_H_ */ diff --git a/libc/str/lz4cpy.c b/libc/str/lz4cpy.c index d89bd3752..9997781c5 100644 --- a/libc/str/lz4cpy.c +++ b/libc/str/lz4cpy.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/pushpop.internal.h" #include "libc/intrin/repmovsb.h" #include "libc/nexgen32e/kompressor.h" diff --git a/libc/str/lz4len.c b/libc/str/lz4len.c index 23ed940b3..ffebc8555 100644 --- a/libc/str/lz4len.c +++ b/libc/str/lz4len.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/intrin/pushpop.internal.h" #include "libc/nexgen32e/kompressor.h" #include "libc/str/str.h" diff --git a/libc/str/mb.internal.h b/libc/str/mb.internal.h index fb36af765..5d1d1b7bd 100644 --- a/libc/str/mb.internal.h +++ b/libc/str/mb.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STR_MB_INTERNAL_H_ #define COSMOPOLITAN_LIBC_STR_MB_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define SA 0xc2u @@ -15,5 +14,4 @@ COSMOPOLITAN_C_START_ extern const uint32_t kMbBittab[51]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_MB_INTERNAL_H_ */ diff --git a/libc/str/memcasecmp.c b/libc/str/memcasecmp.c index fad1dac6e..09549b6d3 100644 --- a/libc/str/memcasecmp.c +++ b/libc/str/memcasecmp.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/str/str.h" #include "libc/str/tab.internal.h" diff --git a/libc/str/memccpy.c b/libc/str/memccpy.c index 294e441b0..227411e69 100644 --- a/libc/str/memccpy.c +++ b/libc/str/memccpy.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/str/str.h" /** diff --git a/libc/str/nltypes.h b/libc/str/nltypes.h index 51965a51d..2b351603c 100644 --- a/libc/str/nltypes.h +++ b/libc/str/nltypes.h @@ -4,7 +4,6 @@ #define NL_SETD 1 #define NL_CAT_LOCALE 1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef int nl_item; @@ -15,5 +14,4 @@ char *catgets(nl_catd, int, int, const char *); int catclose(nl_catd); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_NLTYPES_H_ */ diff --git a/libc/str/slice.h b/libc/str/slice.h index fc71289f8..beddaca2b 100644 --- a/libc/str/slice.h +++ b/libc/str/slice.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_STR_SLICE_H_ #include "libc/stdbool.h" #include "libc/str/str.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define SlicesEqual(a, n, b, m) \ @@ -21,5 +20,4 @@ int CompareSlices(const char *, size_t, const char *, size_t); int CompareSlicesCase(const char *, size_t, const char *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_SLICE_H_ */ diff --git a/libc/str/strwidth.h b/libc/str/strwidth.h index 1d220e336..9e72b68cc 100644 --- a/libc/str/strwidth.h +++ b/libc/str/strwidth.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STR_STRWIDTH_H_ #define COSMOPOLITAN_LIBC_STR_STRWIDTH_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int strwidth(const char *, size_t) strlenesque; @@ -9,5 +8,4 @@ int strwidth16(const char16_t *, size_t) strlenesque; int strnwidth16(const char16_t *, size_t, size_t) strlenesque; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_STRWIDTH_H_ */ diff --git a/libc/str/tpdecodecb.internal.h b/libc/str/tpdecodecb.internal.h index ee46614fa..83806be99 100644 --- a/libc/str/tpdecodecb.internal.h +++ b/libc/str/tpdecodecb.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_STR_TPDECODECB_H_ #define COSMOPOLITAN_LIBC_STR_TPDECODECB_H_ #include "libc/intrin/bsr.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /* TODO(jart): DELETE? */ @@ -36,5 +35,4 @@ forceinline int tpdecodecb(wint_t *out, int first, return i; } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_TPDECODECB_H_ */ diff --git a/libc/str/unicode.h b/libc/str/unicode.h index 605833f4d..d6178df1b 100644 --- a/libc/str/unicode.h +++ b/libc/str/unicode.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STR_UNICODE_H_ #define COSMOPOLITAN_LIBC_STR_UNICODE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct lconv { @@ -39,5 +38,4 @@ int wcsnwidth(const wchar_t *, size_t, size_t) strlenesque; #endif /* _COSMO_SOURCE */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_UNICODE_H_ */ diff --git a/libc/str/utf16.h b/libc/str/utf16.h index bf186b458..251283f25 100644 --- a/libc/str/utf16.h +++ b/libc/str/utf16.h @@ -6,7 +6,6 @@ #define UTF16_MOAR 0xd800 /* 0xD800..0xDBFF */ #define UTF16_CONT 0xdc00 /* 0xDC00..0xDFFF */ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define IsSurrogate(wc) ((0xf800 & (wc)) == 0xd800) @@ -25,5 +24,4 @@ COSMOPOLITAN_C_START_ : 0xFFFD) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_UTF16_H_ */ diff --git a/libc/str/wctype.c b/libc/str/wctype.c index f4170540d..e46fd0b2c 100644 --- a/libc/str/wctype.c +++ b/libc/str/wctype.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/macros.internal.h" #include "libc/str/str.h" diff --git a/libc/str/wcwidth_osx.internal.h b/libc/str/wcwidth_osx.internal.h index 94e8ddf4b..89ff0808c 100644 --- a/libc/str/wcwidth_osx.internal.h +++ b/libc/str/wcwidth_osx.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_STR_WCWIDTH_OSX_H_ #define COSMOPOLITAN_LIBC_STR_WCWIDTH_OSX_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint32_t kWcwidthOsx[591]; @@ -18,5 +17,4 @@ static inline int _wcwidth_osx(uint32_t codePoint) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_STR_WCWIDTH_OSX_H_ */ diff --git a/libc/sysv/consts/af.h b/libc/sysv/consts/af.h index 6ce8bba4f..57e868446 100644 --- a/libc/sysv/consts/af.h +++ b/libc/sysv/consts/af.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_AF_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_AF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int AF_ALG; @@ -96,5 +95,4 @@ extern const int AF_X25; #define AF_X25 AF_X25 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_AF_H_ */ diff --git a/libc/sysv/consts/at.h b/libc/sysv/consts/at.h index beb45e47e..97551e890 100644 --- a/libc/sysv/consts/at.h +++ b/libc/sysv/consts/at.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_AT_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_AT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -16,7 +15,6 @@ extern const int AT_EACCESS; extern const int AT_EMPTY_PATH; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define AT_FDCWD AT_FDCWD #define AT_SYMLINK_FOLLOW AT_SYMLINK_FOLLOW diff --git a/libc/sysv/consts/auxv.h b/libc/sysv/consts/auxv.h index 0bbb02176..208b5851e 100644 --- a/libc/sysv/consts/auxv.h +++ b/libc/sysv/consts/auxv.h @@ -12,7 +12,6 @@ #define AT_FLAGS 8 #define AT_ENTRY 9 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* @@ -64,5 +63,4 @@ extern const unsigned long AT_TIMEKEEP; extern const unsigned long AT_UCACHEBSIZE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_AUXV_H_ */ diff --git a/libc/sysv/consts/baud.internal.h b/libc/sysv/consts/baud.internal.h index 8b279c494..9f5a4ac41 100644 --- a/libc/sysv/consts/baud.internal.h +++ b/libc/sysv/consts/baud.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_BAUD_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_BAUD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint32_t B0; @@ -64,5 +63,4 @@ extern const uint32_t B4000000; #define B4000000 B4000000 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_BAUD_H_ */ diff --git a/libc/sysv/consts/clock.h b/libc/sysv/consts/clock.h index 1a0ac068c..ae4f010e0 100644 --- a/libc/sysv/consts/clock.h +++ b/libc/sysv/consts/clock.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_CLOCK_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_CLOCK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int CLOCK_BOOTTIME; @@ -24,7 +23,6 @@ extern const int CLOCK_UPTIME_FAST; extern const int CLOCK_UPTIME_PRECISE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define CLOCK_REALTIME 0 #define CLOCK_MONOTONIC CLOCK_MONOTONIC diff --git a/libc/sysv/consts/close.h b/libc/sysv/consts/close.h index 873d59906..608b88dbb 100644 --- a/libc/sysv/consts/close.h +++ b/libc/sysv/consts/close.h @@ -1,13 +1,11 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_CLOSE_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_CLOSE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const unsigned int CLOSE_RANGE_UNSHARE; extern const unsigned int CLOSE_RANGE_CLOEXEC; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define CLOSE_RANGE_UNSHARE CLOSE_RANGE_UNSHARE #define CLOSE_RANGE_CLOEXEC CLOSE_RANGE_CLOEXEC diff --git a/libc/sysv/consts/epoll.h b/libc/sysv/consts/epoll.h index 44dd42cec..a2d11e643 100644 --- a/libc/sysv/consts/epoll.h +++ b/libc/sysv/consts/epoll.h @@ -22,12 +22,10 @@ #define EPOLLONESHOT 0x40000000 #define EPOLLET 0x80000000 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int EPOLL_CLOEXEC; #define EPOLL_CLOEXEC O_CLOEXEC COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_EPOLL_H_ */ diff --git a/libc/sysv/consts/f.h b/libc/sysv/consts/f.h index 8bf1d1b7f..9f1fe9eff 100644 --- a/libc/sysv/consts/f.h +++ b/libc/sysv/consts/f.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_F_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_F_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* @@ -41,7 +40,6 @@ extern const int F_UNLCK; extern const int F_WRLCK; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ /* * portable fcntl() commands diff --git a/libc/sysv/consts/falloc.h b/libc/sysv/consts/falloc.h index 96497bd0c..d9bf269d1 100644 --- a/libc/sysv/consts/falloc.h +++ b/libc/sysv/consts/falloc.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_FALLOC_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_FALLOC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int FALLOC_FL_KEEP_SIZE; @@ -12,5 +11,4 @@ extern const int FALLOC_FL_INSERT_RANGE; extern const int FALLOC_FL_UNSHARE_RANGE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_FALLOC_H_ */ diff --git a/libc/sysv/consts/fbio.h b/libc/sysv/consts/fbio.h index 04d144103..25492e288 100644 --- a/libc/sysv/consts/fbio.h +++ b/libc/sysv/consts/fbio.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_FB_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_FB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint64_t FBIOGET_VSCREENINFO; @@ -12,5 +11,4 @@ extern const uint64_t FBIOPAN_DISPLAY; extern const uint64_t FBIO_WAITFORVSYNC; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_FB_H_ */ diff --git a/libc/sysv/consts/fd.h b/libc/sysv/consts/fd.h index e9d4a4395..8cab0f195 100644 --- a/libc/sysv/consts/fd.h +++ b/libc/sysv/consts/fd.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_FD_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_FD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int FD_CLOEXEC; @@ -8,5 +7,4 @@ extern const int FD_CLOEXEC; #define FD_CLOEXEC 1 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_FD_H_ */ diff --git a/libc/sysv/consts/fio.h b/libc/sysv/consts/fio.h index b34d6694e..a579618f4 100644 --- a/libc/sysv/consts/fio.h +++ b/libc/sysv/consts/fio.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_FIO_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_FIO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint32_t FIONREAD; /* one of the few encouraged ioctls */ @@ -12,5 +11,4 @@ extern const uint32_t FIOASYNC; /* todo: fcntl(fd, F_SETOWN, pid) */ #define FIONREAD FIONREAD COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_FIO_H_ */ diff --git a/libc/sysv/consts/futex.h b/libc/sysv/consts/futex.h index 45b4bdf62..b6a29efb5 100644 --- a/libc/sysv/consts/futex.h +++ b/libc/sysv/consts/futex.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_FUTEX_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_FUTEX_H_ #ifdef _COSMO_SOURCE -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int FUTEX_WAIT; @@ -22,6 +21,5 @@ extern const int FUTEX_REQUEUE; #define FUTEX_BITSET_MATCH_ANY 0xffffffff COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _COSMO_SOURCE */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_FUTEX_H_ */ diff --git a/libc/sysv/consts/icmp6.h b/libc/sysv/consts/icmp6.h index 04ad8754b..505a590b0 100644 --- a/libc/sysv/consts/icmp6.h +++ b/libc/sysv/consts/icmp6.h @@ -35,7 +35,6 @@ #define ICMP6_TIME_EXCEED_REASSEMBLY ICMP6_TIME_EXCEED_REASSEMBLY #define ICMP6_TIME_EXCEED_TRANSIT ICMP6_TIME_EXCEED_TRANSIT -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint8_t ICMP6_DST_UNREACH; @@ -70,5 +69,4 @@ extern const uint8_t ICMP6_TIME_EXCEED_REASSEMBLY; extern const uint8_t ICMP6_TIME_EXCEED_TRANSIT; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_ICMP6_H_ */ diff --git a/libc/sysv/consts/iff.h b/libc/sysv/consts/iff.h index 60e4bd33e..404c24e52 100644 --- a/libc/sysv/consts/iff.h +++ b/libc/sysv/consts/iff.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_IFF_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_IFF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int IFF_UP; @@ -21,7 +20,6 @@ extern const int IFF_RUNNING; extern const int IFF_SLAVE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define IFF_UP 1 #define IFF_BROADCAST 2 diff --git a/libc/sysv/consts/io.h b/libc/sysv/consts/io.h index 7d37df130..40cee4c11 100644 --- a/libc/sysv/consts/io.h +++ b/libc/sysv/consts/io.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_IO_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_IO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define _IOC(a, b, c, d) (((a) << 30) | ((b) << 8) | (c) | ((d) << 16)) @@ -14,5 +13,4 @@ COSMOPOLITAN_C_START_ #define _IOWR(a, b, c) _IOC(_IOC_READ | _IOC_WRITE, (a), (b), sizeof(c)) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_IO_H_ */ diff --git a/libc/sysv/consts/iov.h b/libc/sysv/consts/iov.h index 23e561768..063025331 100644 --- a/libc/sysv/consts/iov.h +++ b/libc/sysv/consts/iov.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_IOV_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_IOV_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int IOV_MAX; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define IOV_MAX IOV_MAX diff --git a/libc/sysv/consts/ip.h b/libc/sysv/consts/ip.h index 8e4c11702..158b8cae2 100644 --- a/libc/sysv/consts/ip.h +++ b/libc/sysv/consts/ip.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_IP_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_IP_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int IP_ADD_MEMBERSHIP; @@ -105,5 +104,4 @@ extern const int IP_XFRM_POLICY; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_IP_H_ */ diff --git a/libc/sysv/consts/ipport.h b/libc/sysv/consts/ipport.h index 1cc719113..4c7d998e4 100644 --- a/libc/sysv/consts/ipport.h +++ b/libc/sysv/consts/ipport.h @@ -58,11 +58,9 @@ #define IPPORT_IMAPS 993 #define IPPORT_POP3S 995 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int IPPORT_USERRESERVED; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_IPPORT_H_ */ diff --git a/libc/sysv/consts/ipv6.h b/libc/sysv/consts/ipv6.h index 69f0fe210..44726a41b 100644 --- a/libc/sysv/consts/ipv6.h +++ b/libc/sysv/consts/ipv6.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_IPV6_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_IPV6_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int IPV6_2292DSTOPTS; @@ -125,5 +124,4 @@ extern const int IPV6_XFRM_POLICY; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_IPV6_H_ */ diff --git a/libc/sysv/consts/kd.h b/libc/sysv/consts/kd.h index 2f2b45e11..ce1486b82 100644 --- a/libc/sysv/consts/kd.h +++ b/libc/sysv/consts/kd.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_KD_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_KD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint64_t GIO_FONT; @@ -15,7 +14,6 @@ extern const uint64_t PIO_FONTRESET; extern const uint64_t KDFONTOP; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define GIO_FONT GIO_FONT #define PIO_FONT PIO_FONT diff --git a/libc/sysv/consts/kern.h b/libc/sysv/consts/kern.h index b77e3d3f5..fbdfa850f 100644 --- a/libc/sysv/consts/kern.h +++ b/libc/sysv/consts/kern.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_KERN_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_KERN_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define KERN_SOH "\001" @@ -17,5 +16,4 @@ COSMOPOLITAN_C_START_ #define KERN_CONT KERN_SOH "c" COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_KERN_H_ */ diff --git a/libc/sysv/consts/limits.h b/libc/sysv/consts/limits.h index 5b227f3a1..dbe349748 100644 --- a/libc/sysv/consts/limits.h +++ b/libc/sysv/consts/limits.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_LIMITS_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_LIMITS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int NGROUPS_MAX; @@ -27,5 +26,4 @@ extern const int MAX_INPUT; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_LIMITS_H_ */ diff --git a/libc/sysv/consts/lio.h b/libc/sysv/consts/lio.h index bf08d6a34..b0fed0aad 100644 --- a/libc/sysv/consts/lio.h +++ b/libc/sysv/consts/lio.h @@ -7,7 +7,6 @@ #define LIO_WAIT LIO_WAIT #define LIO_WRITE LIO_WRITE -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int LIO_NOP; @@ -17,5 +16,4 @@ extern const int LIO_WAIT; extern const int LIO_WRITE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_LIO_H_ */ diff --git a/libc/sysv/consts/lock.h b/libc/sysv/consts/lock.h index cac39cbdc..5fdcce2d3 100644 --- a/libc/sysv/consts/lock.h +++ b/libc/sysv/consts/lock.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_LOCK_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_LOCK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int LOCK_EX; @@ -10,7 +9,6 @@ extern const int LOCK_UN; extern const int LOCK_UNLOCK_CACHE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define LOCK_EX 2 #define LOCK_NB LOCK_NB diff --git a/libc/sysv/consts/loglevel.h b/libc/sysv/consts/loglevel.h index d0fa3e91f..69de004c8 100644 --- a/libc/sysv/consts/loglevel.h +++ b/libc/sysv/consts/loglevel.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_LOGLEVEL_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_LOGLEVEL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define LOGLEVEL_SCHED -2 @@ -15,5 +14,4 @@ COSMOPOLITAN_C_START_ #define LOGLEVEL_DEBUG 7 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_LOGLEVEL_H_ */ diff --git a/libc/sysv/consts/madv.h b/libc/sysv/consts/madv.h index df2f5b9f8..613645db5 100644 --- a/libc/sysv/consts/madv.h +++ b/libc/sysv/consts/madv.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_MADV_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_MADV_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const unsigned MADV_DODUMP; @@ -35,5 +34,4 @@ extern const unsigned MADV_COLLAPSE; #define MADV_WILLNEED 3 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_MADV_H_ */ diff --git a/libc/sysv/consts/mcast.h b/libc/sysv/consts/mcast.h index 3f1a29875..4157a2e2d 100644 --- a/libc/sysv/consts/mcast.h +++ b/libc/sysv/consts/mcast.h @@ -11,7 +11,6 @@ #define MCAST_MSFILTER MCAST_MSFILTER #define MCAST_UNBLOCK_SOURCE MCAST_UNBLOCK_SOURCE -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int MCAST_BLOCK_SOURCE; @@ -25,5 +24,4 @@ extern const int MCAST_MSFILTER; extern const int MCAST_UNBLOCK_SOURCE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_MCAST_H_ */ diff --git a/libc/sysv/consts/mlock.h b/libc/sysv/consts/mlock.h index f28ddb638..365dcc8f1 100644 --- a/libc/sysv/consts/mlock.h +++ b/libc/sysv/consts/mlock.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_MLOCK_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_MLOCK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int MCL_CURRENT; @@ -8,7 +7,6 @@ extern const int MCL_FUTURE; extern const int MCL_ONFAULT; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define MCL_CURRENT 1 #define MCL_FUTURE 2 diff --git a/libc/sysv/consts/modem.h b/libc/sysv/consts/modem.h index eae8fe47d..54d4a9be2 100644 --- a/libc/sysv/consts/modem.h +++ b/libc/sysv/consts/modem.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_MODEM_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_MODEM_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint64_t TIOCMGET; @@ -39,5 +38,4 @@ extern const int TIOCM_ST; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_MODEM_H_ */ diff --git a/libc/sysv/consts/mount.h b/libc/sysv/consts/mount.h index 77a0f122e..21c7745e9 100644 --- a/libc/sysv/consts/mount.h +++ b/libc/sysv/consts/mount.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_MOUNT_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_MOUNT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const unsigned long MS_RDONLY; @@ -95,5 +94,4 @@ extern const int MNT_SNAPSHOT; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_MOUNT_H_ */ diff --git a/libc/sysv/consts/msg.h b/libc/sysv/consts/msg.h index 21552c917..74deaca26 100644 --- a/libc/sysv/consts/msg.h +++ b/libc/sysv/consts/msg.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_MSG_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_MSG_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int MSG_BATCH; @@ -43,5 +42,4 @@ extern const int MSG_WAITFORONE; #define MSG_CTRUNC MSG_CTRUNC COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_MSG_H_ */ diff --git a/libc/sysv/consts/msync.h b/libc/sysv/consts/msync.h index 576ecfa83..edca0de5e 100644 --- a/libc/sysv/consts/msync.h +++ b/libc/sysv/consts/msync.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_MSYNC_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_MSYNC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int MS_SYNC; @@ -12,5 +11,4 @@ extern const int MS_INVALIDATE; #define MS_INVALIDATE MS_INVALIDATE COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_MSYNC_H_ */ diff --git a/libc/sysv/consts/o.h b/libc/sysv/consts/o.h index 391db2b87..d8f84a5d7 100644 --- a/libc/sysv/consts/o.h +++ b/libc/sysv/consts/o.h @@ -6,7 +6,6 @@ #define O_RDWR 2 #define O_ACCMODE 3 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const unsigned O_APPEND; @@ -62,5 +61,4 @@ extern const unsigned O_VERIFY; #define O_UNLINK O_UNLINK COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_O_H_ */ diff --git a/libc/sysv/consts/ok.h b/libc/sysv/consts/ok.h index c043e7299..b8a6a89cb 100644 --- a/libc/sysv/consts/ok.h +++ b/libc/sysv/consts/ok.h @@ -6,7 +6,6 @@ #define W_OK W_OK #define R_OK R_OK -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int X_OK; @@ -14,5 +13,4 @@ extern const int W_OK; extern const unsigned R_OK; /* warning: is sign bit on windows */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_OK_H_ */ diff --git a/libc/sysv/consts/pf.h b/libc/sysv/consts/pf.h index 3ea113934..9f376da36 100644 --- a/libc/sysv/consts/pf.h +++ b/libc/sysv/consts/pf.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_PF_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_PF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int PF_ALG; @@ -97,5 +96,4 @@ extern const int PF_X25; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_PF_H_ */ diff --git a/libc/sysv/consts/poll.h b/libc/sysv/consts/poll.h index 841c4cb46..7d44c2c32 100644 --- a/libc/sysv/consts/poll.h +++ b/libc/sysv/consts/poll.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_POLL_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_POLL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int16_t POLLERR; @@ -30,5 +29,4 @@ extern const int16_t POLLWRNORM; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_POLL_H_ */ diff --git a/libc/sysv/consts/posix.h b/libc/sysv/consts/posix.h index 502e5d946..ff0978b50 100644 --- a/libc/sysv/consts/posix.h +++ b/libc/sysv/consts/posix.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_POSIX_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_POSIX_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int POSIX_FADV_DONTNEED; @@ -25,5 +24,4 @@ extern const int POSIX_MADV_DONTNEED; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_POSIX_H_ */ diff --git a/libc/sysv/consts/prio.h b/libc/sysv/consts/prio.h index 303099a0c..5af4a67bd 100644 --- a/libc/sysv/consts/prio.h +++ b/libc/sysv/consts/prio.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_PRIO_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_PRIO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int PRIO_MAX; @@ -16,5 +15,4 @@ extern const int PRIO_USER; #define PRIO_MAX 20 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_PRIO_H_ */ diff --git a/libc/sysv/consts/ptrace.h b/libc/sysv/consts/ptrace.h index adc6cd732..9be1f578b 100644 --- a/libc/sysv/consts/ptrace.h +++ b/libc/sysv/consts/ptrace.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_PTRACE_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_PTRACE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int PTRACE_TRACEME; @@ -55,7 +54,6 @@ extern const int PTRACE_EVENT_STOP; extern const int PTRACE_EVENT_SECCOMP; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define PTRACE_TRACEME PTRACE_TRACEME #define PTRACE_PEEKTEXT PTRACE_PEEKTEXT diff --git a/libc/sysv/consts/pty.h b/libc/sysv/consts/pty.h index e3e40936e..d0c02f8e5 100644 --- a/libc/sysv/consts/pty.h +++ b/libc/sysv/consts/pty.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_PTY_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_PTY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int TIOCPKT; @@ -26,5 +25,4 @@ extern const int TIOCPKT_STOP; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_PTY_H_ */ diff --git a/libc/sysv/consts/read.h b/libc/sysv/consts/read.h index 77253e723..edef19603 100644 --- a/libc/sysv/consts/read.h +++ b/libc/sysv/consts/read.h @@ -14,7 +14,6 @@ #define READ_REVERSE READ_REVERSE #define READ_TOC READ_TOC -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const long READ_10; @@ -31,5 +30,4 @@ extern const long READ_REVERSE; extern const long READ_TOC; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_READ_H_ */ diff --git a/libc/sysv/consts/reboot.h b/libc/sysv/consts/reboot.h index 8de0438bd..232b62657 100644 --- a/libc/sysv/consts/reboot.h +++ b/libc/sysv/consts/reboot.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_REBOOT_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_REBOOT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const unsigned RB_AUTOBOOT; @@ -29,5 +28,4 @@ extern const unsigned RB_NOSYNC; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_REBOOT_H_ */ diff --git a/libc/sysv/consts/rlim.h b/libc/sysv/consts/rlim.h index 0d09e9f32..c7f081ae1 100644 --- a/libc/sysv/consts/rlim.h +++ b/libc/sysv/consts/rlim.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_RLIM_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_RLIM_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint64_t RLIM_INFINITY; @@ -15,5 +14,4 @@ extern const uint64_t RLIM_SAVED_MAX; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_RLIM_H_ */ diff --git a/libc/sysv/consts/rlimit.h b/libc/sysv/consts/rlimit.h index f5db40b22..d3dfea747 100644 --- a/libc/sysv/consts/rlimit.h +++ b/libc/sysv/consts/rlimit.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_RLIMIT_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_RLIMIT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const unsigned RLIMIT_AS; @@ -46,5 +45,4 @@ extern const unsigned RLIMIT_VMEM; #define RLIMIT_VMEM RLIMIT_VMEM COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_RLIMIT_H_ */ diff --git a/libc/sysv/consts/rusage.h b/libc/sysv/consts/rusage.h index 505e11a87..c08f05d68 100644 --- a/libc/sysv/consts/rusage.h +++ b/libc/sysv/consts/rusage.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_RUSAGE_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_RUSAGE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int RUSAGE_THREAD; @@ -11,5 +10,4 @@ extern const int RUSAGE_BOTH; #define RUSAGE_CHILDREN RUSAGE_CHILDREN COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_RUSAGE_H_ */ diff --git a/libc/sysv/consts/sa.h b/libc/sysv/consts/sa.h index 6239a38ae..b6a99776d 100644 --- a/libc/sysv/consts/sa.h +++ b/libc/sysv/consts/sa.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SA_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const uint64_t SA_NOCLDSTOP; @@ -25,5 +24,4 @@ extern const uint64_t SA_SIGINFO; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SA_H_ */ diff --git a/libc/sysv/consts/sched.h b/libc/sysv/consts/sched.h index 8620f2919..9a960aa6e 100644 --- a/libc/sysv/consts/sched.h +++ b/libc/sysv/consts/sched.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SCHED_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SCHED_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int SCHED_BATCH; @@ -22,5 +21,4 @@ extern const int SCHED_RR; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SCHED_H_ */ diff --git a/libc/sysv/consts/scm.h b/libc/sysv/consts/scm.h index dd1d28e49..60052b287 100644 --- a/libc/sysv/consts/scm.h +++ b/libc/sysv/consts/scm.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SCM_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SCM_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int SCM_TIMESTAMP; @@ -10,7 +9,6 @@ extern const int SCM_TIMESTAMPNS; extern const int SCM_WIFI_STATUS; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define SCM_RIGHTS 1 #define SCM_TIMESTAMP SCM_TIMESTAMP diff --git a/libc/sysv/consts/seek.h b/libc/sysv/consts/seek.h index 562281496..d6f646910 100644 --- a/libc/sysv/consts/seek.h +++ b/libc/sysv/consts/seek.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SEEK_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SEEK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int SEEK_DATA; extern const int SEEK_HOLE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SEEK_H_ */ diff --git a/libc/sysv/consts/sf.h b/libc/sysv/consts/sf.h index c77f1ae4b..6e3d74aae 100644 --- a/libc/sysv/consts/sf.h +++ b/libc/sysv/consts/sf.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SF_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct sf_hdtr { @@ -20,5 +19,4 @@ extern const int SF_SYNC; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SF_H_ */ diff --git a/libc/sysv/consts/shm.h b/libc/sysv/consts/shm.h index 320b873b8..89ee60a69 100644 --- a/libc/sysv/consts/shm.h +++ b/libc/sysv/consts/shm.h @@ -17,7 +17,6 @@ #define SHM_UNLOCK SHM_UNLOCK #define SHM_W SHM_W -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const char *SHM_ANON; @@ -37,5 +36,4 @@ extern const int SHM_UNLOCK; extern const int SHM_W; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SHM_H_ */ diff --git a/libc/sysv/consts/shut.h b/libc/sysv/consts/shut.h index be8aacc01..5b6ec42e6 100644 --- a/libc/sysv/consts/shut.h +++ b/libc/sysv/consts/shut.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SHUT_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SHUT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int SHUT_RD; @@ -12,5 +11,4 @@ extern const int SHUT_WR; #define SHUT_WR 1 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SHUT_H_ */ diff --git a/libc/sysv/consts/sicode.h b/libc/sysv/consts/sicode.h index ac1ec3618..6fb95090a 100644 --- a/libc/sysv/consts/sicode.h +++ b/libc/sysv/consts/sicode.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SICODE_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SICODE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int32_t SI_USER; @@ -108,5 +107,4 @@ extern const int32_t SYS_USER_DISPATCH; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SICODE_H_ */ diff --git a/libc/sysv/consts/sig.h b/libc/sysv/consts/sig.h index 21e4d683b..3a66c711b 100644 --- a/libc/sysv/consts/sig.h +++ b/libc/sysv/consts/sig.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SIG_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SIG_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int SIGABRT; @@ -48,7 +47,6 @@ extern const int SIG_SETMASK; extern const int SIG_UNBLOCK; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define SIGABRT 6 #define SIGALRM 14 diff --git a/libc/sysv/consts/sio.h b/libc/sysv/consts/sio.h index bbb713ba8..294882e61 100644 --- a/libc/sysv/consts/sio.h +++ b/libc/sysv/consts/sio.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SIO_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SIO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const unsigned long SIOCADDDLCI; @@ -86,5 +85,4 @@ extern const unsigned long SIOGIFINDEX; #define SIOCDELMULTI SIOCDELMULTI COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SIO_H_ */ diff --git a/libc/sysv/consts/so.h b/libc/sysv/consts/so.h index d32ae9fc3..bdc381ec4 100644 --- a/libc/sysv/consts/so.h +++ b/libc/sysv/consts/so.h @@ -3,7 +3,6 @@ #define SO_DEBUG 1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int SO_TYPE; @@ -48,5 +47,4 @@ extern const int SO_REUSEPORT; #define SO_REUSEPORT SO_REUSEPORT COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SO_H_ */ diff --git a/libc/sysv/consts/sock.h b/libc/sysv/consts/sock.h index ab3a6545e..bcd95edec 100644 --- a/libc/sysv/consts/sock.h +++ b/libc/sysv/consts/sock.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SOCK_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SOCK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int SOCK_CLOEXEC; @@ -22,5 +21,4 @@ extern const int SOCK_STREAM; #define SOCK_NONBLOCK SOCK_NONBLOCK COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SOCK_H_ */ diff --git a/libc/sysv/consts/sol.h b/libc/sysv/consts/sol.h index 3ecb1bc7f..d790f516f 100644 --- a/libc/sysv/consts/sol.h +++ b/libc/sysv/consts/sol.h @@ -9,12 +9,10 @@ #define SOL_ICMPV6 58 #define SOL_RAW 255 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int SOL_SOCKET; #define SOL_SOCKET SOL_SOCKET COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SOL_H_ */ diff --git a/libc/sysv/consts/splice.h b/libc/sysv/consts/splice.h index 9c6cfd272..becc6057a 100644 --- a/libc/sysv/consts/splice.h +++ b/libc/sysv/consts/splice.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SPLICE_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SPLICE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const unsigned int SPLICE_F_GIFT; @@ -9,5 +8,4 @@ extern const unsigned int SPLICE_F_MOVE; extern const unsigned int SPLICE_F_NONBLOCK; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SPLICE_H_ */ diff --git a/libc/sysv/consts/ss.h b/libc/sysv/consts/ss.h index 4cc3d22cf..ef83ec6ec 100644 --- a/libc/sysv/consts/ss.h +++ b/libc/sysv/consts/ss.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SS_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_SS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int SS_DISABLE; @@ -8,7 +7,6 @@ extern const int _SIGSTKSZ; extern const int _MINSIGSTKSZ; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define SIGSTKSZ 32768 #define MINSIGSTKSZ 32768 /* xnu defines the highest minimum */ diff --git a/libc/sysv/consts/st.h b/libc/sysv/consts/st.h index 8d8840654..13eeebb1d 100644 --- a/libc/sysv/consts/st.h +++ b/libc/sysv/consts/st.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_ST_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_ST_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int ST_APPEND; @@ -31,5 +30,4 @@ extern const int ST_WRITE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_ST_H_ */ diff --git a/libc/sysv/consts/tcp.h b/libc/sysv/consts/tcp.h index a6c4f3bdb..3e92216c3 100644 --- a/libc/sysv/consts/tcp.h +++ b/libc/sysv/consts/tcp.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_TCP_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_TCP_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int TCP_CC_INFO; @@ -69,5 +68,4 @@ extern const int TCP_WINDOW_CLAMP; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_TCP_H_ */ diff --git a/libc/sysv/consts/termios.h b/libc/sysv/consts/termios.h index d6e677db4..dd9091c6f 100644 --- a/libc/sysv/consts/termios.h +++ b/libc/sysv/consts/termios.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_TERMIOS_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_TERMIOS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define EXTA B19200 @@ -246,5 +245,4 @@ extern const int TCIOFLUSH; #define TCION 3 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_TERMIOS_H_ */ diff --git a/libc/sysv/consts/uc.h b/libc/sysv/consts/uc.h index 8f0b6fde8..a9a212774 100644 --- a/libc/sysv/consts/uc.h +++ b/libc/sysv/consts/uc.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_UC_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_UC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define UC_FP_XSTATE 1 @@ -8,5 +7,4 @@ COSMOPOLITAN_C_START_ #define UC_STRICT_RESTORE_SS 4 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_UC_H_ */ diff --git a/libc/sysv/consts/unmount.h b/libc/sysv/consts/unmount.h index 9de67e677..99ea92947 100644 --- a/libc/sysv/consts/unmount.h +++ b/libc/sysv/consts/unmount.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_MOUNT_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_MOUNT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int MNT_FORCE; @@ -10,7 +9,6 @@ extern const int UMOUNT_NOFOLLOW; extern const int MNT_BYFSID; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define MNT_FORCE MNT_FORCE #define MNT_DETACH MNT_DETACH diff --git a/libc/sysv/consts/utime.h b/libc/sysv/consts/utime.h index 914c8545a..8c63fc9e1 100644 --- a/libc/sysv/consts/utime.h +++ b/libc/sysv/consts/utime.h @@ -1,13 +1,11 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_UTIME_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_UTIME_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int UTIME_NOW; extern const int UTIME_OMIT; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #define UTIME_NOW UTIME_NOW #define UTIME_OMIT UTIME_OMIT diff --git a/libc/sysv/consts/w.h b/libc/sysv/consts/w.h index 18394fbf4..8f1b323ae 100644 --- a/libc/sysv/consts/w.h +++ b/libc/sysv/consts/w.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_W_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_W_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int WNOHANG; @@ -13,5 +12,4 @@ extern const int WCONTINUED; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_W_H_ */ diff --git a/libc/sysv/consts/waitid.h b/libc/sysv/consts/waitid.h index 5899f796e..4884ca991 100644 --- a/libc/sysv/consts/waitid.h +++ b/libc/sysv/consts/waitid.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_WAITID_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_WAITID_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const int WEXITED; @@ -12,5 +11,4 @@ extern const int WNOWAIT; #define WNOWAIT WNOWAIT COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_WAITID_H_ */ diff --git a/libc/sysv/errfuns.h b/libc/sysv/errfuns.h index c1582b536..053da209b 100644 --- a/libc/sysv/errfuns.h +++ b/libc/sysv/errfuns.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_ERRFUNS_H_ #define COSMOPOLITAN_LIBC_SYSV_ERRFUNS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * @fileoverview Optimized error return paths. @@ -295,5 +294,4 @@ intptr_t ehwpoison(void) relegated; #define ehwpoison() __ERRFUN("ehwpoison") #endif -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_SYSV_ERRFUNS_H_ */ diff --git a/libc/sysv/systemfive.S b/libc/sysv/systemfive.S index cb489d966..f77385cff 100644 --- a/libc/sysv/systemfive.S +++ b/libc/sysv/systemfive.S @@ -19,10 +19,8 @@ #include "libc/intrin/strace.internal.h" #include "libc/dce.h" #include "libc/macros.internal.h" +#include "libc/thread/pt.internal.h" #include "libc/nexgen32e/macros.h" -#include "libc/sysv/consts/sig.h" -#include "libc/thread/posixthread.internal.h" -#include "libc/sysv/consts/nr.h" #define SIG_IGN 1 @@ -436,7 +434,7 @@ _init_systemfive_sigsys: push %rax push $SIG_IGN // sigaction_meta size 48 mov __NR_sigaction(%rip),%eax // mag - mov SIGSYS,%edi // sig + mov SIGSYS(%rip),%edi // sig mov %rsp,%rsi // new xor %edx,%edx // old mov $8,%r10d // for linux diff --git a/libc/temp.h b/libc/temp.h index f818a8444..73b7d4a6e 100644 --- a/libc/temp.h +++ b/libc/temp.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TEMP_H_ #define COSMOPOLITAN_LIBC_TEMP_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *mktemp(char *) returnsnonnull paramsnonnull(); @@ -18,5 +17,4 @@ int openatemp(int, char *, int, int, int) paramsnonnull() __wur; #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TEMP_H_ */ diff --git a/libc/testlib/aspect.internal.h b/libc/testlib/aspect.internal.h index a3c26dec9..4c5cbdcae 100644 --- a/libc/testlib/aspect.internal.h +++ b/libc/testlib/aspect.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_TESTLIB_ASPECT_INTERNAL_H_ #include "libc/intrin/dll.h" #include "libc/testlib/testlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define TESTASPECT_CONTAINER(e) DLL_CONTAINER(struct TestAspect, elem, e) @@ -17,5 +16,4 @@ struct TestAspect { extern struct Dll *testlib_aspects; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TESTLIB_ASPECT_INTERNAL_H_ */ diff --git a/libc/testlib/bench.h b/libc/testlib/bench.h index 8caec1de2..5ab23346f 100644 --- a/libc/testlib/bench.h +++ b/libc/testlib/bench.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_BENCH_H_ #define COSMOPOLITAN_LIBC_BENCH_H_ #include "libc/nexgen32e/bench.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -45,5 +44,4 @@ COSMOPOLITAN_C_START_ #endif /* BENCHLOOP */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_BENCH_H_ */ diff --git a/libc/testlib/blocktronics.h b/libc/testlib/blocktronics.h index 43fdaf036..1ea0d1ac9 100644 --- a/libc/testlib/blocktronics.h +++ b/libc/testlib/blocktronics.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TESTLIB_BLOCKTRONICS_H_ #define COSMOPOLITAN_LIBC_TESTLIB_BLOCKTRONICS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern size_t kBlocktronicsSize; @@ -8,5 +7,4 @@ extern char kBlocktronics[]; extern uint8_t kBlocktronicsZip[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TESTLIB_BLOCKTRONICS_H_ */ diff --git a/libc/testlib/ezbench.h b/libc/testlib/ezbench.h index 15cde5064..475562405 100644 --- a/libc/testlib/ezbench.h +++ b/libc/testlib/ezbench.h @@ -6,7 +6,6 @@ #include "libc/nexgen32e/x86feature.h" #include "libc/testlib/bench.h" #include "libc/testlib/testlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #ifndef EZBENCH_COUNT @@ -196,5 +195,4 @@ void __testlib_ezbenchreport_n(const char *, char, size_t, double); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TESTLIB_EZBENCH_H_ */ diff --git a/libc/testlib/fastrandomstring.h b/libc/testlib/fastrandomstring.h index e9065e633..bb64eec40 100644 --- a/libc/testlib/fastrandomstring.h +++ b/libc/testlib/fastrandomstring.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TESTLIB_FASTRANDOMSTRING_H_ #define COSMOPOLITAN_LIBC_TESTLIB_FASTRANDOMSTRING_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) static inline const char *FastRandomString(void) { static unsigned long t; @@ -12,5 +11,4 @@ static inline const char *FastRandomString(void) { return u.b; } -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TESTLIB_FASTRANDOMSTRING_H_ */ diff --git a/libc/testlib/formatstr.c b/libc/testlib/formatstr.c index 8b1843288..9b77d42c0 100644 --- a/libc/testlib/formatstr.c +++ b/libc/testlib/formatstr.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/str/str.h" #include "libc/str/utf16.h" #include "libc/testlib/testlib.h" diff --git a/libc/testlib/hyperion.h b/libc/testlib/hyperion.h index 08f997eb0..86ecce977 100644 --- a/libc/testlib/hyperion.h +++ b/libc/testlib/hyperion.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TESTLIB_HYPERION_H_ #define COSMOPOLITAN_LIBC_TESTLIB_HYPERION_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern size_t kHyperionSize; @@ -12,5 +11,4 @@ extern char kMoby[]; extern uint8_t kMobyZip[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TESTLIB_HYPERION_H_ */ diff --git a/libc/testlib/moby.h b/libc/testlib/moby.h index 40dbb1ffd..43ceb4ae1 100644 --- a/libc/testlib/moby.h +++ b/libc/testlib/moby.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TESTLIB_MOBY_H_ #define COSMOPOLITAN_LIBC_TESTLIB_MOBY_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern size_t kMobySize; @@ -8,5 +7,4 @@ extern char kMoby[]; extern uint8_t kMobyZip[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TESTLIB_MOBY_H_ */ diff --git a/libc/testlib/subprocess.h b/libc/testlib/subprocess.h index 43f865ade..0d396de75 100644 --- a/libc/testlib/subprocess.h +++ b/libc/testlib/subprocess.h @@ -4,7 +4,6 @@ #include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/testlib/testlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -79,5 +78,4 @@ void testlib_waitforexit(const char *, int, const char *, int, int); void testlib_waitforterm(const char *, int, const char *, int, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TESTLIB_SUBPROCESS_H_ */ diff --git a/libc/testlib/testlib.h b/libc/testlib/testlib.h index 8a1622334..e2dedd68f 100644 --- a/libc/testlib/testlib.h +++ b/libc/testlib/testlib.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TESTLIB_H_ #define COSMOPOLITAN_LIBC_TESTLIB_H_ #include "libc/stdbool.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § testing library ─╬─│┼ @@ -661,5 +660,4 @@ forceinline void assertLongDoubleEquals(FILIFU_ARGS long double want, } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TESTLIB_H_ */ diff --git a/libc/testlib/viewables.h b/libc/testlib/viewables.h index e127c9b3d..883eb826a 100644 --- a/libc/testlib/viewables.h +++ b/libc/testlib/viewables.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TESTLIB_VIEWABLES_H_ #define COSMOPOLITAN_LIBC_TESTLIB_VIEWABLES_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern size_t kViewablesSize; @@ -8,5 +7,4 @@ extern char kViewables[]; extern uint8_t kViewablesZip[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TESTLIB_VIEWABLES_H_ */ diff --git a/libc/thread/freebsd.internal.h b/libc/thread/freebsd.internal.h index d6473c231..97a7c9e06 100644 --- a/libc/thread/freebsd.internal.h +++ b/libc/thread/freebsd.internal.h @@ -21,7 +21,6 @@ #define UMTX_OP_WAKE_PRIVATE 16 #define UMTX_ABSTIME 1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct rtprio { @@ -51,5 +50,4 @@ struct _umtx_time { int sys_umtx_timedwait_uint(_Atomic(int) *, int, bool, const struct timespec *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_THREAD_FREEBSD_INTERNAL_H_ */ diff --git a/libc/thread/itimer.internal.h b/libc/thread/itimer.internal.h index b62aebb8b..41d721216 100644 --- a/libc/thread/itimer.internal.h +++ b/libc/thread/itimer.internal.h @@ -4,7 +4,6 @@ #include "libc/calls/struct/itimerval.h" #include "third_party/nsync/cv.h" #include "third_party/nsync/mu.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct IntervalTimer { @@ -20,5 +19,4 @@ extern struct IntervalTimer __itimer; void __itimer_wipe(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_ITIMER_H_ */ diff --git a/libc/thread/openbsd.internal.h b/libc/thread/openbsd.internal.h index 49c27e66a..a41d81097 100644 --- a/libc/thread/openbsd.internal.h +++ b/libc/thread/openbsd.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_THREAD_OPENBSD_INTERNAL_H_ #define COSMOPOLITAN_LIBC_THREAD_OPENBSD_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct __tfork { @@ -12,5 +11,4 @@ struct __tfork { int __tfork_thread(struct __tfork *, size_t, void (*)(void *), void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_THREAD_OPENBSD_INTERNAL_H_ */ diff --git a/libc/thread/posixthread.internal.h b/libc/thread/posixthread.internal.h index 41c28f54f..0b55225a3 100644 --- a/libc/thread/posixthread.internal.h +++ b/libc/thread/posixthread.internal.h @@ -5,21 +5,13 @@ #include "libc/intrin/atomic.h" #include "libc/intrin/dll.h" #include "libc/runtime/runtime.h" +#include "libc/thread/pt.internal.h" #include "libc/thread/thread.h" #include "libc/thread/tls.h" -#define PT_OWNSTACK 1 -#define PT_STATIC 2 -#define PT_ASYNC 4 -#define PT_NOCANCEL 8 -#define PT_MASKED 16 -#define PT_INCANCEL 32 -#define PT_OPENBSD_KLUDGE 64 - #define PT_BLOCKER_SEM ((atomic_int *)-1) #define PT_BLOCKER_IO ((atomic_int *)-2) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ // LEGAL TRANSITIONS ┌──> TERMINATED ─┐ @@ -133,5 +125,4 @@ __funline void _pthread_ref(struct PosixThread *pt) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_THREAD_POSIXTHREAD_INTERNAL_H_ */ diff --git a/libc/thread/pt.internal.h b/libc/thread/pt.internal.h new file mode 100644 index 000000000..d054c8bab --- /dev/null +++ b/libc/thread/pt.internal.h @@ -0,0 +1,12 @@ +#ifndef COSMOPOLITAN_LIBC_THREAD_PT_H_ +#define COSMOPOLITAN_LIBC_THREAD_PT_H_ + +#define PT_OWNSTACK 1 +#define PT_STATIC 2 +#define PT_ASYNC 4 +#define PT_NOCANCEL 8 +#define PT_MASKED 16 +#define PT_INCANCEL 32 +#define PT_OPENBSD_KLUDGE 64 + +#endif /* COSMOPOLITAN_LIBC_THREAD_PT_H_ */ diff --git a/libc/thread/pthread_create.c b/libc/thread/pthread_create.c index f7c436d1a..7913b308f 100644 --- a/libc/thread/pthread_create.c +++ b/libc/thread/pthread_create.c @@ -25,7 +25,6 @@ #include "libc/errno.h" #include "libc/fmt/itoa.h" #include "libc/intrin/asan.internal.h" -#include "libc/intrin/bits.h" #include "libc/intrin/bsr.h" #include "libc/intrin/describeflags.internal.h" #include "libc/intrin/dll.h" diff --git a/libc/thread/semaphore.h b/libc/thread/semaphore.h index 946f94ba4..c1149a503 100644 --- a/libc/thread/semaphore.h +++ b/libc/thread/semaphore.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_SEMAPHORE_H_ #define COSMOPOLITAN_LIBC_CALLS_SEMAPHORE_H_ #include "libc/calls/struct/timespec.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define SEM_FAILED ((sem_t *)0) @@ -39,5 +38,4 @@ int sem_close(sem_t *); int sem_unlink(const char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_CALLS_SEMAPHORE_H_ */ diff --git a/libc/thread/thread2.h b/libc/thread/thread2.h index 8868ea73e..0ddafbed7 100644 --- a/libc/thread/thread2.h +++ b/libc/thread/thread2.h @@ -6,7 +6,6 @@ #include "libc/calls/struct/timespec.h" #include "libc/runtime/stack.h" #include "libc/thread/thread.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* clang-format off */ @@ -23,5 +22,4 @@ int pthread_timedjoin_np(pthread_t, void **, struct timespec *); /* clang-format off */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_INTRIN_PTHREAD2_H_ */ diff --git a/libc/thread/tls2.internal.h b/libc/thread/tls2.internal.h index 707dddd8a..1bbe95c5e 100644 --- a/libc/thread/tls2.internal.h +++ b/libc/thread/tls2.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_THREAD_TLS2_H_ #include "libc/dce.h" #include "libc/thread/tls.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if defined(__GNUC__) && defined(__x86_64__) && !defined(__STRICT_ANSI__) @@ -42,5 +41,4 @@ __funline void __set_tls_win32(void *tls) { #define __set_tls_win32(tls) (void)0 #endif /* GNU x86-64 */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_THREAD_TLS2_H_ */ diff --git a/libc/thread/xnu.internal.h b/libc/thread/xnu.internal.h index 71d5d5fba..fcfff3d2a 100644 --- a/libc/thread/xnu.internal.h +++ b/libc/thread/xnu.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_THREAD_XNU_INTERNAL_H_ #define COSMOPOLITAN_LIBC_THREAD_XNU_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* @@ -27,5 +26,4 @@ int thread_selfcounts(int type, void *buf, uint64_t nbytes); int thread_fast_set_cthread_self(void *tls); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_THREAD_XNU_INTERNAL_H_ */ diff --git a/libc/time/clockstonanos.internal.h b/libc/time/clockstonanos.internal.h index c44f78cec..34025c5bc 100644 --- a/libc/time/clockstonanos.internal.h +++ b/libc/time/clockstonanos.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TIME_CLOCKSTONANOS_INTERNAL_H_ #define COSMOPOLITAN_LIBC_TIME_CLOCKSTONANOS_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ static inline uint64_t ClocksToNanos(uint64_t x, uint64_t y) { @@ -11,5 +10,4 @@ static inline uint64_t ClocksToNanos(uint64_t x, uint64_t y) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TIME_CLOCKSTONANOS_INTERNAL_H_ */ diff --git a/libc/time/localtime.c b/libc/time/localtime.c index af42ba8c3..63453b46a 100644 --- a/libc/time/localtime.c +++ b/libc/time/localtime.c @@ -5,7 +5,7 @@ #include "libc/calls/blockcancel.internal.h" #include "libc/calls/calls.h" #include "libc/cxxabi.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" #include "libc/str/str.h" diff --git a/libc/time/struct/timezone.h b/libc/time/struct/timezone.h index 28cfa2186..505e0c059 100644 --- a/libc/time/struct/timezone.h +++ b/libc/time/struct/timezone.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TIME_STRUCT_TIMEZONE_H_ #define COSMOPOLITAN_LIBC_TIME_STRUCT_TIMEZONE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct timezone { @@ -9,5 +8,4 @@ struct timezone { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TIME_STRUCT_TIMEZONE_H_ */ diff --git a/libc/time/struct/tm.h b/libc/time/struct/tm.h index cfcf27940..02824b87e 100644 --- a/libc/time/struct/tm.h +++ b/libc/time/struct/tm.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TIME_STRUCT_TM_H_ #define COSMOPOLITAN_LIBC_TIME_STRUCT_TM_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct tm { @@ -40,5 +39,4 @@ char *iso8601us(char[hasatleast 27], struct tm *, long); #endif /* _COSMO_SOURCE */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TIME_STRUCT_TM_H_ */ diff --git a/libc/time/struct/utimbuf.h b/libc/time/struct/utimbuf.h index 6d69af37a..3cab1842b 100644 --- a/libc/time/struct/utimbuf.h +++ b/libc/time/struct/utimbuf.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TIME_STRUCT_UTIMBUF_H_ #define COSMOPOLITAN_LIBC_TIME_STRUCT_UTIMBUF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct utimbuf { @@ -11,5 +10,4 @@ struct utimbuf { int utime(const char *, const struct utimbuf *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TIME_STRUCT_UTIMBUF_H_ */ diff --git a/libc/time/struct/utimbuf.internal.h b/libc/time/struct/utimbuf.internal.h index 3a18d3893..2b5750f29 100644 --- a/libc/time/struct/utimbuf.internal.h +++ b/libc/time/struct/utimbuf.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_TIME_STRUCT_UTIMBUF_INTERNAL_H_ #define COSMOPOLITAN_LIBC_TIME_STRUCT_UTIMBUF_INTERNAL_H_ #include "libc/time/struct/utimbuf.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sys_utime(const char *, const struct utimbuf *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TIME_STRUCT_UTIMBUF_INTERNAL_H_ */ diff --git a/libc/time/time.h b/libc/time/time.h index 42e03a53f..a86811d93 100644 --- a/libc/time/time.h +++ b/libc/time/time.h @@ -3,7 +3,6 @@ #define TIME_UTC 1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern char *tzname[2]; @@ -28,5 +27,4 @@ void RefreshTime(void); #endif /* _COSMO_SOURCE */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TIME_TIME_H_ */ diff --git a/libc/time/tz.internal.h b/libc/time/tz.internal.h index a851ed4ef..fc6194493 100644 --- a/libc/time/tz.internal.h +++ b/libc/time/tz.internal.h @@ -8,7 +8,6 @@ #include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/ok.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* clang-format off */ @@ -539,5 +538,4 @@ char *ctime_r(int64_t const *, char *); #define isleap_sum(a, b) isleap((a) % 400 + (b) % 400) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_TZ_PRIVATE_H_ */ diff --git a/libc/tinymath/atan_common.internal.h b/libc/tinymath/atan_common.internal.h index dd3827588..57c6aaf01 100644 --- a/libc/tinymath/atan_common.internal.h +++ b/libc/tinymath/atan_common.internal.h @@ -3,7 +3,6 @@ #include "libc/tinymath/atan_data.internal.h" #include "libc/tinymath/estrin_wrap.internal.h" #include "libc/tinymath/horner.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ // clang-format off @@ -53,5 +52,4 @@ eval_poly (DBL_T z, DBL_T az, DBL_T shift) #undef P COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_ATAN_COMMON_H_ */ diff --git a/libc/tinymath/atan_data.internal.h b/libc/tinymath/atan_data.internal.h index 90aa24bf7..5f3858465 100644 --- a/libc/tinymath/atan_data.internal.h +++ b/libc/tinymath/atan_data.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_ATAN_DATA_H_ #define COSMOPOLITAN_LIBC_TINYMATH_ATAN_DATA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define ATAN_POLY_NCOEFFS 20 @@ -9,5 +8,4 @@ extern const struct atan_poly_data { } __atan_poly_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_ATAN_DATA_H_ */ diff --git a/libc/tinymath/atanf_common.internal.h b/libc/tinymath/atanf_common.internal.h index d0ebfeef7..13368d3a1 100644 --- a/libc/tinymath/atanf_common.internal.h +++ b/libc/tinymath/atanf_common.internal.h @@ -3,7 +3,6 @@ #include "libc/tinymath/atanf_data.internal.h" #include "libc/tinymath/estrin_wrap.internal.h" #include "libc/tinymath/hornerf.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ // clang-format off @@ -42,5 +41,4 @@ eval_poly (FLT_T z, FLT_T az, FLT_T shift) } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_ATANF_COMMON_H_ */ diff --git a/libc/tinymath/atanf_data.internal.h b/libc/tinymath/atanf_data.internal.h index 5389b1b42..ade0fd877 100644 --- a/libc/tinymath/atanf_data.internal.h +++ b/libc/tinymath/atanf_data.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_ATANF_DATA_H_ #define COSMOPOLITAN_LIBC_TINYMATH_ATANF_DATA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define ATANF_POLY_NCOEFFS 8 @@ -9,5 +8,4 @@ extern const struct atanf_poly_data { } __atanf_poly_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_ATANF_DATA_H_ */ diff --git a/libc/tinymath/complex.internal.h b/libc/tinymath/complex.internal.h index 4ee6f0d3e..b7b4c8cfe 100644 --- a/libc/tinymath/complex.internal.h +++ b/libc/tinymath/complex.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_COMPLEX_INTERNAL_H_ #define COSMOPOLITAN_LIBC_TINYMATH_COMPLEX_INTERNAL_H_ #include "libc/tinymath/internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define EXTRACT_WORDS(hi, lo, d) \ @@ -44,5 +43,4 @@ _Complex double __ldexp_cexp(_Complex double, int); _Complex float __ldexp_cexpf(_Complex float, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_COMPLEX_INTERNAL_H_ */ diff --git a/libc/tinymath/emod.h b/libc/tinymath/emod.h index 3e3a4139b..da56e2ac1 100644 --- a/libc/tinymath/emod.h +++ b/libc/tinymath/emod.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_EMOD_H_ #define COSMOPOLITAN_LIBC_TINYMATH_EMOD_H_ #include "libc/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Returns Euclidean floating-point division remainder. @@ -16,5 +15,4 @@ __x - fabs(__y) * floor(__x / fabs(__y)); \ }) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_EMOD_H_ */ diff --git a/libc/tinymath/emodl.h b/libc/tinymath/emodl.h index b0c29eab8..953e426ad 100644 --- a/libc/tinymath/emodl.h +++ b/libc/tinymath/emodl.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_EMODL_H_ #define COSMOPOLITAN_LIBC_TINYMATH_EMODL_H_ #include "libc/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Returns Euclidean floating-point division remainder. @@ -16,5 +15,4 @@ __x - fabsl(__y) * floorl(__x / fabsl(__y)); \ }) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_EMODL_H_ */ diff --git a/libc/tinymath/exp2f_data.internal.h b/libc/tinymath/exp2f_data.internal.h index 90ac8b061..af157b4e8 100644 --- a/libc/tinymath/exp2f_data.internal.h +++ b/libc/tinymath/exp2f_data.internal.h @@ -4,7 +4,6 @@ #define EXP2F_TABLE_BITS 5 #define EXP2F_POLY_ORDER 3 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct exp2f_data { @@ -17,5 +16,4 @@ extern const struct exp2f_data { } __exp2f_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_EXP2F_DATA_INTERNAL_H_ */ diff --git a/libc/tinymath/exp_data.internal.h b/libc/tinymath/exp_data.internal.h index 308a7e27d..a0713d691 100644 --- a/libc/tinymath/exp_data.internal.h +++ b/libc/tinymath/exp_data.internal.h @@ -6,7 +6,6 @@ #define EXP_USE_TOINT_NARROW 0 #define EXP2_POLY_ORDER 5 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct exp_data { @@ -21,5 +20,4 @@ extern const struct exp_data { } __exp_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_EXP_DATA_H_ */ diff --git a/libc/tinymath/expo.internal.h b/libc/tinymath/expo.internal.h index b20ef5191..032b81b4c 100644 --- a/libc/tinymath/expo.internal.h +++ b/libc/tinymath/expo.internal.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_EXPO_H_ #define COSMOPOLITAN_LIBC_TINYMATH_EXPO_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ double __expo2(double, double); float __expo2f(float, float); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_EXPO_H_ */ diff --git a/libc/tinymath/feval.internal.h b/libc/tinymath/feval.internal.h index 5a262326d..589bbb67b 100644 --- a/libc/tinymath/feval.internal.h +++ b/libc/tinymath/feval.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_FEVAL_INTERNAL_H_ #define COSMOPOLITAN_LIBC_TINYMATH_FEVAL_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ static inline void fevalf(float x) { @@ -19,5 +18,4 @@ static inline void fevall(long double x) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_FEVAL_INTERNAL_H_ */ diff --git a/libc/tinymath/freebsd.internal.h b/libc/tinymath/freebsd.internal.h index d41f8c973..0aca0a1ac 100644 --- a/libc/tinymath/freebsd.internal.h +++ b/libc/tinymath/freebsd.internal.h @@ -4,7 +4,6 @@ #include "libc/complex.h" #include "libc/math.h" #include "libc/runtime/fenv.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ // clang-format off @@ -1036,5 +1035,4 @@ __ldexp_cexpl(long double complex z, int expt) #endif /* _COMPLEX_H */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_FREEBSD_INTERNAL_H_ */ diff --git a/libc/tinymath/horner.internal.h b/libc/tinymath/horner.internal.h index 659897e93..4e08214c7 100644 --- a/libc/tinymath/horner.internal.h +++ b/libc/tinymath/horner.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_HORNER_INTERNAL_H_ #define COSMOPOLITAN_LIBC_TINYMATH_HORNER_INTERNAL_H_ #include "libc/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if WANT_VMATH @@ -13,5 +12,4 @@ COSMOPOLITAN_C_START_ #include "libc/tinymath/horner_wrap.internal.h" COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_HORNER_INTERNAL_H_ */ diff --git a/libc/tinymath/hornerf.internal.h b/libc/tinymath/hornerf.internal.h index 33a5f383d..ac8367f96 100644 --- a/libc/tinymath/hornerf.internal.h +++ b/libc/tinymath/hornerf.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_HORNERF_INTERNAL_H_ #define COSMOPOLITAN_LIBC_TINYMATH_HORNERF_INTERNAL_H_ #include "libc/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if WANT_VMATH @@ -13,5 +12,4 @@ COSMOPOLITAN_C_START_ #include "libc/tinymath/horner_wrap.internal.h" COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_HORNERF_INTERNAL_H_ */ diff --git a/libc/tinymath/internal.h b/libc/tinymath/internal.h index d01764d0f..cc121fed0 100644 --- a/libc/tinymath/internal.h +++ b/libc/tinymath/internal.h @@ -3,7 +3,6 @@ #define WANT_ROUNDING 1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define issignalingf_inline(x) 0 @@ -82,5 +81,4 @@ long double __math_invalidl(long double); } while (0) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_INTERNAL_H_ */ diff --git a/libc/tinymath/invtrigl.internal.h b/libc/tinymath/invtrigl.internal.h index 95bb76b5f..f3f6a116f 100644 --- a/libc/tinymath/invtrigl.internal.h +++ b/libc/tinymath/invtrigl.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_INVTRIGL_H_ #define COSMOPOLITAN_LIBC_TINYMATH_INVTRIGL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* shared by acosl, asinl and atan2l */ @@ -12,5 +11,4 @@ extern const long double pio2_hi, pio2_lo; long double __invtrigl_R(long double z); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_INVTRIGL_H_ */ diff --git a/libc/tinymath/kernel.internal.h b/libc/tinymath/kernel.internal.h index 21575c99d..53338a168 100644 --- a/libc/tinymath/kernel.internal.h +++ b/libc/tinymath/kernel.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_KERNEL_INTERNAL_H_ #define COSMOPOLITAN_LIBC_TINYMATH_KERNEL_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ double __cos(double, double); @@ -18,5 +17,4 @@ int __rem_pio2_large(double *, double *, int, int, int); int __rem_pio2f(float, double *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_KERNEL_INTERNAL_H_ */ diff --git a/libc/tinymath/ldshape.internal.h b/libc/tinymath/ldshape.internal.h index 818f09a89..fb8a9f8d9 100644 --- a/libc/tinymath/ldshape.internal.h +++ b/libc/tinymath/ldshape.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_LDSHAPE_INTERNAL_H_ #define COSMOPOLITAN_LIBC_TINYMATH_LDSHAPE_INTERNAL_H_ #include "libc/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 @@ -61,5 +60,4 @@ union ldshape { #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_LDSHAPE_INTERNAL_H_ */ diff --git a/libc/tinymath/log1pf_data.internal.h b/libc/tinymath/log1pf_data.internal.h index 39ce659b0..867f79fd3 100644 --- a/libc/tinymath/log1pf_data.internal.h +++ b/libc/tinymath/log1pf_data.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_LOG1PF_DATA_H_ #define COSMOPOLITAN_LIBC_TINYMATH_LOG1PF_DATA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define LOG1PF_2U5 @@ -11,5 +10,4 @@ extern const struct log1pf_data { } __log1pf_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_LOG1PF_DATA_H_ */ diff --git a/libc/tinymath/log2_data.internal.h b/libc/tinymath/log2_data.internal.h index b4a70c4d5..d838672f6 100644 --- a/libc/tinymath/log2_data.internal.h +++ b/libc/tinymath/log2_data.internal.h @@ -5,7 +5,6 @@ #define LOG2_POLY_ORDER 7 #define LOG2_POLY1_ORDER 11 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct log2_data { @@ -24,5 +23,4 @@ extern const struct log2_data { } __log2_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_LOG2_DATA_INTERNAL_H_ */ diff --git a/libc/tinymath/log2f_data.internal.h b/libc/tinymath/log2f_data.internal.h index 82aff7c9c..835274890 100644 --- a/libc/tinymath/log2f_data.internal.h +++ b/libc/tinymath/log2f_data.internal.h @@ -4,7 +4,6 @@ #define LOG2F_TABLE_BITS 4 #define LOG2F_POLY_ORDER 4 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct log2f_data { @@ -15,5 +14,4 @@ extern const struct log2f_data { } __log2f_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_LOG2F_DATA_INTERNAL_H_ */ diff --git a/libc/tinymath/log_data.internal.h b/libc/tinymath/log_data.internal.h index 8b7585e64..72f87b410 100644 --- a/libc/tinymath/log_data.internal.h +++ b/libc/tinymath/log_data.internal.h @@ -5,7 +5,6 @@ #define LOG_POLY_ORDER 6 #define LOG_POLY1_ORDER 12 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct log_data { @@ -24,5 +23,4 @@ extern const struct log_data { } __log_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_LOG_DATA_H_ */ diff --git a/libc/tinymath/logf_data.internal.h b/libc/tinymath/logf_data.internal.h index bbfc55170..caa51da52 100644 --- a/libc/tinymath/logf_data.internal.h +++ b/libc/tinymath/logf_data.internal.h @@ -4,7 +4,6 @@ #define LOGF_TABLE_BITS 4 #define LOGF_POLY_ORDER 4 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct logf_data { @@ -16,5 +15,4 @@ extern const struct logf_data { } __logf_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_LOGF_DATA_INTERNAL_H_ */ diff --git a/libc/tinymath/magicu.h b/libc/tinymath/magicu.h index 80ff14772..f30fa45fc 100644 --- a/libc/tinymath/magicu.h +++ b/libc/tinymath/magicu.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_MAGICU_H_ #define COSMOPOLITAN_LIBC_TINYMATH_MAGICU_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct magicu { @@ -31,5 +30,4 @@ static inline bool32 __magicu_valid(struct magicu d) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_MAGICU_H_ */ diff --git a/libc/tinymath/pow_data.internal.h b/libc/tinymath/pow_data.internal.h index 9f0df8012..ac394a416 100644 --- a/libc/tinymath/pow_data.internal.h +++ b/libc/tinymath/pow_data.internal.h @@ -4,7 +4,6 @@ #define POW_LOG_TABLE_BITS 7 #define POW_LOG_POLY_ORDER 8 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct pow_log_data { @@ -18,5 +17,4 @@ extern const struct pow_log_data { } __pow_log_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_POW_DATA_INTERNAL_H_ */ diff --git a/libc/tinymath/powf_data.internal.h b/libc/tinymath/powf_data.internal.h index 6f072505e..498abf299 100644 --- a/libc/tinymath/powf_data.internal.h +++ b/libc/tinymath/powf_data.internal.h @@ -10,7 +10,6 @@ #endif #define POWF_SCALE ((double)(1 << POWF_SCALE_BITS)) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct powf_log2_data { @@ -21,5 +20,4 @@ extern const struct powf_log2_data { } __powf_log2_data; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_POWF_DATA_INTERNAL_H_ */ diff --git a/libc/tinymath/sincosf.internal.h b/libc/tinymath/sincosf.internal.h index 49140d98d..e07239828 100644 --- a/libc/tinymath/sincosf.internal.h +++ b/libc/tinymath/sincosf.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_TINYMATH_SINCOSF_INTERNAL_H_ #define COSMOPOLITAN_LIBC_TINYMATH_SINCOSF_INTERNAL_H_ #include "libc/tinymath/internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ // clang-format off @@ -156,5 +155,4 @@ reduce_large (uint32_t xi, int *np) } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_TINYMATH_SINCOSF_INTERNAL_H_ */ diff --git a/libc/vga/tty.greg.c b/libc/vga/tty.greg.c index 4f411872a..2226af3f1 100644 --- a/libc/vga/tty.greg.c +++ b/libc/vga/tty.greg.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/bing.internal.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" #include "libc/intrin/directmap.internal.h" #include "libc/intrin/safemacros.internal.h" #include "libc/runtime/pc.internal.h" diff --git a/libc/vga/vga-init.greg.c b/libc/vga/vga-init.greg.c index 2560780f4..2e0ea4310 100644 --- a/libc/vga/vga-init.greg.c +++ b/libc/vga/vga-init.greg.c @@ -26,6 +26,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/intrin/kprintf.h" +#include "libc/mem/alloca.h" #include "libc/runtime/pc.internal.h" #include "libc/runtime/runtime.h" #include "libc/runtime/stack.h" diff --git a/libc/vga/vga.internal.h b/libc/vga/vga.internal.h index f08a5ce66..1ae2582cb 100644 --- a/libc/vga/vga.internal.h +++ b/libc/vga/vga.internal.h @@ -1,5 +1,5 @@ -#ifndef COSMOPOLITAN_LIBC_VGA_VGA_INTERNAL_H_ -#define COSMOPOLITAN_LIBC_VGA_VGA_INTERNAL_H_ +#ifndef COSMOPOLITAN_LIBC_VGA_VGA_H_ +#define COSMOPOLITAN_LIBC_VGA_VGA_H_ #include "libc/runtime/mman.internal.h" /** @@ -135,10 +135,6 @@ #define kTtyLed4 0x400 #if !(__ASSEMBLER__ + __LINKER__ + 0) -#include "libc/calls/struct/fd.internal.h" -#include "libc/calls/struct/iovec.h" -#include "libc/calls/struct/iovec.internal.h" - COSMOPOLITAN_C_START_ struct VgaTextCharCell { @@ -310,9 +306,12 @@ extern struct Tty _vga_tty; void _vga_reinit(struct Tty *, unsigned short, unsigned short, unsigned); void _klog_vga(const char *, size_t); + +struct Fd; +struct iovec; ssize_t sys_readv_vga(struct Fd *, const struct iovec *, int); ssize_t sys_writev_vga(struct Fd *, const struct iovec *, int); COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_VGA_VGA_INTERNAL_H_ */ +#endif /* COSMOPOLITAN_LIBC_VGA_VGA_H_ */ diff --git a/libc/x/utf16to8.c b/libc/x/utf16to8.c index 7cfbc5834..76d2e4894 100644 --- a/libc/x/utf16to8.c +++ b/libc/x/utf16to8.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsr.h" #include "libc/intrin/packsswb.h" #include "libc/intrin/pandn.h" diff --git a/libc/x/x.h b/libc/x/x.h index 4442db86b..1be0a30bf 100644 --- a/libc/x/x.h +++ b/libc/x/x.h @@ -34,7 +34,6 @@ #define xbarf __xbarf #endif /* _COSMO_SOURCE */ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #ifdef _COSMO_SOURCE COSMOPOLITAN_C_START_ @@ -97,5 +96,4 @@ int xbarf(const char *, const void *, size_t); COSMOPOLITAN_C_END_ #endif /* _COSMO_SOURCE */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_X_H_ */ diff --git a/libc/x/xasprintf.h b/libc/x/xasprintf.h index 6a0b8ebf7..7e4049bae 100644 --- a/libc/x/xasprintf.h +++ b/libc/x/xasprintf.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_X_XASPRINTF_H_ #define COSMOPOLITAN_LIBC_X_XASPRINTF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *xasprintf(const char *, ...) paramsnonnull((1)) @@ -9,5 +8,4 @@ char *xvasprintf(const char *, va_list) paramsnonnull() returnspointerwithnoaliases dontthrow nocallback __wur returnsnonnull; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_X_XASPRINTF_H_ */ diff --git a/libc/x/xgetline.h b/libc/x/xgetline.h index b92d6c486..1194327b8 100644 --- a/libc/x/xgetline.h +++ b/libc/x/xgetline.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_X_XGETLINE_H_ #define COSMOPOLITAN_LIBC_X_XGETLINE_H_ #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *xgetline(struct FILE *) paramsnonnull() mallocesque; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_X_XGETLINE_H_ */ diff --git a/libc/x/xiso8601.h b/libc/x/xiso8601.h index 5df767c7d..b8bfe7b9b 100644 --- a/libc/x/xiso8601.h +++ b/libc/x/xiso8601.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_X_XISO8601_H_ #include "libc/calls/struct/timespec.h" #include "libc/calls/struct/timeval.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *xiso8601i(int) mallocesque; @@ -15,5 +14,4 @@ char *xiso8601ts(struct timespec *) mallocesque; #endif /* C11 */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_X_XISO8601_H_ */ diff --git a/libc/x/xsigaction.h b/libc/x/xsigaction.h index 9b428bd38..15a9ad11a 100644 --- a/libc/x/xsigaction.h +++ b/libc/x/xsigaction.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_LIBC_X_XSIGACTION_H_ #define COSMOPOLITAN_LIBC_X_XSIGACTION_H_ #include "libc/calls/struct/sigaction.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int xsigaction(int, void *, uint64_t, uint64_t, struct sigaction *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_X_XSIGACTION_H_ */ diff --git a/libc/x/xspawn.h b/libc/x/xspawn.h index e2ad9f6e8..4050797b2 100644 --- a/libc/x/xspawn.h +++ b/libc/x/xspawn.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_LIBC_X_XSPAWN_H_ #define COSMOPOLITAN_LIBC_X_XSPAWN_H_ #include "libc/calls/struct/rusage.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int xspawn(struct rusage *); int xvspawn(void (*)(void *), void *, struct rusage *) returnstwice; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_X_XSPAWN_H_ */ diff --git a/libc/zip.internal.h b/libc/zip.internal.h index 58b49098b..58ac2f6ae 100644 --- a/libc/zip.internal.h +++ b/libc/zip.internal.h @@ -1,9 +1,5 @@ -#ifndef COSMOPOLITAN_LIBC_ZIP_H_ -#define COSMOPOLITAN_LIBC_ZIP_H_ -#include "libc/calls/struct/timespec.h" -#include "libc/intrin/bits.h" -#include "libc/macros.internal.h" -#include "libc/str/str.h" +#ifndef COSMOPOLITAN_ZIP_H_ +#define COSMOPOLITAN_ZIP_H_ /** * @fileoverview PKZIP Data Structures. @@ -127,62 +123,114 @@ #if !(__ASSEMBLER__ + __LINKER__ + 0) +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#define ZIP_SWAP16_(x) __builtin_bswap16(x) +#define ZIP_SWAP32_(x) __builtin_bswap32(x) +#define ZIP_SWAP64_(x) __builtin_bswap64(x) +#else +#define ZIP_SWAP16_(x) (x) +#define ZIP_SWAP32_(x) (x) +#define ZIP_SWAP64_(x) (x) +#endif + +#define ZIP_READ16(P) \ + (__extension__({ \ + uint16_t __x; \ + __builtin_memcpy(&__x, P, 16 / 8); \ + ZIP_SWAP16_(__x); \ + })) +#define ZIP_READ32(P) \ + (__extension__({ \ + uint32_t __x; \ + __builtin_memcpy(&__x, P, 32 / 8); \ + ZIP_SWAP32_(__x); \ + })) +#define ZIP_READ64(P) \ + (__extension__({ \ + uint64_t __x; \ + __builtin_memcpy(&__x, P, 64 / 8); \ + ZIP_SWAP64_(__x); \ + })) + +#define ZIP_WRITE16(P, X) \ + (__extension__({ \ + __typeof__(&(P)[0]) __p = (P); \ + uint16_t __x = ZIP_SWAP16_(X); \ + __builtin_memcpy(__p, &__x, 16 / 8); \ + __p + 16 / 8; \ + })) +#define ZIP_WRITE32(P, X) \ + (__extension__({ \ + __typeof__(&(P)[0]) __p = (P); \ + uint32_t __x = ZIP_SWAP32_(X); \ + __builtin_memcpy(__p, &__x, 32 / 8); \ + __p + 32 / 8; \ + })) +#define ZIP_WRITE64(P, X) \ + (__extension__({ \ + __typeof__(&(P)[0]) __p = (P); \ + uint64_t __x = ZIP_SWAP64_(X); \ + __builtin_memcpy(__p, &__x, 64 / 8); \ + __p + 64 / 8; \ + })) + /* end of central directory record */ -#define ZIP_CDIR_MAGIC(P) READ32LE(P) -#define ZIP_CDIR_DISK(P) READ16LE((P) + kZipCdirDiskOffset) -#define ZIP_CDIR_STARTINGDISK(P) READ16LE((P) + kZipCdirStartingDiskOffset) -#define ZIP_CDIR_RECORDSONDISK(P) READ16LE((P) + kZipCdirRecordsOnDiskOffset) -#define ZIP_CDIR_RECORDS(P) READ16LE((P) + kZipCdirRecordsOffset) -#define ZIP_CDIR_SIZE(P) READ32LE((P) + kZipCdirSizeOffset) -#define ZIP_CDIR_OFFSET(P) READ32LE((P) + kZipCdirOffsetOffset) -#define ZIP_CDIR_COMMENTSIZE(P) READ16LE((P) + kZipCdirCommentSizeOffset) +#define ZIP_CDIR_MAGIC(P) ZIP_READ32(P) +#define ZIP_CDIR_DISK(P) ZIP_READ16((P) + kZipCdirDiskOffset) +#define ZIP_CDIR_STARTINGDISK(P) ZIP_READ16((P) + kZipCdirStartingDiskOffset) +#define ZIP_CDIR_RECORDSONDISK(P) ZIP_READ16((P) + kZipCdirRecordsOnDiskOffset) +#define ZIP_CDIR_RECORDS(P) ZIP_READ16((P) + kZipCdirRecordsOffset) +#define ZIP_CDIR_SIZE(P) ZIP_READ32((P) + kZipCdirSizeOffset) +#define ZIP_CDIR_OFFSET(P) ZIP_READ32((P) + kZipCdirOffsetOffset) +#define ZIP_CDIR_COMMENTSIZE(P) ZIP_READ16((P) + kZipCdirCommentSizeOffset) #define ZIP_CDIR_COMMENT(P) ((P) + 22) /* recommend stopping at nul */ #define ZIP_CDIR_HDRSIZE(P) (ZIP_CDIR_COMMENTSIZE(P) + kZipCdirHdrMinSize) /* zip64 end of central directory record */ -#define ZIP_CDIR64_MAGIC(P) READ32LE(P) -#define ZIP_CDIR64_HDRSIZE(P) (READ64LE((P) + 4) + 12) -#define ZIP_CDIR64_VERSIONMADE(P) READ16LE((P) + 12) -#define ZIP_CDIR64_VERSIONNEED(P) READ16LE((P) + 14) -#define ZIP_CDIR64_DISK(P) READ32LE((P) + 16) -#define ZIP_CDIR64_STARTINGDISK(P) READ32LE((P) + 20) -#define ZIP_CDIR64_RECORDSONDISK(P) READ64LE((P) + 24) -#define ZIP_CDIR64_RECORDS(P) READ64LE((P) + 32) -#define ZIP_CDIR64_SIZE(P) READ64LE((P) + 40) -#define ZIP_CDIR64_OFFSET(P) READ64LE((P) + 48) +#define ZIP_CDIR64_MAGIC(P) ZIP_READ32(P) +#define ZIP_CDIR64_HDRSIZE(P) (ZIP_READ64((P) + 4) + 12) +#define ZIP_CDIR64_VERSIONMADE(P) ZIP_READ16((P) + 12) +#define ZIP_CDIR64_VERSIONNEED(P) ZIP_READ16((P) + 14) +#define ZIP_CDIR64_DISK(P) ZIP_READ32((P) + 16) +#define ZIP_CDIR64_STARTINGDISK(P) ZIP_READ32((P) + 20) +#define ZIP_CDIR64_RECORDSONDISK(P) ZIP_READ64((P) + 24) +#define ZIP_CDIR64_RECORDS(P) ZIP_READ64((P) + 32) +#define ZIP_CDIR64_SIZE(P) ZIP_READ64((P) + 40) +#define ZIP_CDIR64_OFFSET(P) ZIP_READ64((P) + 48) #define ZIP_CDIR64_COMMENTSIZE(P) \ (ZIP_CDIR64_HDRSIZE(P) >= 56 ? ZIP_CDIR64_HDRSIZE(P) - 56 : 0) #define ZIP_CDIR64_COMMENT(P) ((P) + 56) /* recommend stopping at nul */ -#define ZIP_LOCATE64_MAGIC(P) READ32LE(P) -#define ZIP_LOCATE64_STARTINGDISK(P) READ32LE((P) + 4) -#define ZIP_LOCATE64_OFFSET(P) READ64LE((P) + 8) -#define ZIP_LOCATE64_TOTALDISKS(P) READ32LE((P) + 12) +#define ZIP_LOCATE64_MAGIC(P) ZIP_READ32(P) +#define ZIP_LOCATE64_STARTINGDISK(P) ZIP_READ32((P) + 4) +#define ZIP_LOCATE64_OFFSET(P) ZIP_READ64((P) + 8) +#define ZIP_LOCATE64_TOTALDISKS(P) ZIP_READ32((P) + 12) /* central directory file header */ -#define ZIP_CFILE_MAGIC(P) READ32LE(P) +#define ZIP_CFILE_MAGIC(P) ZIP_READ32(P) #define ZIP_CFILE_VERSIONMADE(P) (255 & (P)[4]) #define ZIP_CFILE_FILEATTRCOMPAT(P) (255 & (P)[5]) #define ZIP_CFILE_VERSIONNEED(P) (255 & (P)[6]) #define ZIP_CFILE_OSNEED(P) (255 & (P)[7]) -#define ZIP_CFILE_GENERALFLAG(P) READ16LE((P) + kZipCfileOffsetGeneralflag) +#define ZIP_CFILE_GENERALFLAG(P) ZIP_READ16((P) + kZipCfileOffsetGeneralflag) #define ZIP_CFILE_COMPRESSIONMETHOD(P) \ - READ16LE((P) + kZipCfileOffsetCompressionmethod) + ZIP_READ16((P) + kZipCfileOffsetCompressionmethod) #define ZIP_CFILE_LASTMODIFIEDTIME(P) \ - READ16LE((P) + kZipCfileOffsetLastmodifiedtime) /* @see DOS_TIME() */ + ZIP_READ16((P) + kZipCfileOffsetLastmodifiedtime) /* @see DOS_TIME() */ #define ZIP_CFILE_LASTMODIFIEDDATE(P) \ - READ16LE((P) + kZipCfileOffsetLastmodifieddate) /* @see DOS_DATE() */ -#define ZIP_CFILE_CRC32(P) READ32LE((P) + kZipCfileOffsetCrc32) -#define ZIP_CFILE_COMPRESSEDSIZE(P) READ32LE(P + kZipCfileOffsetCompressedsize) + ZIP_READ16((P) + kZipCfileOffsetLastmodifieddate) /* @see DOS_DATE() */ +#define ZIP_CFILE_CRC32(P) ZIP_READ32((P) + kZipCfileOffsetCrc32) +#define ZIP_CFILE_COMPRESSEDSIZE(P) \ + ZIP_READ32(P + kZipCfileOffsetCompressedsize) #define ZIP_CFILE_UNCOMPRESSEDSIZE(P) \ - READ32LE((P) + kZipCfileOffsetUncompressedsize) -#define ZIP_CFILE_NAMESIZE(P) READ16LE((P) + kZipCfileOffsetNamesize) -#define ZIP_CFILE_EXTRASIZE(P) READ16LE((P) + 30) -#define ZIP_CFILE_COMMENTSIZE(P) READ16LE((P) + 32) -#define ZIP_CFILE_DISK(P) READ16LE((P) + 34) -#define ZIP_CFILE_INTERNALATTRIBUTES(P) READ16LE((P) + 36) + ZIP_READ32((P) + kZipCfileOffsetUncompressedsize) +#define ZIP_CFILE_NAMESIZE(P) ZIP_READ16((P) + kZipCfileOffsetNamesize) +#define ZIP_CFILE_EXTRASIZE(P) ZIP_READ16((P) + 30) +#define ZIP_CFILE_COMMENTSIZE(P) ZIP_READ16((P) + 32) +#define ZIP_CFILE_DISK(P) ZIP_READ16((P) + 34) +#define ZIP_CFILE_INTERNALATTRIBUTES(P) ZIP_READ16((P) + 36) #define ZIP_CFILE_EXTERNALATTRIBUTES(P) \ - READ32LE((P) + kZipCfileOffsetExternalattributes) -#define ZIP_CFILE_OFFSET(P) READ32LE((P) + kZipCfileOffsetOffset) + ZIP_READ32((P) + kZipCfileOffsetExternalattributes) +#define ZIP_CFILE_OFFSET(P) ZIP_READ32((P) + kZipCfileOffsetOffset) #define ZIP_CFILE_NAME(P) ((const char *)((P) + 46)) /* not nul-terminated */ #define ZIP_CFILE_EXTRA(P) ((P) + 46 + ZIP_CFILE_NAMESIZE(P)) #define ZIP_CFILE_COMMENT(P) \ @@ -193,23 +241,23 @@ kZipCfileHdrMinSize) /* local file header */ -#define ZIP_LFILE_MAGIC(P) READ32LE(P) +#define ZIP_LFILE_MAGIC(P) ZIP_READ32(P) #define ZIP_LFILE_VERSIONNEED(P) (255 & (P)[4]) #define ZIP_LFILE_OSNEED(P) (255 & (P)[5]) -#define ZIP_LFILE_GENERALFLAG(P) READ16LE((P) + kZipLfileOffsetGeneralflag) +#define ZIP_LFILE_GENERALFLAG(P) ZIP_READ16((P) + kZipLfileOffsetGeneralflag) #define ZIP_LFILE_COMPRESSIONMETHOD(P) \ - READ16LE((P) + kZipLfileOffsetCompressionmethod) + ZIP_READ16((P) + kZipLfileOffsetCompressionmethod) #define ZIP_LFILE_LASTMODIFIEDTIME(P) \ - READ16LE((P) + kZipLfileOffsetLastmodifiedtime) /* @see DOS_TIME() */ + ZIP_READ16((P) + kZipLfileOffsetLastmodifiedtime) /* @see DOS_TIME() */ #define ZIP_LFILE_LASTMODIFIEDDATE(P) \ - READ16LE((P) + kZipLfileOffsetLastmodifieddate) /* @see DOS_DATE() */ -#define ZIP_LFILE_CRC32(P) READ32LE((P) + kZipLfileOffsetCrc32) + ZIP_READ16((P) + kZipLfileOffsetLastmodifieddate) /* @see DOS_DATE() */ +#define ZIP_LFILE_CRC32(P) ZIP_READ32((P) + kZipLfileOffsetCrc32) #define ZIP_LFILE_COMPRESSEDSIZE(P) \ - READ32LE((P) + kZipLfileOffsetCompressedsize) + ZIP_READ32((P) + kZipLfileOffsetCompressedsize) #define ZIP_LFILE_UNCOMPRESSEDSIZE(P) \ - READ32LE((P) + kZipLfileOffsetUncompressedsize) -#define ZIP_LFILE_NAMESIZE(P) READ16LE((P) + kZipLfileOffsetNamesize) -#define ZIP_LFILE_EXTRASIZE(P) READ16LE((P) + 28) + ZIP_READ32((P) + kZipLfileOffsetUncompressedsize) +#define ZIP_LFILE_NAMESIZE(P) ZIP_READ16((P) + kZipLfileOffsetNamesize) +#define ZIP_LFILE_EXTRASIZE(P) ZIP_READ16((P) + 28) #define ZIP_LFILE_NAME(P) ((const char *)((P) + 30)) #define ZIP_LFILE_EXTRA(P) ((P) + 30 + ZIP_LFILE_NAMESIZE(P)) #define ZIP_LFILE_HDRSIZE(P) \ @@ -217,8 +265,8 @@ #define ZIP_LFILE_CONTENT(P) ((P) + ZIP_LFILE_HDRSIZE(P)) #define ZIP_LFILE_SIZE(P) (ZIP_LFILE_HDRSIZE(P) + ZIP_LFILE_COMPRESSEDSIZE(P)) -#define ZIP_EXTRA_HEADERID(P) READ16LE(P) -#define ZIP_EXTRA_CONTENTSIZE(P) READ16LE((P) + 2) +#define ZIP_EXTRA_HEADERID(P) ZIP_READ16(P) +#define ZIP_EXTRA_CONTENTSIZE(P) ZIP_READ16((P) + 2) #define ZIP_EXTRA_CONTENT(P) ((P) + 4) #define ZIP_EXTRA_SIZE(P) (ZIP_EXTRA_CONTENTSIZE(P) + kZipExtraHdrSize) @@ -236,8 +284,10 @@ int64_t GetZipCfileUncompressedSize(const uint8_t *); int64_t GetZipCfileOffset(const uint8_t *); int64_t GetZipLfileCompressedSize(const uint8_t *); int64_t GetZipLfileUncompressedSize(const uint8_t *); + +struct timespec; void GetZipCfileTimestamps(const uint8_t *, struct timespec *, struct timespec *, struct timespec *, int); #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_ZIP_H_ */ +#endif /* COSMOPOLITAN_ZIP_H_ */ diff --git a/net/finger/describesyn.c b/net/finger/describesyn.c index 2d8d5c745..f84c6380f 100644 --- a/net/finger/describesyn.c +++ b/net/finger/describesyn.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "net/finger/finger.h" /** diff --git a/net/finger/finger.h b/net/finger/finger.h index 1cfbd56ee..6abbf4457 100644 --- a/net/finger/finger.h +++ b/net/finger/finger.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_NET_FINGER_FINGER_H_ #define COSMOPOLITAN_NET_FINGER_FINGER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *DescribeSyn(char *, size_t, const char *, size_t); @@ -9,5 +8,4 @@ int GetSynFingerOs(uint32_t); uint32_t FingerSyn(const char *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_NET_FINGER_FINGER_H_ */ diff --git a/net/http/escape.h b/net/http/escape.h index cd2b19b71..653121093 100644 --- a/net/http/escape.h +++ b/net/http/escape.h @@ -5,7 +5,6 @@ #define kControlC0 2 #define kControlC1 4 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const char kEscapeAuthority[256]; @@ -40,5 +39,4 @@ char *EncodeBase64(const char *, size_t, size_t *); char *DecodeBase64(const char *, size_t, size_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_NET_HTTP_ESCAPE_H_ */ diff --git a/net/http/findcontenttype.c b/net/http/findcontenttype.c index dc9462582..b9d0519dd 100644 --- a/net/http/findcontenttype.c +++ b/net/http/findcontenttype.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bswap.h" #include "libc/macros.internal.h" #include "libc/str/str.h" diff --git a/net/http/http.h b/net/http/http.h index 5e70c0370..0e09b4a15 100644 --- a/net/http/http.h +++ b/net/http/http.h @@ -148,7 +148,6 @@ #define kHttpCdnLoop 92 #define kHttpHeadersMax 93 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct HttpSlice { @@ -217,5 +216,4 @@ bool IsNoCompressExt(const char *, size_t); char *FoldHeader(struct HttpMessage *, const char *, int, size_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_HTTP_HTTP_H_ */ diff --git a/net/http/ip.h b/net/http/ip.h index ade85f37e..89b665aca 100644 --- a/net/http/ip.h +++ b/net/http/ip.h @@ -22,7 +22,6 @@ #define kIpFuture 18 #define kIpAnonymous 19 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Cidr { @@ -49,5 +48,4 @@ const char *GetIpCategoryName(int); bool IsCloudflareIp(uint32_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_NET_HTTP_IP_H_ */ diff --git a/net/http/isnocompressext.c b/net/http/isnocompressext.c index 4ece9f373..f714db539 100644 --- a/net/http/isnocompressext.c +++ b/net/http/isnocompressext.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bswap.h" #include "libc/macros.internal.h" #include "libc/str/str.h" diff --git a/net/http/parsehttpdatetime.c b/net/http/parsehttpdatetime.c index 41db6c052..013b195b1 100644 --- a/net/http/parsehttpdatetime.c +++ b/net/http/parsehttpdatetime.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/str/str.h" #include "libc/time/time.h" #include "net/http/http.h" diff --git a/net/http/parsehttpmessage.c b/net/http/parsehttpmessage.c index aae0fe810..8ddccfd50 100644 --- a/net/http/parsehttpmessage.c +++ b/net/http/parsehttpmessage.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/macros.internal.h" #include "libc/mem/alg.h" diff --git a/net/http/tokenbucket.h b/net/http/tokenbucket.h index 90f734356..a9e74a321 100644 --- a/net/http/tokenbucket.h +++ b/net/http/tokenbucket.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_NET_HTTP_TOKENBUCKET_H_ #define COSMOPOLITAN_NET_HTTP_TOKENBUCKET_H_ #include "libc/atomic.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void ReplenishTokens(atomic_uint_fast64_t *, size_t); @@ -9,5 +8,4 @@ int AcquireToken(atomic_schar *, uint32_t, int); int CountTokens(atomic_schar *, uint32_t, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_NET_HTTP_TOKENBUCKET_H_ */ diff --git a/net/http/url.h b/net/http/url.h index 58b545a8f..7284daf36 100644 --- a/net/http/url.h +++ b/net/http/url.h @@ -5,7 +5,6 @@ #define kUrlLatin1 2 #define kUrlOpaque 4 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct UrlView { @@ -39,5 +38,4 @@ char *ParseHost(const char *, size_t, struct Url *); char *EscapeUrlView(char *, struct UrlView *, const char[256]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_NET_HTTP_URL_H_ */ diff --git a/net/https/certhasip.c b/net/https/certhasip.c index d27d7c55e..d2b89f6a6 100644 --- a/net/https/certhasip.c +++ b/net/https/certhasip.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "net/https/https.h" bool CertHasIp(const mbedtls_x509_crt *cert, uint32_t ip) { diff --git a/net/https/https.h b/net/https/https.h index d05be2dc4..e4aee4073 100644 --- a/net/https/https.h +++ b/net/https/https.h @@ -7,7 +7,6 @@ #include "third_party/mbedtls/pk.h" #include "third_party/mbedtls/ssl_ciphersuites.h" #include "third_party/mbedtls/x509_crt.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Cert { @@ -40,5 +39,4 @@ struct Cert FinishCertificate(struct Cert *, mbedtls_x509write_cert *, mbedtls_pk_context *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_NET_HTTPS_HTTPS_H_ */ diff --git a/net/turfwar/blackhole.c b/net/turfwar/blackhole.c index bc1c82b45..4ef6d3473 100644 --- a/net/turfwar/blackhole.c +++ b/net/turfwar/blackhole.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/kprintf.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" diff --git a/net/turfwar/blackholed.c b/net/turfwar/blackholed.c index 54f5332e9..53d3fb845 100644 --- a/net/turfwar/blackholed.c +++ b/net/turfwar/blackholed.c @@ -26,7 +26,7 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/safemacros.internal.h" #include "libc/mem/mem.h" diff --git a/net/turfwar/turfwar.c b/net/turfwar/turfwar.c index 65172f759..c73f2f963 100644 --- a/net/turfwar/turfwar.c +++ b/net/turfwar/turfwar.c @@ -32,7 +32,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsr.h" #include "libc/intrin/hilbert.h" #include "libc/intrin/kprintf.h" @@ -311,7 +311,7 @@ struct Worker { atomic_int shutdown; atomic_int connected; struct timespec startread; -} * g_worker; +} *g_worker; // recentworker wakeup struct Recent { diff --git a/test/dsp/tty/ttymove_test.c b/test/dsp/tty/ttymove_test.c index 47369a746..a838aa20e 100644 --- a/test/dsp/tty/ttymove_test.c +++ b/test/dsp/tty/ttymove_test.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "dsp/tty/tty.h" -#include "libc/intrin/bits.h" #include "libc/stdio/rand.h" #include "libc/str/str.h" #include "libc/testlib/ezbench.h" diff --git a/test/libc/calls/getcwd_test.c b/test/libc/calls/getcwd_test.c index f787a6f71..5d4f7a46a 100644 --- a/test/libc/calls/getcwd_test.c +++ b/test/libc/calls/getcwd_test.c @@ -20,7 +20,7 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/libgen.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/macros.internal.h" #include "libc/mem/gc.internal.h" diff --git a/test/libc/calls/getrandom_test.c b/test/libc/calls/getrandom_test.c index d6716f650..ee2dfd994 100644 --- a/test/libc/calls/getrandom_test.c +++ b/test/libc/calls/getrandom_test.c @@ -22,7 +22,7 @@ #include "libc/calls/struct/sigaction.h" #include "libc/calls/struct/sigset.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/log/check.h" #include "libc/macros.internal.h" #include "libc/math.h" diff --git a/test/libc/calls/ioctl_test.c b/test/libc/calls/ioctl_test.c index a5912bf61..9285101e8 100644 --- a/test/libc/calls/ioctl_test.c +++ b/test/libc/calls/ioctl_test.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" -#include "libc/intrin/bits.h" #include "libc/log/check.h" #include "libc/log/log.h" #include "libc/mem/gc.internal.h" diff --git a/test/libc/fmt/strerror_r_test.c b/test/libc/fmt/strerror_r_test.c index 6dcba8de2..964c98dd0 100644 --- a/test/libc/fmt/strerror_r_test.c +++ b/test/libc/fmt/strerror_r_test.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/str/str.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/intrin/bitreverse_test.c b/test/libc/intrin/bitreverse_test.c deleted file mode 100644 index bee323e7e..000000000 --- a/test/libc/intrin/bitreverse_test.c +++ /dev/null @@ -1,43 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/calls.h" -#include "libc/intrin/bits.h" -#include "libc/testlib/ezbench.h" -#include "libc/testlib/testlib.h" - -void SetUpOnce(void) { - ASSERT_SYS(0, 0, pledge("stdio rpath", 0)); -} - -TEST(_bitreverse, test) { - EXPECT_EQ(0xde, _bitreverse8(123)); - EXPECT_EQ(0xde00, _bitreverse16(123)); - EXPECT_EQ(0xde000000u, _bitreverse32(123)); - EXPECT_EQ(0xde00000000000000ul, _bitreverse64(123)); - EXPECT_EQ(0x482d96c305f7c697ul, _bitreverse64(0xe963efa0c369b412)); -} - -BENCH(_bitreverse, bench) { - EZBENCH2("_bitreverse8", donothing, - __expropriate(_bitreverse8(__conceal("r", 123)))); - EZBENCH2("_bitreverse32", donothing, - __expropriate(_bitreverse32(__conceal("r", 123)))); - EZBENCH2("_bitreverse64", donothing, - __expropriate(_bitreverse64(__conceal("r", 123)))); -} diff --git a/test/libc/intrin/countbits_test.c b/test/libc/intrin/countbits_test.c index 46ed1d1a9..edb83c54b 100644 --- a/test/libc/intrin/countbits_test.c +++ b/test/libc/intrin/countbits_test.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/intrin/bits.h" #include "libc/intrin/popcnt.h" #include "libc/limits.h" #include "libc/mem/gc.internal.h" diff --git a/test/libc/intrin/kprintf_test.c b/test/libc/intrin/kprintf_test.c index 7dbb86daf..bd591742d 100644 --- a/test/libc/intrin/kprintf_test.c +++ b/test/libc/intrin/kprintf_test.c @@ -20,7 +20,7 @@ #include "libc/calls/calls.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/log/libfatal.internal.h" #include "libc/macros.internal.h" diff --git a/test/libc/intrin/lockipc_test.c b/test/libc/intrin/lockipc_test.c index ac2288c87..91ceef172 100644 --- a/test/libc/intrin/lockipc_test.c +++ b/test/libc/intrin/lockipc_test.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/intrin/kprintf.h" #include "libc/macros.internal.h" #include "libc/runtime/runtime.h" diff --git a/test/libc/intrin/strchr_test.c b/test/libc/intrin/strchr_test.c index fb0bb3e02..033d2c2d8 100644 --- a/test/libc/intrin/strchr_test.c +++ b/test/libc/intrin/strchr_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/mem/mem.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 037d4d36a..c51f0d21e 100644 --- a/test/libc/intrin/strcmp_test.c +++ b/test/libc/intrin/strcmp_test.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/dce.h" -#include "libc/intrin/bits.h" #include "libc/macros.internal.h" #include "libc/mem/gc.internal.h" #include "libc/mem/mem.h" diff --git a/test/libc/intrin/strlen_test.c b/test/libc/intrin/strlen_test.c index 60f343399..f79e15d2f 100644 --- a/test/libc/intrin/strlen_test.c +++ b/test/libc/intrin/strlen_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/stdio/rand.h" diff --git a/test/libc/mem/critbit0_test.c b/test/libc/mem/critbit0_test.c index 37ac27332..770eafa8f 100644 --- a/test/libc/mem/critbit0_test.c +++ b/test/libc/mem/critbit0_test.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/mem/critbit0.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" #include "libc/mem/critbit0.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" diff --git a/test/libc/mem/malloc_test.c b/test/libc/mem/malloc_test.c index 4d5aa5fdd..e548c3020 100644 --- a/test/libc/mem/malloc_test.c +++ b/test/libc/mem/malloc_test.c @@ -22,7 +22,6 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" -#include "libc/intrin/bits.h" #include "libc/intrin/cxaatexit.internal.h" #include "libc/intrin/safemacros.internal.h" #include "libc/macros.internal.h" diff --git a/test/libc/mem/qsort_test.c b/test/libc/mem/qsort_test.c index 24fc96e06..12bebf653 100644 --- a/test/libc/mem/qsort_test.c +++ b/test/libc/mem/qsort_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/macros.internal.h" #include "libc/mem/alg.h" #include "libc/mem/gc.h" diff --git a/test/libc/mem/strdup_test.c b/test/libc/mem/strdup_test.c index c6285d056..298c06cc7 100644 --- a/test/libc/mem/strdup_test.c +++ b/test/libc/mem/strdup_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/mem/mem.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/nexgen32e/memmove_test.c b/test/libc/nexgen32e/memmove_test.c index b348e0f9a..de33bb61d 100644 --- a/test/libc/nexgen32e/memmove_test.c +++ b/test/libc/nexgen32e/memmove_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/stdio/rand.h" diff --git a/test/libc/runtime/mmap_test.c b/test/libc/runtime/mmap_test.c index 23fbb675a..ce66dfd20 100644 --- a/test/libc/runtime/mmap_test.c +++ b/test/libc/runtime/mmap_test.c @@ -23,7 +23,6 @@ #include "libc/errno.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" #include "libc/intrin/safemacros.internal.h" #include "libc/intrin/xchg.internal.h" #include "libc/limits.h" diff --git a/test/libc/stdio/fgetwc_test.c b/test/libc/stdio/fgetwc_test.c index 2f69f6138..bfb5a83d6 100644 --- a/test/libc/stdio/fgetwc_test.c +++ b/test/libc/stdio/fgetwc_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/stdio/stdio.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/stdio/getdelim_test.c b/test/libc/stdio/getdelim_test.c index 4a6df24b5..a86ae71c3 100644 --- a/test/libc/stdio/getdelim_test.c +++ b/test/libc/stdio/getdelim_test.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/intrin/bits.h" #include "libc/log/libfatal.internal.h" #include "libc/mem/mem.h" #include "libc/runtime/symbols.internal.h" diff --git a/test/libc/stdio/joinstrlist_test.c b/test/libc/stdio/joinstrlist_test.c index 011189928..9679616c8 100644 --- a/test/libc/stdio/joinstrlist_test.c +++ b/test/libc/stdio/joinstrlist_test.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/mem/mem.h" #include "libc/stdio/append.h" #include "libc/stdio/strlist.internal.h" diff --git a/test/libc/stdio/mt19937_test.c b/test/libc/stdio/mt19937_test.c index 6b5687ab4..b6209dbab 100644 --- a/test/libc/stdio/mt19937_test.c +++ b/test/libc/stdio/mt19937_test.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/log/check.h" #include "libc/macros.internal.h" #include "libc/mem/gc.internal.h" diff --git a/test/libc/stdio/rand_test.c b/test/libc/stdio/rand_test.c index e8188a5c0..eb1e6e58f 100644 --- a/test/libc/stdio/rand_test.c +++ b/test/libc/stdio/rand_test.c @@ -16,9 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" -#include "libc/mem/mem.h" #include "libc/stdio/rand.h" +#include "libc/serialize.h" +#include "libc/mem/mem.h" #include "libc/str/str.h" #include "libc/testlib/hyperion.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/stdio/rngset_test.c b/test/libc/stdio/rngset_test.c index 7f9f80cc6..d54794960 100644 --- a/test/libc/stdio/rngset_test.c +++ b/test/libc/stdio/rngset_test.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/stdio/rand.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/stdio/sprintf_s_test.c b/test/libc/stdio/sprintf_s_test.c index 6e6ee611c..9d88810da 100644 --- a/test/libc/stdio/sprintf_s_test.c +++ b/test/libc/stdio/sprintf_s_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/intrin/safemacros.internal.h" #include "libc/mem/gc.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/stdio/sscanf_test.c b/test/libc/stdio/sscanf_test.c index 40ada00df..ce51ec31f 100644 --- a/test/libc/stdio/sscanf_test.c +++ b/test/libc/stdio/sscanf_test.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/inttypes.h" #include "libc/limits.h" #include "libc/math.h" diff --git a/test/libc/stdio/vappendf_test.c b/test/libc/stdio/vappendf_test.c index 4620b31b5..81b027d8e 100644 --- a/test/libc/stdio/vappendf_test.c +++ b/test/libc/stdio/vappendf_test.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/mem/mem.h" #include "libc/stdio/append.h" #include "libc/str/str.h" diff --git a/test/libc/str/crc32c_test.c b/test/libc/str/crc32c_test.c index e37fe9ff7..f296e2d22 100644 --- a/test/libc/str/crc32c_test.c +++ b/test/libc/str/crc32c_test.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" -#include "libc/intrin/bits.h" #include "libc/mem/gc.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" diff --git a/test/libc/str/crc32z_test.c b/test/libc/str/crc32z_test.c index 86306f017..4d40c5eae 100644 --- a/test/libc/str/crc32z_test.c +++ b/test/libc/str/crc32z_test.c @@ -19,7 +19,6 @@ #include "libc/assert.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" -#include "libc/intrin/bits.h" #include "libc/mem/gc.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" diff --git a/test/libc/str/memcpy_test.c b/test/libc/str/memcpy_test.c index 78cbcf7c6..bbc35a928 100644 --- a/test/libc/str/memcpy_test.c +++ b/test/libc/str/memcpy_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/nexgen32e.h" #include "libc/stdio/rand.h" diff --git a/test/libc/str/memfrob_test.c b/test/libc/str/memfrob_test.c index 71a87282f..6c9b9fb5a 100644 --- a/test/libc/str/memfrob_test.c +++ b/test/libc/str/memfrob_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/str/str.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/str/memmem_test.c b/test/libc/str/memmem_test.c index 6a6fd7816..5d991ff25 100644 --- a/test/libc/str/memmem_test.c +++ b/test/libc/str/memmem_test.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/mem/mem.h" -#include "libc/intrin/bits.h" #include "libc/intrin/likely.h" #include "libc/mem/alg.h" #include "libc/stdio/rand.h" diff --git a/test/libc/str/str_test.c b/test/libc/str/str_test.c index 6f491fcb0..240bc9f62 100644 --- a/test/libc/str/str_test.c +++ b/test/libc/str/str_test.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -#include "libc/intrin/bits.h" #include "libc/testlib/testlib.h" TEST(strlen16, testEmpty) { diff --git a/test/libc/str/strcasestr_test.c b/test/libc/str/strcasestr_test.c index a4325fc5a..989d196f2 100644 --- a/test/libc/str/strcasestr_test.c +++ b/test/libc/str/strcasestr_test.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" #include "libc/dce.h" -#include "libc/intrin/bits.h" #include "libc/mem/alg.h" #include "libc/mem/gc.internal.h" #include "libc/mem/mem.h" diff --git a/test/libc/str/strstr_test.c b/test/libc/str/strstr_test.c index 62ea8c500..a2ad4944f 100644 --- a/test/libc/str/strstr_test.c +++ b/test/libc/str/strstr_test.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" #include "libc/dce.h" -#include "libc/intrin/bits.h" #include "libc/mem/alg.h" #include "libc/mem/gc.internal.h" #include "libc/mem/mem.h" diff --git a/test/libc/str/tprecode8to16_test.c b/test/libc/str/tprecode8to16_test.c index bf1edcbda..057bf8418 100644 --- a/test/libc/str/tprecode8to16_test.c +++ b/test/libc/str/tprecode8to16_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/mem/mem.h" #include "libc/str/str.h" #include "libc/testlib/ezbench.h" diff --git a/test/libc/str/wcwidth_test.c b/test/libc/str/wcwidth_test.c index 5199804e5..641d00e89 100644 --- a/test/libc/str/wcwidth_test.c +++ b/test/libc/str/wcwidth_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/str/str.h" #include "libc/str/strwidth.h" #include "libc/str/unicode.h" diff --git a/test/libc/xed/lib.h b/test/libc/xed/lib.h index 82e571b82..a380b2a24 100644 --- a/test/libc/xed/lib.h +++ b/test/libc/xed/lib.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TEST_LIBC_XED_LIB_H_ #define COSMOPOLITAN_TEST_LIBC_XED_LIB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int ild(const char16_t *codez); @@ -9,5 +8,4 @@ int ildlegacy(const char16_t *codez); uint8_t *unbingx86op(const char16_t *codez) __wur; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TEST_LIBC_XED_LIB_H_ */ diff --git a/test/net/http/parsehttpmessage_test.c b/test/net/http/parsehttpmessage_test.c index f0ba3cf15..4fa7f9c1b 100644 --- a/test/net/http/parsehttpmessage_test.c +++ b/test/net/http/parsehttpmessage_test.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/log/check.h" #include "libc/mem/gc.internal.h" #include "libc/mem/mem.h" diff --git a/test/net/https/mbedtls_test.c b/test/net/https/mbedtls_test.c index 5c00c54af..efff08c3d 100644 --- a/test/net/https/mbedtls_test.c +++ b/test/net/https/mbedtls_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/intrin/bswap.h" #include "libc/macros.internal.h" #include "libc/mem/gc.h" diff --git a/test/tool/build/lib/interner_test.c b/test/tool/build/lib/interner_test.c index c2f3d7ac7..27fab682d 100644 --- a/test/tool/build/lib/interner_test.c +++ b/test/tool/build/lib/interner_test.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/mem/mem.h" #include "libc/mem/gc.internal.h" #include "libc/stdio/stdio.h" diff --git a/third_party/sqlite3/.clang-format b/third_party/.clang-format similarity index 100% rename from third_party/sqlite3/.clang-format rename to third_party/.clang-format diff --git a/third_party/aarch64/acc_prof.internal.h b/third_party/aarch64/acc_prof.internal.h index 18b482c46..fbe73440a 100644 --- a/third_party/aarch64/acc_prof.internal.h +++ b/third_party/aarch64/acc_prof.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__aarch64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _ACC_PROF_H #define _ACC_PROF_H 1 diff --git a/third_party/aarch64/arm_acle.internal.h b/third_party/aarch64/arm_acle.internal.h index 9402c809b..9c0bd0be6 100644 --- a/third_party/aarch64/arm_acle.internal.h +++ b/third_party/aarch64/arm_acle.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__aarch64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _GCC_ARM_ACLE_H #define _GCC_ARM_ACLE_H diff --git a/third_party/aarch64/arm_bf16.internal.h b/third_party/aarch64/arm_bf16.internal.h index c9ae6b6f1..0f8a271ae 100644 --- a/third_party/aarch64/arm_bf16.internal.h +++ b/third_party/aarch64/arm_bf16.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__aarch64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _AARCH64_BF16_H_ #define _AARCH64_BF16_H_ diff --git a/third_party/aarch64/arm_fp16.internal.h b/third_party/aarch64/arm_fp16.internal.h index 76e851ad3..ddc72f764 100644 --- a/third_party/aarch64/arm_fp16.internal.h +++ b/third_party/aarch64/arm_fp16.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__aarch64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _AARCH64_FP16_H_ #define _AARCH64_FP16_H_ diff --git a/third_party/aarch64/arm_neon.internal.h b/third_party/aarch64/arm_neon.internal.h index 436ab6a44..78560ec85 100644 --- a/third_party/aarch64/arm_neon.internal.h +++ b/third_party/aarch64/arm_neon.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__aarch64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _AARCH64_NEON_H_ #define _AARCH64_NEON_H_ diff --git a/third_party/aarch64/arm_sve.internal.h b/third_party/aarch64/arm_sve.internal.h index e126e520c..a4fb4000a 100644 --- a/third_party/aarch64/arm_sve.internal.h +++ b/third_party/aarch64/arm_sve.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__aarch64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _ARM_SVE_H_ #define _ARM_SVE_H_ diff --git a/third_party/aarch64/openacc.internal.h b/third_party/aarch64/openacc.internal.h index 01dc67805..f42e14bb6 100644 --- a/third_party/aarch64/openacc.internal.h +++ b/third_party/aarch64/openacc.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__aarch64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _OPENACC_H #define _OPENACC_H 1 diff --git a/third_party/aarch64/upgrade.sh b/third_party/aarch64/upgrade.sh index 30a128479..04376e53a 100755 --- a/third_party/aarch64/upgrade.sh +++ b/third_party/aarch64/upgrade.sh @@ -63,7 +63,6 @@ done for f in third_party/aarch64/*.h; do ( - printf %s\\n '/* clang-format off */' printf %s\\n '#if defined(__aarch64__) && !(__ASSEMBLER__ + __LINKER__ + 0)' cat $f printf %s\\n '#endif' diff --git a/third_party/argon2/argon2.c b/third_party/argon2/argon2.c index 8c876c7b5..b0541760b 100644 --- a/third_party/argon2/argon2.c +++ b/third_party/argon2/argon2.c @@ -26,7 +26,6 @@ asm(".ident\t\"\\n\\n\ argon2 (CC0 or Apache2)\\n\ Copyright 2016 Daniel Dinu, Dmitry Khovratovich\\n\ Copyright 2016 Jean-Philippe Aumasson, Samuel Neves\""); -/* clang-format off */ /** * Function that gives the string representation of an argon2_type. diff --git a/third_party/argon2/argon2.h b/third_party/argon2/argon2.h index 4ed65e798..15acdecc8 100644 --- a/third_party/argon2/argon2.h +++ b/third_party/argon2/argon2.h @@ -5,7 +5,6 @@ #define ARGON2_NO_THREADS -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* @@ -210,5 +209,4 @@ size_t argon2_encodedlen(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, argon2_type); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ARGON2_ARGON2_H_ */ diff --git a/third_party/argon2/blake2-impl.h b/third_party/argon2/blake2-impl.h index a2313f646..5c6076fcd 100644 --- a/third_party/argon2/blake2-impl.h +++ b/third_party/argon2/blake2-impl.h @@ -1,7 +1,6 @@ #ifndef PORTABLE_BLAKE2_IMPL_H #define PORTABLE_BLAKE2_IMPL_H #include "libc/str/str.h" -/* clang-format off */ static inline uint64_t load64(const void *src) { #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ diff --git a/third_party/argon2/blake2.h b/third_party/argon2/blake2.h index ca21dfae0..2e552349d 100644 --- a/third_party/argon2/blake2.h +++ b/third_party/argon2/blake2.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_ARGON2_BLAKE2_H_ #define COSMOPOLITAN_THIRD_PARTY_ARGON2_BLAKE2_H_ #include "third_party/argon2/argon2.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ enum blake2b_constant { @@ -48,5 +47,4 @@ int blake2b(void *, size_t, const void *, size_t, const void *, size_t); int blake2b_long(void *, size_t, const void *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ARGON2_BLAKE2_H_ */ diff --git a/third_party/argon2/blake2b.c b/third_party/argon2/blake2b.c index ee0f6c644..4b1f2921c 100644 --- a/third_party/argon2/blake2b.c +++ b/third_party/argon2/blake2b.c @@ -15,12 +15,11 @@ │ - Apache 2.0 : https://www.apache.org/licenses/LICENSE-2.0 │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "third_party/argon2/blake2-impl.h" #include "third_party/argon2/blake2.h" #include "third_party/argon2/core.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ argon2 (CC0 or Apache2)\\n\ diff --git a/third_party/argon2/blamka-round-ref.h b/third_party/argon2/blamka-round-ref.h index 1da274870..d164d07fe 100644 --- a/third_party/argon2/blamka-round-ref.h +++ b/third_party/argon2/blamka-round-ref.h @@ -2,7 +2,6 @@ #define BLAKE_ROUND_MKA_H #include "third_party/argon2/blake2-impl.h" #include "third_party/argon2/blake2.h" -/* clang-format off */ /* designed by the Lyra PHC team */ static inline uint64_t fBlaMka(uint64_t x, uint64_t y) { diff --git a/third_party/argon2/core.c b/third_party/argon2/core.c index 8befb8ad2..4196566e7 100644 --- a/third_party/argon2/core.c +++ b/third_party/argon2/core.c @@ -24,7 +24,6 @@ asm(".ident\t\"\\n\\n\ argon2 (CC0 or Apache2)\\n\ Copyright 2016 Daniel Dinu, Dmitry Khovratovich\\n\ Copyright 2016 Jean-Philippe Aumasson, Samuel Neves\""); -/* clang-format off */ int FLAG_clear_internal_memory = 1; diff --git a/third_party/argon2/core.h b/third_party/argon2/core.h index 7cdfc54e6..a15dac321 100644 --- a/third_party/argon2/core.h +++ b/third_party/argon2/core.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_ARGON2_CORE_H_ #define COSMOPOLITAN_THIRD_PARTY_ARGON2_CORE_H_ #include "third_party/argon2/argon2.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ enum argon2_core_constants { @@ -83,5 +82,4 @@ void fill_segment(const argon2_instance_t *, argon2_position_t); int fill_memory_blocks(argon2_instance_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ARGON2_CORE_H_ */ diff --git a/third_party/argon2/encoding.c b/third_party/argon2/encoding.c index ade7edbc2..f2e4e8f72 100644 --- a/third_party/argon2/encoding.c +++ b/third_party/argon2/encoding.c @@ -25,7 +25,6 @@ asm(".ident\t\"\\n\\n\ argon2 (CC0 or Apache2)\\n\ Copyright 2016 Daniel Dinu, Dmitry Khovratovich\\n\ Copyright 2016 Jean-Philippe Aumasson, Samuel Neves\""); -/* clang-format off */ /* * Example code for a decoder and encoder of "hash strings", with Argon2 diff --git a/third_party/argon2/encoding.h b/third_party/argon2/encoding.h index 538d770f5..a0e62786d 100644 --- a/third_party/argon2/encoding.h +++ b/third_party/argon2/encoding.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_ARGON2_ENCODING_H_ #define COSMOPOLITAN_THIRD_PARTY_ARGON2_ENCODING_H_ #include "third_party/argon2/argon2.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define ARGON2_MAX_DECODED_LANES UINT32_C(255) @@ -14,5 +13,4 @@ size_t b64len(uint32_t); size_t numlen(uint32_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ARGON2_ENCODING_H_ */ diff --git a/third_party/argon2/ref.c b/third_party/argon2/ref.c index 2ce1e832b..ce295c24e 100644 --- a/third_party/argon2/ref.c +++ b/third_party/argon2/ref.c @@ -26,7 +26,6 @@ asm(".ident\t\"\\n\\n\ argon2 (CC0 or Apache2)\\n\ Copyright 2016 Daniel Dinu, Dmitry Khovratovich\\n\ Copyright 2016 Jean-Philippe Aumasson, Samuel Neves\""); -/* clang-format off */ /* * Argon2 reference source code package - reference C implementations diff --git a/third_party/awk/awk.h b/third_party/awk/awk.h index 575da9175..59362f574 100644 --- a/third_party/awk/awk.h +++ b/third_party/awk/awk.h @@ -4,9 +4,7 @@ #include "libc/limits.h" #include "libc/literal.h" #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ typedef double Awkfloat; @@ -412,5 +410,4 @@ extern Cell *gsub(Node **, int); extern const char *flags2str(int flags); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_AWK_AWK_H_ */ diff --git a/third_party/awk/awkgram.tab.c b/third_party/awk/awkgram.tab.c index bb0e05bf4..9ac4d798a 100644 --- a/third_party/awk/awkgram.tab.c +++ b/third_party/awk/awkgram.tab.c @@ -1,4 +1,3 @@ -// clang-format off #include "libc/mem/mem.h" #include "libc/str/str.h" #define YYBYACC 1 diff --git a/third_party/awk/awkgram.tab.h b/third_party/awk/awkgram.tab.h index 662519783..23a7754f8 100644 --- a/third_party/awk/awkgram.tab.h +++ b/third_party/awk/awkgram.tab.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_AWK_AWKGRAM_TAB_H_ #define COSMOPOLITAN_THIRD_PARTY_AWK_AWKGRAM_TAB_H_ #include "third_party/awk/awk.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define FIRSTTOKEN 257 @@ -111,5 +110,4 @@ typedef union { extern YYSTYPE yylval; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_AWK_AWKGRAM_TAB_H_ */ diff --git a/third_party/awk/b.c b/third_party/awk/b.c index a144c8aa4..c5271cd21 100644 --- a/third_party/awk/b.c +++ b/third_party/awk/b.c @@ -31,7 +31,6 @@ #include "libc/str/str.h" #include "third_party/awk/awk.h" #include "third_party/awk/awkgram.tab.h" -// clang-format off /* lasciate ogne speranza, voi ch'intrate. */ diff --git a/third_party/awk/cmd.h b/third_party/awk/cmd.h index 80df8d956..0a538f35a 100644 --- a/third_party/awk/cmd.h +++ b/third_party/awk/cmd.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_AWK_CMD_H_ #define COSMOPOLITAN_THIRD_PARTY_AWK_CMD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int _awk(int, char *[]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_AWK_CMD_H_ */ diff --git a/third_party/awk/lex.c b/third_party/awk/lex.c index e9af4b42b..23c2cf899 100644 --- a/third_party/awk/lex.c +++ b/third_party/awk/lex.c @@ -34,7 +34,6 @@ #include "third_party/awk/awk.h" #include "third_party/awk/awkgram.tab.h" #include "third_party/gdtoa/gdtoa.h" -// clang-format off extern bool infunc; diff --git a/third_party/awk/lib.c b/third_party/awk/lib.c index 62f9f506f..cd8933020 100644 --- a/third_party/awk/lib.c +++ b/third_party/awk/lib.c @@ -35,7 +35,6 @@ #include "libc/runtime/runtime.h" #include "libc/str/str.h" #include "third_party/awk/awk.h" -// clang-format off char EMPTY[] = { '\0' }; static FILE *infile = NULL; diff --git a/third_party/awk/main.c b/third_party/awk/main.c index 1ac4b710d..9654b0244 100644 --- a/third_party/awk/main.c +++ b/third_party/awk/main.c @@ -38,7 +38,6 @@ #include "libc/sysv/consts/sicode.h" #include "libc/sysv/consts/sig.h" #include "third_party/awk/awk.h" -// clang-format off asm(".ident\t\"\\n\\n\ Copyright (C) Lucent Technologies 1997\\n\ diff --git a/third_party/awk/maketab.c b/third_party/awk/maketab.c index b91232dc2..72dafddc7 100644 --- a/third_party/awk/maketab.c +++ b/third_party/awk/maketab.c @@ -31,7 +31,6 @@ #include "libc/str/str.h" #include "third_party/awk/awk.h" #include "third_party/awk/awkgram.tab.h" -// clang-format off /* * this program makes the table to link function names diff --git a/third_party/awk/parse.c b/third_party/awk/parse.c index 9d91242d8..4f6cd8b48 100644 --- a/third_party/awk/parse.c +++ b/third_party/awk/parse.c @@ -30,7 +30,6 @@ #include "libc/str/str.h" #include "third_party/awk/awk.h" #include "third_party/awk/awkgram.tab.h" -// clang-format off Node *nodealloc(int n) { diff --git a/third_party/awk/proctab.c b/third_party/awk/proctab.c index 40ebb509c..0b4c4dc42 100644 --- a/third_party/awk/proctab.c +++ b/third_party/awk/proctab.c @@ -27,7 +27,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/awk/awk.h" #include "third_party/awk/awkgram.tab.h" -// clang-format off static const char * const printname[95] = { "FIRSTTOKEN", /* 258 */ diff --git a/third_party/awk/run.c b/third_party/awk/run.c index e4daf9411..9c8ee2078 100644 --- a/third_party/awk/run.c +++ b/third_party/awk/run.c @@ -39,7 +39,6 @@ #include "third_party/awk/awk.h" #include "third_party/awk/awkgram.tab.h" #include "third_party/libcxx/math.h" -// clang-format off static void stdinit(void); static void flush_all(void); diff --git a/third_party/awk/tran.c b/third_party/awk/tran.c index 266a7077c..5869bf450 100644 --- a/third_party/awk/tran.c +++ b/third_party/awk/tran.c @@ -31,7 +31,6 @@ #include "libc/mem/mem.h" #include "libc/str/str.h" #include "third_party/awk/awk.h" -// clang-format off #define FULLTAB 2 /* rehash when table gets this x full */ #define GROWTAB 4 /* grow table by this factor */ diff --git a/third_party/bzip2/blocksort.c b/third_party/bzip2/blocksort.c index f20ddbf2b..e223dc8cb 100644 --- a/third_party/bzip2/blocksort.c +++ b/third_party/bzip2/blocksort.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*-------------------------------------------------------------*/ /*--- Block sorting machinery ---*/ diff --git a/third_party/bzip2/bzip2.c b/third_party/bzip2/bzip2.c index 39cae7414..05bd38afe 100644 --- a/third_party/bzip2/bzip2.c +++ b/third_party/bzip2/bzip2.c @@ -15,7 +15,6 @@ #include "libc/time/struct/utimbuf.h" #include "libc/time/time.h" #include "third_party/bzip2/bzlib.h" -/* clang-format off */ /*-----------------------------------------------------------*/ /*--- A block-sorting, lossless compressor bzip2.c ---*/ diff --git a/third_party/bzip2/bzip2recover.c b/third_party/bzip2/bzip2recover.c index 917be8360..0b2d6ee96 100644 --- a/third_party/bzip2/bzip2recover.c +++ b/third_party/bzip2/bzip2recover.c @@ -5,7 +5,6 @@ #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -/* clang-format off */ /*-----------------------------------------------------------*/ /*--- Block recoverer program for bzip2 ---*/ diff --git a/third_party/bzip2/bzlib.c b/third_party/bzip2/bzlib.c index ba3dbc482..22733a912 100644 --- a/third_party/bzip2/bzlib.c +++ b/third_party/bzip2/bzlib.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*-------------------------------------------------------------*/ /*--- Library top-level functions. ---*/ diff --git a/third_party/bzip2/bzlib.h b/third_party/bzip2/bzlib.h index ddf252d04..47360e1ce 100644 --- a/third_party/bzip2/bzlib.h +++ b/third_party/bzip2/bzlib.h @@ -23,7 +23,6 @@ #define BZ_MAX_UNUSED 5000 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct { @@ -87,5 +86,4 @@ void BZ2_bzclose(BZFILE *); const char *BZ2_bzerror(BZFILE *, int *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _BZLIB_H */ diff --git a/third_party/bzip2/bzlib_private.inc b/third_party/bzip2/bzlib_private.inc index b05920905..fe88e0cff 100644 --- a/third_party/bzip2/bzlib_private.inc +++ b/third_party/bzip2/bzlib_private.inc @@ -2,7 +2,6 @@ #define BZ_NO_STDIO -/* clang-format off */ /*-------------------------------------------------------------*/ /*--- Private header file for the library. ---*/ diff --git a/third_party/bzip2/compress.c b/third_party/bzip2/compress.c index 6bff8a238..9f9cbd047 100644 --- a/third_party/bzip2/compress.c +++ b/third_party/bzip2/compress.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*-------------------------------------------------------------*/ /*--- Compression machinery (not incl block sorting) ---*/ diff --git a/third_party/bzip2/decompress.c b/third_party/bzip2/decompress.c index baf87d277..1fef62b8f 100644 --- a/third_party/bzip2/decompress.c +++ b/third_party/bzip2/decompress.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*-------------------------------------------------------------*/ /*--- Decompression machinery ---*/ diff --git a/third_party/bzip2/huffman.c b/third_party/bzip2/huffman.c index 1b3797edc..bbfcfae73 100644 --- a/third_party/bzip2/huffman.c +++ b/third_party/bzip2/huffman.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*-------------------------------------------------------------*/ /*--- Huffman coding low-level stuff ---*/ diff --git a/third_party/bzip2/randtable.c b/third_party/bzip2/randtable.c index 1b75a33e2..c7efee7b1 100644 --- a/third_party/bzip2/randtable.c +++ b/third_party/bzip2/randtable.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*-------------------------------------------------------------*/ /*--- Table for randomising repetitive blocks ---*/ diff --git a/third_party/bzip2/spewG.c b/third_party/bzip2/spewG.c index 4af0a5cfa..711aa1f5a 100644 --- a/third_party/bzip2/spewG.c +++ b/third_party/bzip2/spewG.c @@ -1,6 +1,5 @@ #include "libc/stdio/rand.h" #include "libc/stdio/stdio.h" -/* clang-format off */ /* spew out a thoroughly gigantic file designed so that bzip2 can compress it reasonably rapidly. This is to help test diff --git a/third_party/chibicc/as.c b/third_party/chibicc/as.c index 4fe77a26f..3a11e40dd 100644 --- a/third_party/chibicc/as.c +++ b/third_party/chibicc/as.c @@ -20,7 +20,6 @@ #include "libc/calls/struct/stat.h" #include "libc/elf/def.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" #include "libc/intrin/bsr.h" #include "libc/intrin/popcnt.h" #include "libc/log/check.h" @@ -38,6 +37,7 @@ #include "libc/x/xasprintf.h" #include "third_party/chibicc/file.h" #include "third_party/gdtoa/gdtoa.h" +#include "libc/serialize.h" #include "tool/build/lib/elfwriter.h" #define OSZ 0x66 diff --git a/third_party/chibicc/chibicc.h b/third_party/chibicc/chibicc.h index 46e79cef3..417f3be58 100644 --- a/third_party/chibicc/chibicc.h +++ b/third_party/chibicc/chibicc.h @@ -24,7 +24,6 @@ #include "libc/x/x.h" #include "third_party/gdtoa/gdtoa.h" #include "tool/build/lib/javadown.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #pragma GCC diagnostic ignored "-Wswitch" @@ -664,5 +663,4 @@ void Assembler(int, char **); void output_bindings_python(const char *, Obj *, Token *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_CHIBICC_CHIBICC_H_ */ diff --git a/third_party/chibicc/dox2.c b/third_party/chibicc/dox2.c index 236505e6c..1b493a0d0 100644 --- a/third_party/chibicc/dox2.c +++ b/third_party/chibicc/dox2.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/intrin/bsr.h" #include "libc/mem/alg.h" #include "libc/sysv/consts/map.h" diff --git a/third_party/chibicc/file.h b/third_party/chibicc/file.h index 4a449dd98..41e24b20e 100644 --- a/third_party/chibicc/file.h +++ b/third_party/chibicc/file.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_CHIBICC_FILE_H_ #define COSMOPOLITAN_THIRD_PARTY_CHIBICC_FILE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *skip_bom(char *); @@ -9,5 +8,4 @@ void remove_backslash_newline(char *); void canonicalize_newline(char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_CHIBICC_FILE_H_ */ diff --git a/third_party/chibicc/kw.h b/third_party/chibicc/kw.h index d8b7baa0c..bc7a05f1b 100644 --- a/third_party/chibicc/kw.h +++ b/third_party/chibicc/kw.h @@ -121,11 +121,9 @@ #define KW___ATOMIC_COMPARE_EXCHANGE_N 137 #define KW___ATOMIC_EXCHANGE_N 138 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ unsigned char GetKw(const char *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_CHIBICC_KW_H_ */ diff --git a/third_party/chibicc/kw.inc b/third_party/chibicc/kw.inc index d58edb937..ba6d999f4 100644 --- a/third_party/chibicc/kw.inc +++ b/third_party/chibicc/kw.inc @@ -1,7 +1,6 @@ /* ANSI-C code produced by gperf version 3.1 */ /* Command-line: gperf kw.gperf */ /* Computed positions: -k'1,4,11,14,17,$' */ -// clang-format off #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ diff --git a/third_party/chibicc/pybind.c b/third_party/chibicc/pybind.c index 5d1682939..4fa15b53b 100644 --- a/third_party/chibicc/pybind.c +++ b/third_party/chibicc/pybind.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/conv.h" #include "libc/fmt/libgen.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/log/libfatal.internal.h" #include "libc/mem/gc.h" #include "libc/mem/mem.h" diff --git a/third_party/chibicc/test/macro_test.c b/third_party/chibicc/test/macro_test.c index 7c97b8d89..20ab6fddf 100644 --- a/third_party/chibicc/test/macro_test.c +++ b/third_party/chibicc/test/macro_test.c @@ -1,6 +1,5 @@ #include "third_party/chibicc/test/include1.h" #include "third_party/chibicc/test/test.h" -/* clang-format off */ char *main_filename1 = __FILE__; int main_line1 = __LINE__; #define LINE() __LINE__ @@ -341,8 +340,8 @@ int main() { ASSERT(1, __STDC__); ASSERT(0, strcmp(main_filename1, "third_party/chibicc/test/macro_test.c")); - ASSERT(5, main_line1); - ASSERT(7, main_line2); + ASSERT(4, main_line1); + ASSERT(6, main_line2); ASSERT(0, strcmp(include1_filename, "third_party/chibicc/test/include1.h")); ASSERT(4, include1_line); diff --git a/third_party/compiler_rt/absvdi2.c b/third_party/compiler_rt/absvdi2.c index 0628ee38a..b8a8bca27 100644 --- a/third_party/compiler_rt/absvdi2.c +++ b/third_party/compiler_rt/absvdi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- absvdi2.c - Implement __absvdi2 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/absvsi2.c b/third_party/compiler_rt/absvsi2.c index b60c5281e..f0bc4e9a6 100644 --- a/third_party/compiler_rt/absvsi2.c +++ b/third_party/compiler_rt/absvsi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- absvsi2.c - Implement __absvsi2 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/absvti2.c b/third_party/compiler_rt/absvti2.c index db7d23294..d461b5a22 100644 --- a/third_party/compiler_rt/absvti2.c +++ b/third_party/compiler_rt/absvti2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- absvti2.c - Implement __absvdi2 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/adddf3.c b/third_party/compiler_rt/adddf3.c index c3fcaaa40..da404df96 100644 --- a/third_party/compiler_rt/adddf3.c +++ b/third_party/compiler_rt/adddf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/adddf3.c - Double-precision addition ------------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/addsf3.c b/third_party/compiler_rt/addsf3.c index 2fe1bd990..e1e5d2647 100644 --- a/third_party/compiler_rt/addsf3.c +++ b/third_party/compiler_rt/addsf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/addsf3.c - Single-precision addition ------------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/addtf3.c b/third_party/compiler_rt/addtf3.c index 902c9b374..812cba495 100644 --- a/third_party/compiler_rt/addtf3.c +++ b/third_party/compiler_rt/addtf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/addtf3.c - Quad-precision addition --------------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ashldi3.c b/third_party/compiler_rt/ashldi3.c index 112e5e2ca..334ffbbab 100644 --- a/third_party/compiler_rt/ashldi3.c +++ b/third_party/compiler_rt/ashldi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ====-- ashldi3.c - Implement __ashldi3 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ashrdi3.c b/third_party/compiler_rt/ashrdi3.c index c00c2eea6..62331596a 100644 --- a/third_party/compiler_rt/ashrdi3.c +++ b/third_party/compiler_rt/ashrdi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- ashrdi3.c - Implement __ashrdi3 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ashrti3.c b/third_party/compiler_rt/ashrti3.c index 8f5f79bac..c2b5e24a2 100644 --- a/third_party/compiler_rt/ashrti3.c +++ b/third_party/compiler_rt/ashrti3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- ashrti3.c - Implement __ashrti3 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/assembly.h b/third_party/compiler_rt/assembly.h index b36bb8d84..6eb09bfcb 100644 --- a/third_party/compiler_rt/assembly.h +++ b/third_party/compiler_rt/assembly.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- assembly.h - compiler-rt assembler support macros -----------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/bswapdi2.c b/third_party/compiler_rt/bswapdi2.c index 3b1aec649..41aa5c7e0 100644 --- a/third_party/compiler_rt/bswapdi2.c +++ b/third_party/compiler_rt/bswapdi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- bswapdi2.c - Implement __bswapdi2 ---------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/bswapsi2.c b/third_party/compiler_rt/bswapsi2.c index 3e8155f95..a4e889a92 100644 --- a/third_party/compiler_rt/bswapsi2.c +++ b/third_party/compiler_rt/bswapsi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- bswapsi2.c - Implement __bswapsi2 ---------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/clzdi2.c b/third_party/compiler_rt/clzdi2.c index 8d7155ef3..c17c1a172 100644 --- a/third_party/compiler_rt/clzdi2.c +++ b/third_party/compiler_rt/clzdi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- clzdi2.c - Implement __clzdi2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/clzsi2.c b/third_party/compiler_rt/clzsi2.c index 24df9b209..479efd0ad 100644 --- a/third_party/compiler_rt/clzsi2.c +++ b/third_party/compiler_rt/clzsi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- clzsi2.c - Implement __clzsi2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/clzti2.c b/third_party/compiler_rt/clzti2.c index b1a673a22..43bff862b 100644 --- a/third_party/compiler_rt/clzti2.c +++ b/third_party/compiler_rt/clzti2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- clzti2.c - Implement __clzti2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/cmpdi2.c b/third_party/compiler_rt/cmpdi2.c index 578cef946..eec44e559 100644 --- a/third_party/compiler_rt/cmpdi2.c +++ b/third_party/compiler_rt/cmpdi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- cmpdi2.c - Implement __cmpdi2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/cmpti2.c b/third_party/compiler_rt/cmpti2.c index d4b3ae6e4..58c4fdaf4 100644 --- a/third_party/compiler_rt/cmpti2.c +++ b/third_party/compiler_rt/cmpti2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- cmpti2.c - Implement __cmpti2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/comparedf2.c b/third_party/compiler_rt/comparedf2.c index 45a9b1e03..53562d872 100644 --- a/third_party/compiler_rt/comparedf2.c +++ b/third_party/compiler_rt/comparedf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/comparedf2.c - Double-precision comparisons -----------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/comparesf2.c b/third_party/compiler_rt/comparesf2.c index 8e785039e..ef40e84ac 100644 --- a/third_party/compiler_rt/comparesf2.c +++ b/third_party/compiler_rt/comparesf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/comparesf2.c - Single-precision comparisons -----------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ctzdi2.c b/third_party/compiler_rt/ctzdi2.c index 31c058729..a463dc5fa 100644 --- a/third_party/compiler_rt/ctzdi2.c +++ b/third_party/compiler_rt/ctzdi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- ctzdi2.c - Implement __ctzdi2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ctzsi2.c b/third_party/compiler_rt/ctzsi2.c index 3feb60d28..3652492ea 100644 --- a/third_party/compiler_rt/ctzsi2.c +++ b/third_party/compiler_rt/ctzsi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- ctzsi2.c - Implement __ctzsi2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ctzti2.c b/third_party/compiler_rt/ctzti2.c index e5782d699..0f004a744 100644 --- a/third_party/compiler_rt/ctzti2.c +++ b/third_party/compiler_rt/ctzti2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- ctzti2.c - Implement __ctzti2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divdc3.c b/third_party/compiler_rt/divdc3.c index e36bc8b12..b1a8b6a7e 100644 --- a/third_party/compiler_rt/divdc3.c +++ b/third_party/compiler_rt/divdc3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- divdc3.c - Implement __divdc3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divdf3.c b/third_party/compiler_rt/divdf3.c index 066ce3ed3..ce50ca119 100644 --- a/third_party/compiler_rt/divdf3.c +++ b/third_party/compiler_rt/divdf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/divdf3.c - Double-precision division ------------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divdi3.c b/third_party/compiler_rt/divdi3.c index 1c1048b13..c370ce05f 100644 --- a/third_party/compiler_rt/divdi3.c +++ b/third_party/compiler_rt/divdi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- divdi3.c - Implement __divdi3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divmoddi4.c b/third_party/compiler_rt/divmoddi4.c index a69264ecf..e60edb4c1 100644 --- a/third_party/compiler_rt/divmoddi4.c +++ b/third_party/compiler_rt/divmoddi4.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- divmoddi4.c - Implement __divmoddi4 --------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divmodsi4.c b/third_party/compiler_rt/divmodsi4.c index ac6498f0e..ad0389696 100644 --- a/third_party/compiler_rt/divmodsi4.c +++ b/third_party/compiler_rt/divmodsi4.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- divmodsi4.c - Implement __divmodsi4 --------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divsc3.c b/third_party/compiler_rt/divsc3.c index bd7fae559..c2e358775 100644 --- a/third_party/compiler_rt/divsc3.c +++ b/third_party/compiler_rt/divsc3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- divsc3.c - Implement __divsc3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divsf3.c b/third_party/compiler_rt/divsf3.c index 308ac30aa..c264f2d6a 100644 --- a/third_party/compiler_rt/divsf3.c +++ b/third_party/compiler_rt/divsf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/divsf3.c - Single-precision division ------------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divsi3.c b/third_party/compiler_rt/divsi3.c index e45934c2f..513bf9bab 100644 --- a/third_party/compiler_rt/divsi3.c +++ b/third_party/compiler_rt/divsi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- divsi3.c - Implement __divsi3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divtc3.c b/third_party/compiler_rt/divtc3.c index 9ec00b7a0..d22131f85 100644 --- a/third_party/compiler_rt/divtc3.c +++ b/third_party/compiler_rt/divtc3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- divtc3.c - Implement __divtc3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divtf3.c b/third_party/compiler_rt/divtf3.c index bbfd12c09..b53215f73 100644 --- a/third_party/compiler_rt/divtf3.c +++ b/third_party/compiler_rt/divtf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/divtf3.c - Quad-precision division --------------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/divxc3.c b/third_party/compiler_rt/divxc3.c index b2bbea46a..567389925 100644 --- a/third_party/compiler_rt/divxc3.c +++ b/third_party/compiler_rt/divxc3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- divxc3.c - Implement __divxc3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/extenddftf2.c b/third_party/compiler_rt/extenddftf2.c index 1a836b0c1..a1672b823 100644 --- a/third_party/compiler_rt/extenddftf2.c +++ b/third_party/compiler_rt/extenddftf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/extenddftf2.c - double -> quad conversion -------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/extendhfsf2.c b/third_party/compiler_rt/extendhfsf2.c index 709f031a3..8d122cfb6 100644 --- a/third_party/compiler_rt/extendhfsf2.c +++ b/third_party/compiler_rt/extendhfsf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/extendhfsf2.c - half -> single conversion -------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/extendsfdf2.c b/third_party/compiler_rt/extendsfdf2.c index 4db018864..c3465d4f2 100644 --- a/third_party/compiler_rt/extendsfdf2.c +++ b/third_party/compiler_rt/extendsfdf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/extendsfdf2.c - single -> double conversion -----------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/extendsftf2.c b/third_party/compiler_rt/extendsftf2.c index 65fd1e49f..1509b45e4 100644 --- a/third_party/compiler_rt/extendsftf2.c +++ b/third_party/compiler_rt/extendsftf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/extendsftf2.c - single -> quad conversion -------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ffsdi2.c b/third_party/compiler_rt/ffsdi2.c index 0b4406360..86a8c895a 100644 --- a/third_party/compiler_rt/ffsdi2.c +++ b/third_party/compiler_rt/ffsdi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- ffsdi2.c - Implement __ffsdi2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ffssi2.c b/third_party/compiler_rt/ffssi2.c index 663cfe8ab..67ed91083 100644 --- a/third_party/compiler_rt/ffssi2.c +++ b/third_party/compiler_rt/ffssi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- ffssi2.c - Implement __ffssi2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ffsti2.c b/third_party/compiler_rt/ffsti2.c index 19fada7dd..d628904bc 100644 --- a/third_party/compiler_rt/ffsti2.c +++ b/third_party/compiler_rt/ffsti2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- ffsti2.c - Implement __ffsti2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixdfdi.c b/third_party/compiler_rt/fixdfdi.c index 90330d838..350dea724 100644 --- a/third_party/compiler_rt/fixdfdi.c +++ b/third_party/compiler_rt/fixdfdi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixdfdi.c - Implement __fixdfdi -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixdfsi.c b/third_party/compiler_rt/fixdfsi.c index d47ddbcae..292cb2b49 100644 --- a/third_party/compiler_rt/fixdfsi.c +++ b/third_party/compiler_rt/fixdfsi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixdfsi.c - Implement __fixdfsi -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixdfti.c b/third_party/compiler_rt/fixdfti.c index b2a980695..b6710aa84 100644 --- a/third_party/compiler_rt/fixdfti.c +++ b/third_party/compiler_rt/fixdfti.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixdfti.c - Implement __fixdfti -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixsfdi.c b/third_party/compiler_rt/fixsfdi.c index 8f6c88d82..a7441dbc1 100644 --- a/third_party/compiler_rt/fixsfdi.c +++ b/third_party/compiler_rt/fixsfdi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixsfdi.c - Implement __fixsfdi -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixsfsi.c b/third_party/compiler_rt/fixsfsi.c index 40d3b8424..a70d04a91 100644 --- a/third_party/compiler_rt/fixsfsi.c +++ b/third_party/compiler_rt/fixsfsi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixsfsi.c - Implement __fixsfsi -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixsfti.c b/third_party/compiler_rt/fixsfti.c index f9dcadf62..883159e79 100644 --- a/third_party/compiler_rt/fixsfti.c +++ b/third_party/compiler_rt/fixsfti.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixsfti.c - Implement __fixsfti -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixtfdi.c b/third_party/compiler_rt/fixtfdi.c index fce9af86f..098138661 100644 --- a/third_party/compiler_rt/fixtfdi.c +++ b/third_party/compiler_rt/fixtfdi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixtfdi.c - Implement __fixtfdi -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixtfsi.c b/third_party/compiler_rt/fixtfsi.c index 04a298fdb..f112cf818 100644 --- a/third_party/compiler_rt/fixtfsi.c +++ b/third_party/compiler_rt/fixtfsi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixtfsi.c - Implement __fixtfsi -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixtfti.c b/third_party/compiler_rt/fixtfti.c index 0c74e222f..effb3d725 100644 --- a/third_party/compiler_rt/fixtfti.c +++ b/third_party/compiler_rt/fixtfti.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixtfti.c - Implement __fixtfti -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunsdfdi.c b/third_party/compiler_rt/fixunsdfdi.c index 161078cff..bac8e5e29 100644 --- a/third_party/compiler_rt/fixunsdfdi.c +++ b/third_party/compiler_rt/fixunsdfdi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunsdfdi.c - Implement __fixunsdfdi -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunsdfsi.c b/third_party/compiler_rt/fixunsdfsi.c index 2e340fe8f..8bcdddea7 100644 --- a/third_party/compiler_rt/fixunsdfsi.c +++ b/third_party/compiler_rt/fixunsdfsi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunsdfsi.c - Implement __fixunsdfsi -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunsdfti.c b/third_party/compiler_rt/fixunsdfti.c index ee518700f..eb4bb6cc0 100644 --- a/third_party/compiler_rt/fixunsdfti.c +++ b/third_party/compiler_rt/fixunsdfti.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunsdfti.c - Implement __fixunsdfti -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunssfdi.c b/third_party/compiler_rt/fixunssfdi.c index 47692e9b0..8b6e599cb 100644 --- a/third_party/compiler_rt/fixunssfdi.c +++ b/third_party/compiler_rt/fixunssfdi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunssfdi.c - Implement __fixunssfdi -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunssfsi.c b/third_party/compiler_rt/fixunssfsi.c index 21a04e8fd..f11b88b72 100644 --- a/third_party/compiler_rt/fixunssfsi.c +++ b/third_party/compiler_rt/fixunssfsi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunssfsi.c - Implement __fixunssfsi -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunssfti.c b/third_party/compiler_rt/fixunssfti.c index 5cf032011..db0683cff 100644 --- a/third_party/compiler_rt/fixunssfti.c +++ b/third_party/compiler_rt/fixunssfti.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunssfti.c - Implement __fixunssfti -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunstfdi.c b/third_party/compiler_rt/fixunstfdi.c index 1bc370bb3..751a4cffa 100644 --- a/third_party/compiler_rt/fixunstfdi.c +++ b/third_party/compiler_rt/fixunstfdi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunstfdi.c - Implement __fixunstfdi -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunstfsi.c b/third_party/compiler_rt/fixunstfsi.c index 17c6915da..e594de416 100644 --- a/third_party/compiler_rt/fixunstfsi.c +++ b/third_party/compiler_rt/fixunstfsi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunstfsi.c - Implement __fixunstfsi -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunstfti.c b/third_party/compiler_rt/fixunstfti.c index 1ddaca8d1..8c9241396 100644 --- a/third_party/compiler_rt/fixunstfti.c +++ b/third_party/compiler_rt/fixunstfti.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunstfsi.c - Implement __fixunstfsi -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunsxfdi.c b/third_party/compiler_rt/fixunsxfdi.c index 0885e97c7..b7856c72c 100644 --- a/third_party/compiler_rt/fixunsxfdi.c +++ b/third_party/compiler_rt/fixunsxfdi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunsxfdi.c - Implement __fixunsxfdi -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunsxfsi.c b/third_party/compiler_rt/fixunsxfsi.c index 8ecc69604..24b7c8482 100644 --- a/third_party/compiler_rt/fixunsxfsi.c +++ b/third_party/compiler_rt/fixunsxfsi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunsxfsi.c - Implement __fixunsxfsi -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixunsxfti.c b/third_party/compiler_rt/fixunsxfti.c index 5ba62d4e1..f272bc4f2 100644 --- a/third_party/compiler_rt/fixunsxfti.c +++ b/third_party/compiler_rt/fixunsxfti.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixunsxfti.c - Implement __fixunsxfti -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixxfdi.c b/third_party/compiler_rt/fixxfdi.c index 153294a72..63c6876c2 100644 --- a/third_party/compiler_rt/fixxfdi.c +++ b/third_party/compiler_rt/fixxfdi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixxfdi.c - Implement __fixxfdi -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fixxfti.c b/third_party/compiler_rt/fixxfti.c index 4338fe32e..4e2d6a8e5 100644 --- a/third_party/compiler_rt/fixxfti.c +++ b/third_party/compiler_rt/fixxfti.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- fixxfti.c - Implement __fixxfti -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatdidf.c b/third_party/compiler_rt/floatdidf.c index db623cec9..817fd7582 100644 --- a/third_party/compiler_rt/floatdidf.c +++ b/third_party/compiler_rt/floatdidf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- floatdidf.c - Implement __floatdidf -------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatdisf.c b/third_party/compiler_rt/floatdisf.c index 3a08358d1..d2f7a1c2e 100644 --- a/third_party/compiler_rt/floatdisf.c +++ b/third_party/compiler_rt/floatdisf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- floatdisf.c - Implement __floatdisf -------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatditf.c b/third_party/compiler_rt/floatditf.c index 46614f0d5..8f157f7e8 100644 --- a/third_party/compiler_rt/floatditf.c +++ b/third_party/compiler_rt/floatditf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floatditf.c - integer -> quad-precision conversion ----*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatdixf.c b/third_party/compiler_rt/floatdixf.c index 447c43b52..f87535a25 100644 --- a/third_party/compiler_rt/floatdixf.c +++ b/third_party/compiler_rt/floatdixf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- floatdixf.c - Implement __floatdixf -------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatsidf.c b/third_party/compiler_rt/floatsidf.c index 9138e52f6..3c417e246 100644 --- a/third_party/compiler_rt/floatsidf.c +++ b/third_party/compiler_rt/floatsidf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floatsidf.c - integer -> double-precision conversion --*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatsisf.c b/third_party/compiler_rt/floatsisf.c index 1cfa4b6b9..5fd42cc0c 100644 --- a/third_party/compiler_rt/floatsisf.c +++ b/third_party/compiler_rt/floatsisf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floatsisf.c - integer -> single-precision conversion --*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatsitf.c b/third_party/compiler_rt/floatsitf.c index 1131277ef..9d1f5b851 100644 --- a/third_party/compiler_rt/floatsitf.c +++ b/third_party/compiler_rt/floatsitf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floatsitf.c - integer -> quad-precision conversion ----*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floattidf.c b/third_party/compiler_rt/floattidf.c index 4a546d65d..93c5bbda9 100644 --- a/third_party/compiler_rt/floattidf.c +++ b/third_party/compiler_rt/floattidf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- floattidf.c - Implement __floattidf -------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floattisf.c b/third_party/compiler_rt/floattisf.c index c8dc92a64..01369e33d 100644 --- a/third_party/compiler_rt/floattisf.c +++ b/third_party/compiler_rt/floattisf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- floattisf.c - Implement __floattisf -------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floattitf.c b/third_party/compiler_rt/floattitf.c index 09ef61626..5973d4cec 100644 --- a/third_party/compiler_rt/floattitf.c +++ b/third_party/compiler_rt/floattitf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floattitf.c - int128 -> quad-precision conversion -----*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floattixf.c b/third_party/compiler_rt/floattixf.c index 6101c9ad5..13a85e460 100644 --- a/third_party/compiler_rt/floattixf.c +++ b/third_party/compiler_rt/floattixf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- floattixf.c - Implement __floattixf -------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatundidf.c b/third_party/compiler_rt/floatundidf.c index ff66ac432..41b1fdd0d 100644 --- a/third_party/compiler_rt/floatundidf.c +++ b/third_party/compiler_rt/floatundidf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- floatundidf.c - Implement __floatundidf ---------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatundisf.c b/third_party/compiler_rt/floatundisf.c index df4f31593..007855b57 100644 --- a/third_party/compiler_rt/floatundisf.c +++ b/third_party/compiler_rt/floatundisf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- floatundisf.c - Implement __floatundisf ---------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatunditf.c b/third_party/compiler_rt/floatunditf.c index 8390100f4..d2ec232d6 100644 --- a/third_party/compiler_rt/floatunditf.c +++ b/third_party/compiler_rt/floatunditf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floatunditf.c - uint -> quad-precision conversion -----*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatundixf.c b/third_party/compiler_rt/floatundixf.c index a7c79c58e..8daa139ab 100644 --- a/third_party/compiler_rt/floatundixf.c +++ b/third_party/compiler_rt/floatundixf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- floatundixf.c - Implement __floatundixf ---------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatunsidf.c b/third_party/compiler_rt/floatunsidf.c index 6b876e3b6..2399d53cc 100644 --- a/third_party/compiler_rt/floatunsidf.c +++ b/third_party/compiler_rt/floatunsidf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floatunsidf.c - uint -> double-precision conversion ---*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatunsisf.c b/third_party/compiler_rt/floatunsisf.c index f0e6a1815..1ff170fb1 100644 --- a/third_party/compiler_rt/floatunsisf.c +++ b/third_party/compiler_rt/floatunsisf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floatunsisf.c - uint -> single-precision conversion ---*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatunsitf.c b/third_party/compiler_rt/floatunsitf.c index e35ca67f2..2c57f3a08 100644 --- a/third_party/compiler_rt/floatunsitf.c +++ b/third_party/compiler_rt/floatunsitf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floatunsitf.c - uint -> quad-precision conversion -----*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatuntidf.c b/third_party/compiler_rt/floatuntidf.c index 63d62bfa4..dca83137e 100644 --- a/third_party/compiler_rt/floatuntidf.c +++ b/third_party/compiler_rt/floatuntidf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- floatuntidf.c - Implement __floatuntidf ---------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatuntisf.c b/third_party/compiler_rt/floatuntisf.c index 0cee56321..3e7787e76 100644 --- a/third_party/compiler_rt/floatuntisf.c +++ b/third_party/compiler_rt/floatuntisf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- floatuntisf.c - Implement __floatuntisf ---------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatuntitf.c b/third_party/compiler_rt/floatuntitf.c index f58a98a87..24cf2eb75 100644 --- a/third_party/compiler_rt/floatuntitf.c +++ b/third_party/compiler_rt/floatuntitf.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/floatuntitf.c - uint128 -> quad-precision conversion --*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/floatuntixf.c b/third_party/compiler_rt/floatuntixf.c index b2d6b3b63..8ab3876b2 100644 --- a/third_party/compiler_rt/floatuntixf.c +++ b/third_party/compiler_rt/floatuntixf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- floatuntixf.c - Implement __floatuntixf ---------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_add_impl.inc b/third_party/compiler_rt/fp_add_impl.inc index 9d36c18e3..b5f480d07 100644 --- a/third_party/compiler_rt/fp_add_impl.inc +++ b/third_party/compiler_rt/fp_add_impl.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //===----- lib/fp_add_impl.inc - floaing point addition -----------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_extend_common.inc b/third_party/compiler_rt/fp_extend_common.inc index fd669401b..7da5c78f8 100644 --- a/third_party/compiler_rt/fp_extend_common.inc +++ b/third_party/compiler_rt/fp_extend_common.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //===-lib/fp_extend.h - low precision -> high precision conversion -*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_extend_impl.inc b/third_party/compiler_rt/fp_extend_impl.inc index 42ac6eeb2..375595da2 100644 --- a/third_party/compiler_rt/fp_extend_impl.inc +++ b/third_party/compiler_rt/fp_extend_impl.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //=-lib/fp_extend_impl.inc - low precision -> high precision conversion -*-- -// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_fixint_impl.inc b/third_party/compiler_rt/fp_fixint_impl.inc index 287bdb5df..698a78805 100644 --- a/third_party/compiler_rt/fp_fixint_impl.inc +++ b/third_party/compiler_rt/fp_fixint_impl.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/fixdfsi.c - Double-precision -> integer conversion ----*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_fixuint_impl.inc b/third_party/compiler_rt/fp_fixuint_impl.inc index 870e1d893..aa4bc688c 100644 --- a/third_party/compiler_rt/fp_fixuint_impl.inc +++ b/third_party/compiler_rt/fp_fixuint_impl.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/fixdfsi.c - Double-precision -> integer conversion ----*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_lib.inc b/third_party/compiler_rt/fp_lib.inc index da19ec913..fd9bd8a07 100644 --- a/third_party/compiler_rt/fp_lib.inc +++ b/third_party/compiler_rt/fp_lib.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/fp_lib.h - Floating-point utilities -------------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_mul_impl.inc b/third_party/compiler_rt/fp_mul_impl.inc index f77d133ff..3c6792ee4 100644 --- a/third_party/compiler_rt/fp_mul_impl.inc +++ b/third_party/compiler_rt/fp_mul_impl.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //===---- lib/fp_mul_impl.inc - floating point multiplication -----*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_trunc.inc b/third_party/compiler_rt/fp_trunc.inc index 54da3359d..29242c8e5 100644 --- a/third_party/compiler_rt/fp_trunc.inc +++ b/third_party/compiler_rt/fp_trunc.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //= lib/fp_trunc_impl.inc - high precision -> low precision conversion *-*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_trunc_common.inc b/third_party/compiler_rt/fp_trunc_common.inc index bd4e9fb89..bdd6d156b 100644 --- a/third_party/compiler_rt/fp_trunc_common.inc +++ b/third_party/compiler_rt/fp_trunc_common.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //=== lib/fp_trunc.h - high precision -> low precision conversion *- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/fp_trunc_impl.inc b/third_party/compiler_rt/fp_trunc_impl.inc index d029883b0..fa5791968 100644 --- a/third_party/compiler_rt/fp_trunc_impl.inc +++ b/third_party/compiler_rt/fp_trunc_impl.inc @@ -1,4 +1,3 @@ -/* clang-format off */ //= lib/fp_trunc_impl.inc - high precision -> low precision conversion *-*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ilogbl.c b/third_party/compiler_rt/ilogbl.c index cb18842ef..75e424a13 100644 --- a/third_party/compiler_rt/ilogbl.c +++ b/third_party/compiler_rt/ilogbl.c @@ -35,7 +35,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /** * Returns log₂𝑥 exponent part of double. diff --git a/third_party/compiler_rt/int_endianness.h b/third_party/compiler_rt/int_endianness.h index f5cd4bdf8..5979b5733 100644 --- a/third_party/compiler_rt/int_endianness.h +++ b/third_party/compiler_rt/int_endianness.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- int_endianness.h - configuration header for compiler-rt ------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/int_lib.h b/third_party/compiler_rt/int_lib.h index f56667c8e..46d4e654f 100644 --- a/third_party/compiler_rt/int_lib.h +++ b/third_party/compiler_rt/int_lib.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- int_lib.h - configuration header for compiler-rt -----------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/int_math.h b/third_party/compiler_rt/int_math.h index 7425b6959..c612ee1ca 100644 --- a/third_party/compiler_rt/int_math.h +++ b/third_party/compiler_rt/int_math.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- int_math.h - internal math inlines ---------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/int_types.h b/third_party/compiler_rt/int_types.h index 49a11354f..49f17d1ee 100644 --- a/third_party/compiler_rt/int_types.h +++ b/third_party/compiler_rt/int_types.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- int_lib.h - configuration header for compiler-rt -----------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/int_util.h b/third_party/compiler_rt/int_util.h index bbf050467..c926cb1a6 100644 --- a/third_party/compiler_rt/int_util.h +++ b/third_party/compiler_rt/int_util.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- int_util.h - internal utility functions ----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/logbl.c b/third_party/compiler_rt/logbl.c index 58bddfda5..364371e45 100644 --- a/third_party/compiler_rt/logbl.c +++ b/third_party/compiler_rt/logbl.c @@ -32,7 +32,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off long double logbl(long double x) { diff --git a/third_party/compiler_rt/lshrdi3.c b/third_party/compiler_rt/lshrdi3.c index 8d2af3c9d..5235c1c13 100644 --- a/third_party/compiler_rt/lshrdi3.c +++ b/third_party/compiler_rt/lshrdi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- lshrdi3.c - Implement __lshrdi3 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/mingw_fixfloat.c b/third_party/compiler_rt/mingw_fixfloat.c index 7d3f3f957..1f9066613 100644 --- a/third_party/compiler_rt/mingw_fixfloat.c +++ b/third_party/compiler_rt/mingw_fixfloat.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- mingw_fixfloat.c - Wrap int/float conversions for arm/windows -----=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/moddi3.c b/third_party/compiler_rt/moddi3.c index 2539b2cb4..53c45ff0f 100644 --- a/third_party/compiler_rt/moddi3.c +++ b/third_party/compiler_rt/moddi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- moddi3.c - Implement __moddi3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/modsi3.c b/third_party/compiler_rt/modsi3.c index 8fc16a414..4bd1469d7 100644 --- a/third_party/compiler_rt/modsi3.c +++ b/third_party/compiler_rt/modsi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- modsi3.c - Implement __modsi3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/modti3.c b/third_party/compiler_rt/modti3.c index aae613943..138ba973f 100644 --- a/third_party/compiler_rt/modti3.c +++ b/third_party/compiler_rt/modti3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- modti3.c - Implement __modti3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/muldc3.c b/third_party/compiler_rt/muldc3.c index 748d21fda..474c55383 100644 --- a/third_party/compiler_rt/muldc3.c +++ b/third_party/compiler_rt/muldc3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- muldc3.c - Implement __muldc3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/muldf3.c b/third_party/compiler_rt/muldf3.c index f64236544..ac8132228 100644 --- a/third_party/compiler_rt/muldf3.c +++ b/third_party/compiler_rt/muldf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/muldf3.c - Double-precision multiplication ------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/muldi3.c b/third_party/compiler_rt/muldi3.c index 8f894d27c..987c2594d 100644 --- a/third_party/compiler_rt/muldi3.c +++ b/third_party/compiler_rt/muldi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- muldi3.c - Implement __muldi3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/mulsc3.c b/third_party/compiler_rt/mulsc3.c index 5cd9be749..3e7fa7b2c 100644 --- a/third_party/compiler_rt/mulsc3.c +++ b/third_party/compiler_rt/mulsc3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- mulsc3.c - Implement __mulsc3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/mulsf3.c b/third_party/compiler_rt/mulsf3.c index 03405a2d8..c6d50e376 100644 --- a/third_party/compiler_rt/mulsf3.c +++ b/third_party/compiler_rt/mulsf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/mulsf3.c - Single-precision multiplication ------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/multi3.c b/third_party/compiler_rt/multi3.c index 46c044b16..a342932ca 100644 --- a/third_party/compiler_rt/multi3.c +++ b/third_party/compiler_rt/multi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- multi3.c - Implement __multi3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/mulxc3.c b/third_party/compiler_rt/mulxc3.c index f9d904c17..b46b7f9b9 100644 --- a/third_party/compiler_rt/mulxc3.c +++ b/third_party/compiler_rt/mulxc3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- mulxc3.c - Implement __mulxc3 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/negdf2.c b/third_party/compiler_rt/negdf2.c index 1800784d6..5656029db 100644 --- a/third_party/compiler_rt/negdf2.c +++ b/third_party/compiler_rt/negdf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/negdf2.c - double-precision negation ------------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/negdi2.c b/third_party/compiler_rt/negdi2.c index 8bfeccc36..364ffcbd1 100644 --- a/third_party/compiler_rt/negdi2.c +++ b/third_party/compiler_rt/negdi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- negdi2.c - Implement __negdi2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/negsf2.c b/third_party/compiler_rt/negsf2.c index 5e1e01c17..4175f1b19 100644 --- a/third_party/compiler_rt/negsf2.c +++ b/third_party/compiler_rt/negsf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/negsf2.c - single-precision negation ------------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/negti2.c b/third_party/compiler_rt/negti2.c index d6bfc97ad..7f5ecf70e 100644 --- a/third_party/compiler_rt/negti2.c +++ b/third_party/compiler_rt/negti2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- negti2.c - Implement __negti2 -------------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/nexgen32e/floatdidf.c b/third_party/compiler_rt/nexgen32e/floatdidf.c index 546d10317..d23bb8a48 100644 --- a/third_party/compiler_rt/nexgen32e/floatdidf.c +++ b/third_party/compiler_rt/nexgen32e/floatdidf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* This file is distributed under the University of Illinois Open Source * License. See LICENSE.TXT for details. */ diff --git a/third_party/compiler_rt/nexgen32e/floatdisf.c b/third_party/compiler_rt/nexgen32e/floatdisf.c index ccc05ab7a..8d7a6b69b 100644 --- a/third_party/compiler_rt/nexgen32e/floatdisf.c +++ b/third_party/compiler_rt/nexgen32e/floatdisf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* This file is distributed under the University of Illinois Open Source * License. See LICENSE.TXT for details. */ diff --git a/third_party/compiler_rt/nexgen32e/floatdixf.c b/third_party/compiler_rt/nexgen32e/floatdixf.c index 611e0b5aa..cf95302de 100644 --- a/third_party/compiler_rt/nexgen32e/floatdixf.c +++ b/third_party/compiler_rt/nexgen32e/floatdixf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* This file is distributed under the University of Illinois Open Source * License. See LICENSE.TXT for details. */ diff --git a/third_party/compiler_rt/os_version_check.c b/third_party/compiler_rt/os_version_check.c index 202fa80a4..273b8844e 100644 --- a/third_party/compiler_rt/os_version_check.c +++ b/third_party/compiler_rt/os_version_check.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- os_version_check.c - OS version checking -------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/paritydi2.c b/third_party/compiler_rt/paritydi2.c index 0203dc32d..b74e25ea3 100644 --- a/third_party/compiler_rt/paritydi2.c +++ b/third_party/compiler_rt/paritydi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- paritydi2.c - Implement __paritydi2 -------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/paritysi2.c b/third_party/compiler_rt/paritysi2.c index fe4c92da0..8cb7412ab 100644 --- a/third_party/compiler_rt/paritysi2.c +++ b/third_party/compiler_rt/paritysi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- paritysi2.c - Implement __paritysi2 -------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/parityti2.c b/third_party/compiler_rt/parityti2.c index 2452546e8..7905fa714 100644 --- a/third_party/compiler_rt/parityti2.c +++ b/third_party/compiler_rt/parityti2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- parityti2.c - Implement __parityti2 -------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/popcountdi2.c b/third_party/compiler_rt/popcountdi2.c index 05974b2e0..cef0d40e1 100644 --- a/third_party/compiler_rt/popcountdi2.c +++ b/third_party/compiler_rt/popcountdi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- popcountdi2.c - Implement __popcountdi2 ----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/popcountsi2.c b/third_party/compiler_rt/popcountsi2.c index bcebe49a3..3c3a3924f 100644 --- a/third_party/compiler_rt/popcountsi2.c +++ b/third_party/compiler_rt/popcountsi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- popcountsi2.c - Implement __popcountsi2 ---------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/popcountti2.c b/third_party/compiler_rt/popcountti2.c index 1d54829a8..5c8f9986e 100644 --- a/third_party/compiler_rt/popcountti2.c +++ b/third_party/compiler_rt/popcountti2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- popcountti2.c - Implement __popcountti2 ----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/powidf2.c b/third_party/compiler_rt/powidf2.c index 59d5bac63..9de9b6dbf 100644 --- a/third_party/compiler_rt/powidf2.c +++ b/third_party/compiler_rt/powidf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- powidf2.cpp - Implement __powidf2 ---------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/powisf2.c b/third_party/compiler_rt/powisf2.c index 28b420395..2975c251c 100644 --- a/third_party/compiler_rt/powisf2.c +++ b/third_party/compiler_rt/powisf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- powisf2.cpp - Implement __powisf2 ---------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/powitf2.c b/third_party/compiler_rt/powitf2.c index 8f2fa20d7..81303fdd8 100644 --- a/third_party/compiler_rt/powitf2.c +++ b/third_party/compiler_rt/powitf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- powitf2.cpp - Implement __powitf2 ---------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/powixf2.c b/third_party/compiler_rt/powixf2.c index 2c844cd64..1dcf9de6c 100644 --- a/third_party/compiler_rt/powixf2.c +++ b/third_party/compiler_rt/powixf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- powixf2.cpp - Implement __powixf2 ---------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/subdf3.c b/third_party/compiler_rt/subdf3.c index b969e26f9..0ca65280e 100644 --- a/third_party/compiler_rt/subdf3.c +++ b/third_party/compiler_rt/subdf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/adddf3.c - Double-precision subtraction ---------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/subsf3.c b/third_party/compiler_rt/subsf3.c index 2f9b57c9e..03c3e1b6b 100644 --- a/third_party/compiler_rt/subsf3.c +++ b/third_party/compiler_rt/subsf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/subsf3.c - Single-precision subtraction ---------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/subtf3.c b/third_party/compiler_rt/subtf3.c index 5dcf27f2c..1856b6819 100644 --- a/third_party/compiler_rt/subtf3.c +++ b/third_party/compiler_rt/subtf3.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/subtf3.c - Quad-precision subtraction -----------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/truncdfhf2.c b/third_party/compiler_rt/truncdfhf2.c index fd7b5a192..9ed6ff2fa 100644 --- a/third_party/compiler_rt/truncdfhf2.c +++ b/third_party/compiler_rt/truncdfhf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/truncdfhf2.c - double -> half conversion --------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/truncdfsf2.c b/third_party/compiler_rt/truncdfsf2.c index 84689fb49..b5ed8cfd3 100644 --- a/third_party/compiler_rt/truncdfsf2.c +++ b/third_party/compiler_rt/truncdfsf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/truncdfsf2.c - double -> single conversion ------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/truncsfhf2.c b/third_party/compiler_rt/truncsfhf2.c index 27105daa3..582ed089e 100644 --- a/third_party/compiler_rt/truncsfhf2.c +++ b/third_party/compiler_rt/truncsfhf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/truncsfhf2.c - single -> half conversion --------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/trunctfdf2.c b/third_party/compiler_rt/trunctfdf2.c index 59fa047fe..85401c7d4 100644 --- a/third_party/compiler_rt/trunctfdf2.c +++ b/third_party/compiler_rt/trunctfdf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/truncdfsf2.c - quad -> double conversion --------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/trunctfsf2.c b/third_party/compiler_rt/trunctfsf2.c index 89e8bd5bc..3ebda8151 100644 --- a/third_party/compiler_rt/trunctfsf2.c +++ b/third_party/compiler_rt/trunctfsf2.c @@ -1,4 +1,3 @@ -/* clang-format off */ //===-- lib/trunctfsf2.c - quad -> single conversion --------------*- C -*-===// // // The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ucmpdi2.c b/third_party/compiler_rt/ucmpdi2.c index 99f0b2c79..364fcbd43 100644 --- a/third_party/compiler_rt/ucmpdi2.c +++ b/third_party/compiler_rt/ucmpdi2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- ucmpdi2.c - Implement __ucmpdi2 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/ucmpti2.c b/third_party/compiler_rt/ucmpti2.c index 13cc81136..b912c89e6 100644 --- a/third_party/compiler_rt/ucmpti2.c +++ b/third_party/compiler_rt/ucmpti2.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- ucmpti2.c - Implement __ucmpti2 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/udivdi3.c b/third_party/compiler_rt/udivdi3.c index 5c472ade6..be9cdac3d 100644 --- a/third_party/compiler_rt/udivdi3.c +++ b/third_party/compiler_rt/udivdi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- udivdi3.c - Implement __udivdi3 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/udivmoddi4.c b/third_party/compiler_rt/udivmoddi4.c index 6bdc9f54a..ece017c47 100644 --- a/third_party/compiler_rt/udivmoddi4.c +++ b/third_party/compiler_rt/udivmoddi4.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- udivmoddi4.c - Implement __udivmoddi4 -----------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/udivmodsi4.c b/third_party/compiler_rt/udivmodsi4.c index 6124b3252..634d62cbf 100644 --- a/third_party/compiler_rt/udivmodsi4.c +++ b/third_party/compiler_rt/udivmodsi4.c @@ -1,4 +1,3 @@ -/* clang-format off */ /*===-- udivmodsi4.c - Implement __udivmodsi4 ------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/udivsi3.c b/third_party/compiler_rt/udivsi3.c index 04ccf17ac..b6e639354 100644 --- a/third_party/compiler_rt/udivsi3.c +++ b/third_party/compiler_rt/udivsi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- udivsi3.c - Implement __udivsi3 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/umoddi3.c b/third_party/compiler_rt/umoddi3.c index 750f8e31c..db0e72161 100644 --- a/third_party/compiler_rt/umoddi3.c +++ b/third_party/compiler_rt/umoddi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- umoddi3.c - Implement __umoddi3 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/umodsi3.c b/third_party/compiler_rt/umodsi3.c index 03ec8c929..851957bf0 100644 --- a/third_party/compiler_rt/umodsi3.c +++ b/third_party/compiler_rt/umodsi3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- umodsi3.c - Implement __umodsi3 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/compiler_rt/umodti3.c b/third_party/compiler_rt/umodti3.c index 7cc3a9ab2..7e5bef9dc 100644 --- a/third_party/compiler_rt/umodti3.c +++ b/third_party/compiler_rt/umodti3.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* ===-- umodti3.c - Implement __umodti3 -----------------------------------=== * * The LLVM Compiler Infrastructure diff --git a/third_party/ctags/COPYING b/third_party/ctags/COPYING index b201bfb03..60549be51 100644 --- a/third_party/ctags/COPYING +++ b/third_party/ctags/COPYING @@ -1,4 +1,3 @@ -// clang-format off GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/third_party/ctags/README.cosmo b/third_party/ctags/README.cosmo index a5e07ea21..58adf6fb9 100644 --- a/third_party/ctags/README.cosmo +++ b/third_party/ctags/README.cosmo @@ -1,4 +1,3 @@ -// clang-format off ORIGIN Debian 11 diff --git a/third_party/ctags/ant.c b/third_party/ctags/ant.c index e350a80b3..973e7384d 100644 --- a/third_party/ctags/ant.c +++ b/third_party/ctags/ant.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id$ * diff --git a/third_party/ctags/args.c b/third_party/ctags/args.c index 45b5ebeee..e8770d204 100644 --- a/third_party/ctags/args.c +++ b/third_party/ctags/args.c @@ -14,7 +14,6 @@ #include "third_party/ctags/args.h" #include "third_party/ctags/debug.h" #include "third_party/ctags/routines.h" -// clang-format off /* * FUNCTION DEFINITIONS diff --git a/third_party/ctags/args.h b/third_party/ctags/args.h index 436e11ff8..911418945 100644 --- a/third_party/ctags/args.h +++ b/third_party/ctags/args.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: args.h 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/asm.c b/third_party/ctags/asm.c index 8b3c31492..3b3cc3a40 100644 --- a/third_party/ctags/asm.c +++ b/third_party/ctags/asm.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: asm.c 536 2007-06-02 06:09:00Z elliotth $ * diff --git a/third_party/ctags/asp.c b/third_party/ctags/asp.c index cd1209f16..fd8d1df75 100644 --- a/third_party/ctags/asp.c +++ b/third_party/ctags/asp.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: asp.c 711 2009-07-04 16:52:11Z dhiebert $ * diff --git a/third_party/ctags/awk.c b/third_party/ctags/awk.c index 45b49afb3..ab4c17ca3 100644 --- a/third_party/ctags/awk.c +++ b/third_party/ctags/awk.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: awk.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/basic.c b/third_party/ctags/basic.c index c3b470579..b53b97b2b 100644 --- a/third_party/ctags/basic.c +++ b/third_party/ctags/basic.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id:$ * diff --git a/third_party/ctags/beta.c b/third_party/ctags/beta.c index 168ea0b24..08d1c3d4d 100644 --- a/third_party/ctags/beta.c +++ b/third_party/ctags/beta.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: beta.c 536 2007-06-02 06:09:00Z elliotth $ * diff --git a/third_party/ctags/c.c b/third_party/ctags/c.c index 515d3d1e3..cf2862ec4 100644 --- a/third_party/ctags/c.c +++ b/third_party/ctags/c.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: c.c 689 2008-12-13 21:17:36Z elliotth $ * diff --git a/third_party/ctags/cobol.c b/third_party/ctags/cobol.c index e49f43d65..e8dfd6f8f 100644 --- a/third_party/ctags/cobol.c +++ b/third_party/ctags/cobol.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: cobol.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/config.h b/third_party/ctags/config.h index a1a7309d8..dddfce663 100644 --- a/third_party/ctags/config.h +++ b/third_party/ctags/config.h @@ -1,4 +1,3 @@ -// clang-format off /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ diff --git a/third_party/ctags/ctags.h b/third_party/ctags/ctags.h index 40bb96dbd..a388486cc 100644 --- a/third_party/ctags/ctags.h +++ b/third_party/ctags/ctags.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: ctags.h 702 2009-03-14 03:52:21Z dhiebert $ * diff --git a/third_party/ctags/debug.c b/third_party/ctags/debug.c index cbba56c35..2a629e5d7 100644 --- a/third_party/ctags/debug.c +++ b/third_party/ctags/debug.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: debug.c 558 2007-06-15 19:17:02Z elliotth $ * diff --git a/third_party/ctags/debug.h b/third_party/ctags/debug.h index 810c904b4..218ebb7de 100644 --- a/third_party/ctags/debug.h +++ b/third_party/ctags/debug.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: debug.h 558 2007-06-15 19:17:02Z elliotth $ * diff --git a/third_party/ctags/dosbatch.c b/third_party/ctags/dosbatch.c index 27ddfac95..6aa44de39 100644 --- a/third_party/ctags/dosbatch.c +++ b/third_party/ctags/dosbatch.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id$ * diff --git a/third_party/ctags/eiffel.c b/third_party/ctags/eiffel.c index 1b6f56bb9..0a4d0042e 100644 --- a/third_party/ctags/eiffel.c +++ b/third_party/ctags/eiffel.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: eiffel.c 748 2009-11-06 02:44:42Z dhiebert $ * diff --git a/third_party/ctags/entry.c b/third_party/ctags/entry.c index 83d083268..c7791d6ad 100644 --- a/third_party/ctags/entry.c +++ b/third_party/ctags/entry.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: entry.c 766 2010-09-11 18:59:45Z dhiebert $ * diff --git a/third_party/ctags/entry.h b/third_party/ctags/entry.h index 413ba3516..dc1ae9bdd 100644 --- a/third_party/ctags/entry.h +++ b/third_party/ctags/entry.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: entry.h 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/erlang.c b/third_party/ctags/erlang.c index 768aabd85..c4844d5a7 100644 --- a/third_party/ctags/erlang.c +++ b/third_party/ctags/erlang.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: erlang.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/flex.c b/third_party/ctags/flex.c index cc2a27acd..dd02cd75a 100644 --- a/third_party/ctags/flex.c +++ b/third_party/ctags/flex.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: flex.c 666 2008-05-15 17:47:31Z dfishburn $ * diff --git a/third_party/ctags/fortran.c b/third_party/ctags/fortran.c index 652df20bd..4c238acc7 100644 --- a/third_party/ctags/fortran.c +++ b/third_party/ctags/fortran.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: fortran.c 660 2008-04-20 23:30:12Z elliotth $ * diff --git a/third_party/ctags/general.h b/third_party/ctags/general.h index 5bf70a43f..ca8c0c515 100644 --- a/third_party/ctags/general.h +++ b/third_party/ctags/general.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: general.h 508 2007-05-03 03:20:59Z dhiebert $ * diff --git a/third_party/ctags/get.c b/third_party/ctags/get.c index 23b8637d2..7e938c98f 100644 --- a/third_party/ctags/get.c +++ b/third_party/ctags/get.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: get.c 559 2007-06-17 03:30:09Z elliotth $ * diff --git a/third_party/ctags/get.h b/third_party/ctags/get.h index 9b09d9c70..421c7e81b 100644 --- a/third_party/ctags/get.h +++ b/third_party/ctags/get.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: get.h 525 2007-05-28 01:50:41Z elliotth $ * diff --git a/third_party/ctags/go.c b/third_party/ctags/go.c index f3ee35050..6d2de2b46 100644 --- a/third_party/ctags/go.c +++ b/third_party/ctags/go.c @@ -1,4 +1,3 @@ -// clang-format off /* * INCLUDE FILES */ diff --git a/third_party/ctags/html.c b/third_party/ctags/html.c index cc6733507..d5358d354 100644 --- a/third_party/ctags/html.c +++ b/third_party/ctags/html.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: html.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/jscript.c b/third_party/ctags/jscript.c index 719aeb98e..c8bf53917 100644 --- a/third_party/ctags/jscript.c +++ b/third_party/ctags/jscript.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: jscript.c 763 2010-07-28 14:22:42Z dfishburn $ * diff --git a/third_party/ctags/keyword.c b/third_party/ctags/keyword.c index e54e5d465..0dd43daf8 100644 --- a/third_party/ctags/keyword.c +++ b/third_party/ctags/keyword.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: keyword.c 715 2009-07-06 03:31:00Z dhiebert $ * diff --git a/third_party/ctags/keyword.h b/third_party/ctags/keyword.h index d8d317d74..c37dc52cf 100644 --- a/third_party/ctags/keyword.h +++ b/third_party/ctags/keyword.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: keyword.h 658 2008-04-20 23:21:35Z elliotth $ * diff --git a/third_party/ctags/lisp.c b/third_party/ctags/lisp.c index ee30900c3..8a47e7b20 100644 --- a/third_party/ctags/lisp.c +++ b/third_party/ctags/lisp.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: lisp.c 717 2009-07-07 03:40:50Z dhiebert $ * diff --git a/third_party/ctags/lregex.c b/third_party/ctags/lregex.c index 1bf6a645c..40a67907d 100644 --- a/third_party/ctags/lregex.c +++ b/third_party/ctags/lregex.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: lregex.c 747 2009-11-06 02:33:37Z dhiebert $ * diff --git a/third_party/ctags/lua.c b/third_party/ctags/lua.c index 5958b6605..47c9d5893 100644 --- a/third_party/ctags/lua.c +++ b/third_party/ctags/lua.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: lua.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/main.c b/third_party/ctags/main.c index 4559abbc1..286d49d83 100644 --- a/third_party/ctags/main.c +++ b/third_party/ctags/main.c @@ -31,7 +31,6 @@ #include "third_party/ctags/options.h" #include "third_party/ctags/read.h" #include "third_party/ctags/routines.h" -// clang-format off /* * MACROS diff --git a/third_party/ctags/main.h b/third_party/ctags/main.h index eb8e96658..db6315047 100644 --- a/third_party/ctags/main.h +++ b/third_party/ctags/main.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: main.h 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/make.c b/third_party/ctags/make.c index 410a271a6..794560cbf 100644 --- a/third_party/ctags/make.c +++ b/third_party/ctags/make.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: make.c 751 2010-02-27 17:41:57Z elliotth $ * diff --git a/third_party/ctags/matlab.c b/third_party/ctags/matlab.c index 9dfb193ad..ec4f3cd6a 100644 --- a/third_party/ctags/matlab.c +++ b/third_party/ctags/matlab.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id$ * diff --git a/third_party/ctags/objc.c b/third_party/ctags/objc.c index 664436033..600ba3c4c 100644 --- a/third_party/ctags/objc.c +++ b/third_party/ctags/objc.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2010, Vincent Berthoux diff --git a/third_party/ctags/ocaml.c b/third_party/ctags/ocaml.c index fbae12755..cdfe969b0 100644 --- a/third_party/ctags/ocaml.c +++ b/third_party/ctags/ocaml.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2009, Vincent Berthoux * diff --git a/third_party/ctags/options.c b/third_party/ctags/options.c index 0f259ac67..fb97ab4f1 100644 --- a/third_party/ctags/options.c +++ b/third_party/ctags/options.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: options.c 576 2007-06-30 04:16:23Z elliotth $ * diff --git a/third_party/ctags/options.h b/third_party/ctags/options.h index b11b2e0e8..bfc2ea2cd 100644 --- a/third_party/ctags/options.h +++ b/third_party/ctags/options.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: options.h 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/parse.c b/third_party/ctags/parse.c index 692d57e93..84cd8869f 100644 --- a/third_party/ctags/parse.c +++ b/third_party/ctags/parse.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: parse.c 597 2007-07-31 05:35:30Z dhiebert $ * diff --git a/third_party/ctags/parse.h b/third_party/ctags/parse.h index 38f4edc9e..6579833af 100644 --- a/third_party/ctags/parse.h +++ b/third_party/ctags/parse.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: parse.h 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/parsers.h b/third_party/ctags/parsers.h index 650117211..3a24d6e09 100644 --- a/third_party/ctags/parsers.h +++ b/third_party/ctags/parsers.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: parsers.h 771 2010-11-30 13:15:12Z vberthoux $ * diff --git a/third_party/ctags/pascal.c b/third_party/ctags/pascal.c index c1eed45d6..9ffc2834f 100644 --- a/third_party/ctags/pascal.c +++ b/third_party/ctags/pascal.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: pascal.c 536 2007-06-02 06:09:00Z elliotth $ * diff --git a/third_party/ctags/perl.c b/third_party/ctags/perl.c index e6d2007a3..4fda42f3c 100644 --- a/third_party/ctags/perl.c +++ b/third_party/ctags/perl.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: perl.c 601 2007-08-02 04:45:16Z perlguy0 $ * diff --git a/third_party/ctags/php.c b/third_party/ctags/php.c index 231a5ac45..f2afd4af1 100644 --- a/third_party/ctags/php.c +++ b/third_party/ctags/php.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: php.c 734 2009-08-20 23:33:54Z jafl $ * diff --git a/third_party/ctags/python.c b/third_party/ctags/python.c index b35cb688f..7bdf3baf2 100644 --- a/third_party/ctags/python.c +++ b/third_party/ctags/python.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: python.c 752 2010-02-27 17:52:46Z elliotth $ * diff --git a/third_party/ctags/read.c b/third_party/ctags/read.c index 2d1c5bd95..521413fd6 100644 --- a/third_party/ctags/read.c +++ b/third_party/ctags/read.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: read.c 769 2010-09-11 21:00:16Z dhiebert $ * diff --git a/third_party/ctags/read.h b/third_party/ctags/read.h index 88ad04697..aa94370ac 100644 --- a/third_party/ctags/read.h +++ b/third_party/ctags/read.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: read.h 769 2010-09-11 21:00:16Z dhiebert $ * diff --git a/third_party/ctags/readtags.c b/third_party/ctags/readtags.c index c3d6037ce..a6c56642d 100644 --- a/third_party/ctags/readtags.c +++ b/third_party/ctags/readtags.c @@ -15,7 +15,6 @@ #include "libc/stdio/stdio.h" #include "libc/str/str.h" #include "third_party/ctags/readtags.h" -// clang-format off /* * MACROS diff --git a/third_party/ctags/readtags.h b/third_party/ctags/readtags.h index 14a789069..724f250ad 100644 --- a/third_party/ctags/readtags.h +++ b/third_party/ctags/readtags.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: readtags.h 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/rexx.c b/third_party/ctags/rexx.c index d1fa03c67..192bc4c67 100644 --- a/third_party/ctags/rexx.c +++ b/third_party/ctags/rexx.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: rexx.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/routines.c b/third_party/ctags/routines.c index 5710a587e..f1b8cb2f3 100644 --- a/third_party/ctags/routines.c +++ b/third_party/ctags/routines.c @@ -20,7 +20,6 @@ #include "third_party/ctags/config.h" #include "third_party/ctags/debug.h" #include "third_party/ctags/routines.h" -// clang-format off /* * Miscellaneous macros diff --git a/third_party/ctags/routines.h b/third_party/ctags/routines.h index e4d0d7a8c..98305ee65 100644 --- a/third_party/ctags/routines.h +++ b/third_party/ctags/routines.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: routines.h 536 2007-06-02 06:09:00Z elliotth $ * diff --git a/third_party/ctags/ruby.c b/third_party/ctags/ruby.c index d0409c8d5..89569449f 100644 --- a/third_party/ctags/ruby.c +++ b/third_party/ctags/ruby.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: ruby.c 571 2007-06-24 23:32:14Z elliotth $ * diff --git a/third_party/ctags/scheme.c b/third_party/ctags/scheme.c index 9da44cfc1..152efcdbc 100644 --- a/third_party/ctags/scheme.c +++ b/third_party/ctags/scheme.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: scheme.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/sh.c b/third_party/ctags/sh.c index d18377dba..130cca513 100644 --- a/third_party/ctags/sh.c +++ b/third_party/ctags/sh.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: sh.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/slang.c b/third_party/ctags/slang.c index df5d4a3fe..fa168c429 100644 --- a/third_party/ctags/slang.c +++ b/third_party/ctags/slang.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: slang.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/sml.c b/third_party/ctags/sml.c index 965ec7c0b..d9a460eac 100644 --- a/third_party/ctags/sml.c +++ b/third_party/ctags/sml.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: sml.c 536 2007-06-02 06:09:00Z elliotth $ * diff --git a/third_party/ctags/sort.c b/third_party/ctags/sort.c index ff70e1afc..8f12faa99 100644 --- a/third_party/ctags/sort.c +++ b/third_party/ctags/sort.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: sort.c 747 2009-11-06 02:33:37Z dhiebert $ * diff --git a/third_party/ctags/sort.h b/third_party/ctags/sort.h index 1c9575714..15e12e035 100644 --- a/third_party/ctags/sort.h +++ b/third_party/ctags/sort.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: sort.h 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/sql.c b/third_party/ctags/sql.c index 150d5c919..161c4a416 100644 --- a/third_party/ctags/sql.c +++ b/third_party/ctags/sql.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: sql.c 761 2010-06-04 12:40:28Z dfishburn $ * diff --git a/third_party/ctags/strlist.c b/third_party/ctags/strlist.c index d56eb019a..523f1621c 100644 --- a/third_party/ctags/strlist.c +++ b/third_party/ctags/strlist.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: strlist.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/strlist.h b/third_party/ctags/strlist.h index 74780878a..5eb644b36 100644 --- a/third_party/ctags/strlist.h +++ b/third_party/ctags/strlist.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: strlist.h 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/tcl.c b/third_party/ctags/tcl.c index c32e12015..600a23742 100644 --- a/third_party/ctags/tcl.c +++ b/third_party/ctags/tcl.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: tcl.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/ctags/tex.c b/third_party/ctags/tex.c index b41e8f6de..f881aee59 100644 --- a/third_party/ctags/tex.c +++ b/third_party/ctags/tex.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: tex.c 666 2008-05-15 17:47:31Z dfishburn $ * diff --git a/third_party/ctags/verilog.c b/third_party/ctags/verilog.c index 7cae04426..705175d2f 100644 --- a/third_party/ctags/verilog.c +++ b/third_party/ctags/verilog.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: verilog.c 753 2010-02-27 17:53:32Z elliotth $ * diff --git a/third_party/ctags/vhdl.c b/third_party/ctags/vhdl.c index 00d04f4df..a6c8016fa 100644 --- a/third_party/ctags/vhdl.c +++ b/third_party/ctags/vhdl.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: vhdl.c 652 2008-04-18 03:51:47Z elliotth $ * diff --git a/third_party/ctags/vim.c b/third_party/ctags/vim.c index 60a632a57..d2c0009b1 100644 --- a/third_party/ctags/vim.c +++ b/third_party/ctags/vim.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: vim.c 762 2010-07-28 11:38:19Z dfishburn $ * diff --git a/third_party/ctags/vstring.c b/third_party/ctags/vstring.c index d4ffbf255..cc92117e6 100644 --- a/third_party/ctags/vstring.c +++ b/third_party/ctags/vstring.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: vstring.c 558 2007-06-15 19:17:02Z elliotth $ * diff --git a/third_party/ctags/vstring.h b/third_party/ctags/vstring.h index 45a9baa25..636d31a4e 100644 --- a/third_party/ctags/vstring.h +++ b/third_party/ctags/vstring.h @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: vstring.h 719 2009-07-07 03:46:59Z dhiebert $ * diff --git a/third_party/ctags/yacc.c b/third_party/ctags/yacc.c index 526d4569b..b768b56d9 100644 --- a/third_party/ctags/yacc.c +++ b/third_party/ctags/yacc.c @@ -1,4 +1,3 @@ -// clang-format off /* * $Id: yacc.c 443 2006-05-30 04:37:13Z darren $ * diff --git a/third_party/dlmalloc/binmaps.inc b/third_party/dlmalloc/binmaps.inc index 4f2871050..c6283b2f8 100644 --- a/third_party/dlmalloc/binmaps.inc +++ b/third_party/dlmalloc/binmaps.inc @@ -1,4 +1,3 @@ -// clang-format off /* ------------------------ Operations on bin maps ----------------------- */ diff --git a/third_party/dlmalloc/chunks.inc b/third_party/dlmalloc/chunks.inc index fba93739e..d7f97d87f 100644 --- a/third_party/dlmalloc/chunks.inc +++ b/third_party/dlmalloc/chunks.inc @@ -1,4 +1,3 @@ -// clang-format off /* ------------------- Chunks sizes and alignments ----------------------- */ diff --git a/third_party/dlmalloc/debugging.inc b/third_party/dlmalloc/debugging.inc index 8882d01b1..2a4958329 100644 --- a/third_party/dlmalloc/debugging.inc +++ b/third_party/dlmalloc/debugging.inc @@ -1,4 +1,3 @@ -// clang-format off /* -------------------------- Debugging setup ---------------------------- */ diff --git a/third_party/dlmalloc/debuglib.inc b/third_party/dlmalloc/debuglib.inc index 0ee741401..ec7370f67 100644 --- a/third_party/dlmalloc/debuglib.inc +++ b/third_party/dlmalloc/debuglib.inc @@ -1,4 +1,3 @@ -// clang-format off #if DEBUG /* ------------------------- Debugging Support --------------------------- */ diff --git a/third_party/dlmalloc/directmap.inc b/third_party/dlmalloc/directmap.inc index a1f2d60fc..2e313e31e 100644 --- a/third_party/dlmalloc/directmap.inc +++ b/third_party/dlmalloc/directmap.inc @@ -1,4 +1,3 @@ -// clang-format off /* ----------------------- Direct-mmapping chunks ----------------------- */ diff --git a/third_party/dlmalloc/dlmalloc.c b/third_party/dlmalloc/dlmalloc.c index 7f9f738f8..356f72b04 100644 --- a/third_party/dlmalloc/dlmalloc.c +++ b/third_party/dlmalloc/dlmalloc.c @@ -24,7 +24,6 @@ #include "libc/thread/tls.h" #include "third_party/dlmalloc/vespene.internal.h" #include "third_party/nsync/mu.h" -// clang-format off #define FOOTERS 0 #define MSPACES 0 diff --git a/third_party/dlmalloc/dlmalloc.h b/third_party/dlmalloc/dlmalloc.h index 0669cf58a..5ef2d1be6 100644 --- a/third_party/dlmalloc/dlmalloc.h +++ b/third_party/dlmalloc/dlmalloc.h @@ -25,7 +25,6 @@ #define dlrealloc_in_place __dlrealloc_in_place #define dlrealloc_in_place __dlrealloc_in_place -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* @@ -510,5 +509,4 @@ void dlmalloc_atfork(void); void dlmalloc_abort(void) relegated wontreturn; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_DLMALLOC_DLMALLOC_H_ */ diff --git a/third_party/dlmalloc/global.inc b/third_party/dlmalloc/global.inc index 89dcd221f..2c58592ce 100644 --- a/third_party/dlmalloc/global.inc +++ b/third_party/dlmalloc/global.inc @@ -1,4 +1,3 @@ -// clang-format off /* ------------- Global malloc_state and malloc_params ------------------- */ diff --git a/third_party/dlmalloc/headfoot.inc b/third_party/dlmalloc/headfoot.inc index e2fa31d76..4da5ad206 100644 --- a/third_party/dlmalloc/headfoot.inc +++ b/third_party/dlmalloc/headfoot.inc @@ -1,4 +1,3 @@ -// clang-format off /* ------------------ Operations on head and foot fields ----------------- */ diff --git a/third_party/dlmalloc/hooks.inc b/third_party/dlmalloc/hooks.inc index 179c7cdaa..d691a7eff 100644 --- a/third_party/dlmalloc/hooks.inc +++ b/third_party/dlmalloc/hooks.inc @@ -1,4 +1,3 @@ -// clang-format off /* ------------------------------- Hooks -------------------------------- */ diff --git a/third_party/dlmalloc/indexing.inc b/third_party/dlmalloc/indexing.inc index bac2eaf4a..63abfe81d 100644 --- a/third_party/dlmalloc/indexing.inc +++ b/third_party/dlmalloc/indexing.inc @@ -1,4 +1,3 @@ -// clang-format off /* ---------------------------- Indexing Bins ---------------------------- */ diff --git a/third_party/dlmalloc/init.inc b/third_party/dlmalloc/init.inc index 4c6114953..b635d84bf 100644 --- a/third_party/dlmalloc/init.inc +++ b/third_party/dlmalloc/init.inc @@ -1,4 +1,3 @@ -// clang-format off /* ---------------------------- setting mparams -------------------------- */ diff --git a/third_party/dlmalloc/locks.inc b/third_party/dlmalloc/locks.inc index a53d5fb59..8eab25ece 100644 --- a/third_party/dlmalloc/locks.inc +++ b/third_party/dlmalloc/locks.inc @@ -1,4 +1,3 @@ -// clang-format off /* --------------------------- Lock preliminaries ------------------------ */ diff --git a/third_party/dlmalloc/management.inc b/third_party/dlmalloc/management.inc index e53d9a42e..5e865d2d5 100644 --- a/third_party/dlmalloc/management.inc +++ b/third_party/dlmalloc/management.inc @@ -1,4 +1,3 @@ -// clang-format off /* -------------------------- mspace management -------------------------- */ diff --git a/third_party/dlmalloc/mspaces.inc b/third_party/dlmalloc/mspaces.inc index 2fc5c8638..a9355d29a 100644 --- a/third_party/dlmalloc/mspaces.inc +++ b/third_party/dlmalloc/mspaces.inc @@ -1,5 +1,4 @@ #include "third_party/dlmalloc/dlmalloc.h" -// clang-format off static mstate init_user_mstate(char* tbase, size_t tsize) { size_t msize = pad_request(sizeof(struct malloc_state)); diff --git a/third_party/dlmalloc/platform.inc b/third_party/dlmalloc/platform.inc index 355d68eba..25c80f416 100644 --- a/third_party/dlmalloc/platform.inc +++ b/third_party/dlmalloc/platform.inc @@ -1,4 +1,3 @@ -// clang-format off #define LACKS_UNISTD_H #define LACKS_FCNTL_H diff --git a/third_party/dlmalloc/runtimechecks.inc b/third_party/dlmalloc/runtimechecks.inc index 71aa4caaf..df3fd226c 100644 --- a/third_party/dlmalloc/runtimechecks.inc +++ b/third_party/dlmalloc/runtimechecks.inc @@ -1,4 +1,3 @@ -// clang-format off /* ----------------------- Runtime Check Support ------------------------- */ diff --git a/third_party/dlmalloc/smallbins.inc b/third_party/dlmalloc/smallbins.inc index bca9320bd..2d893aa9d 100644 --- a/third_party/dlmalloc/smallbins.inc +++ b/third_party/dlmalloc/smallbins.inc @@ -1,4 +1,3 @@ -// clang-format off /* ----------------------- Operations on smallbins ----------------------- */ diff --git a/third_party/dlmalloc/statistics.inc b/third_party/dlmalloc/statistics.inc index 6df79d0b6..37d93ada8 100644 --- a/third_party/dlmalloc/statistics.inc +++ b/third_party/dlmalloc/statistics.inc @@ -1,4 +1,3 @@ -// clang-format off /* ----------------------------- statistics ------------------------------ */ diff --git a/third_party/dlmalloc/system.inc b/third_party/dlmalloc/system.inc index b6b7145aa..b8fc6ab79 100644 --- a/third_party/dlmalloc/system.inc +++ b/third_party/dlmalloc/system.inc @@ -1,4 +1,3 @@ -// clang-format off /* -------------------------- system alloc setup ------------------------- */ diff --git a/third_party/dlmalloc/trees.inc b/third_party/dlmalloc/trees.inc index e04fa2f17..f89dad4e7 100644 --- a/third_party/dlmalloc/trees.inc +++ b/third_party/dlmalloc/trees.inc @@ -1,4 +1,3 @@ -// clang-format off /* ------------------------- Operations on trees ------------------------- */ diff --git a/third_party/dlmalloc/vespene.internal.h b/third_party/dlmalloc/vespene.internal.h index 6c4445999..b8cc2a08e 100644 --- a/third_party/dlmalloc/vespene.internal.h +++ b/third_party/dlmalloc/vespene.internal.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_DLMALLOC_VESPENE_INTERNAL_H_ #define COSMOPOLITAN_THIRD_PARTY_DLMALLOC_VESPENE_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *dlmalloc_requires_more_vespene_gas(size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_DLMALLOC_VESPENE_INTERNAL_H_ */ diff --git a/third_party/double-conversion/bignum-dtoa.cc b/third_party/double-conversion/bignum-dtoa.cc index b4731bbaf..5b9325158 100644 --- a/third_party/double-conversion/bignum-dtoa.cc +++ b/third_party/double-conversion/bignum-dtoa.cc @@ -28,7 +28,6 @@ #include "third_party/double-conversion/bignum.h" #include "third_party/double-conversion/ieee.h" #include "third_party/libcxx/cmath" -// clang-format off asm(".ident\t\"\\n\\n\ double-conversion (BSD-3 License)\\n\ diff --git a/third_party/double-conversion/bignum-dtoa.h b/third_party/double-conversion/bignum-dtoa.h index 363a07a8c..393f29b40 100644 --- a/third_party/double-conversion/bignum-dtoa.h +++ b/third_party/double-conversion/bignum-dtoa.h @@ -2,7 +2,6 @@ #ifndef DOUBLE_CONVERSION_BIGNUM_DTOA_H_ #define DOUBLE_CONVERSION_BIGNUM_DTOA_H_ #include "third_party/double-conversion/utils.h" -// clang-format off namespace double_conversion { diff --git a/third_party/double-conversion/bignum.cc b/third_party/double-conversion/bignum.cc index fa60c7ecd..62853945a 100644 --- a/third_party/double-conversion/bignum.cc +++ b/third_party/double-conversion/bignum.cc @@ -28,7 +28,6 @@ #include "third_party/double-conversion/utils.h" #include "third_party/libcxx/algorithm" #include "third_party/libcxx/cstring" -// clang-format off asm(".ident\t\"\\n\\n\ double-conversion (BSD-3 License)\\n\ diff --git a/third_party/double-conversion/bignum.h b/third_party/double-conversion/bignum.h index 6777d912c..27bb13de3 100644 --- a/third_party/double-conversion/bignum.h +++ b/third_party/double-conversion/bignum.h @@ -2,7 +2,6 @@ #ifndef DOUBLE_CONVERSION_BIGNUM_H_ #define DOUBLE_CONVERSION_BIGNUM_H_ #include "third_party/double-conversion/utils.h" -// clang-format off namespace double_conversion { diff --git a/third_party/double-conversion/cached-powers.cc b/third_party/double-conversion/cached-powers.cc index 84145f414..18253cfc4 100644 --- a/third_party/double-conversion/cached-powers.cc +++ b/third_party/double-conversion/cached-powers.cc @@ -29,7 +29,6 @@ #include "third_party/libcxx/climits" #include "third_party/libcxx/cmath" #include "third_party/libcxx/cstdarg" -// clang-format off asm(".ident\t\"\\n\\n\ double-conversion (BSD-3 License)\\n\ diff --git a/third_party/double-conversion/cached-powers.h b/third_party/double-conversion/cached-powers.h index 301befa40..ee08a21a2 100644 --- a/third_party/double-conversion/cached-powers.h +++ b/third_party/double-conversion/cached-powers.h @@ -2,7 +2,6 @@ #ifndef DOUBLE_CONVERSION_CACHED_POWERS_H_ #define DOUBLE_CONVERSION_CACHED_POWERS_H_ #include "third_party/double-conversion/diy-fp.h" -// clang-format off namespace double_conversion { diff --git a/third_party/double-conversion/diy-fp.h b/third_party/double-conversion/diy-fp.h index 4bb2a39d6..20e769d72 100644 --- a/third_party/double-conversion/diy-fp.h +++ b/third_party/double-conversion/diy-fp.h @@ -2,7 +2,6 @@ #ifndef DOUBLE_CONVERSION_DIY_FP_H_ #define DOUBLE_CONVERSION_DIY_FP_H_ #include "third_party/double-conversion/utils.h" -// clang-format off namespace double_conversion { diff --git a/third_party/double-conversion/double-to-string.cc b/third_party/double-conversion/double-to-string.cc index 88be6c942..a58a5c925 100644 --- a/third_party/double-conversion/double-to-string.cc +++ b/third_party/double-conversion/double-to-string.cc @@ -33,7 +33,6 @@ #include "third_party/libcxx/algorithm" #include "third_party/libcxx/climits" #include "third_party/libcxx/cmath" -// clang-format off asm(".ident\t\"\\n\\n\ double-conversion (BSD-3 License)\\n\ diff --git a/third_party/double-conversion/double-to-string.h b/third_party/double-conversion/double-to-string.h index 76607fc9f..853c8aae3 100644 --- a/third_party/double-conversion/double-to-string.h +++ b/third_party/double-conversion/double-to-string.h @@ -2,7 +2,6 @@ #ifndef DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ #define DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ #include "third_party/double-conversion/utils.h" -// clang-format off namespace double_conversion { diff --git a/third_party/double-conversion/fast-dtoa.cc b/third_party/double-conversion/fast-dtoa.cc index bdee254df..60195c26d 100644 --- a/third_party/double-conversion/fast-dtoa.cc +++ b/third_party/double-conversion/fast-dtoa.cc @@ -28,7 +28,6 @@ #include "third_party/double-conversion/diy-fp.h" #include "third_party/double-conversion/fast-dtoa.h" #include "third_party/double-conversion/ieee.h" -// clang-format off asm(".ident\t\"\\n\\n\ double-conversion (BSD-3 License)\\n\ diff --git a/third_party/double-conversion/fast-dtoa.h b/third_party/double-conversion/fast-dtoa.h index da649621a..ad4162c71 100644 --- a/third_party/double-conversion/fast-dtoa.h +++ b/third_party/double-conversion/fast-dtoa.h @@ -2,7 +2,6 @@ #ifndef DOUBLE_CONVERSION_FAST_DTOA_H_ #define DOUBLE_CONVERSION_FAST_DTOA_H_ #include "third_party/double-conversion/utils.h" -// clang-format off namespace double_conversion { diff --git a/third_party/double-conversion/fixed-dtoa.cc b/third_party/double-conversion/fixed-dtoa.cc index 8f91cb60c..cca64aca7 100644 --- a/third_party/double-conversion/fixed-dtoa.cc +++ b/third_party/double-conversion/fixed-dtoa.cc @@ -27,7 +27,6 @@ #include "third_party/double-conversion/fixed-dtoa.h" #include "third_party/double-conversion/ieee.h" #include "third_party/libcxx/cmath" -// clang-format off asm(".ident\t\"\\n\\n\ double-conversion (BSD-3 License)\\n\ diff --git a/third_party/double-conversion/fixed-dtoa.h b/third_party/double-conversion/fixed-dtoa.h index 10b9659b1..086953078 100644 --- a/third_party/double-conversion/fixed-dtoa.h +++ b/third_party/double-conversion/fixed-dtoa.h @@ -2,7 +2,6 @@ #ifndef DOUBLE_CONVERSION_FIXED_DTOA_H_ #define DOUBLE_CONVERSION_FIXED_DTOA_H_ #include "third_party/double-conversion/utils.h" -// clang-format off namespace double_conversion { diff --git a/third_party/double-conversion/ieee.h b/third_party/double-conversion/ieee.h index 49a1595d1..a333f8bf6 100644 --- a/third_party/double-conversion/ieee.h +++ b/third_party/double-conversion/ieee.h @@ -2,7 +2,6 @@ #ifndef DOUBLE_CONVERSION_DOUBLE_H_ #define DOUBLE_CONVERSION_DOUBLE_H_ #include "third_party/double-conversion/diy-fp.h" -// clang-format off namespace double_conversion { diff --git a/third_party/double-conversion/string-to-double.cc b/third_party/double-conversion/string-to-double.cc index d35d9b7f3..0d88f2d60 100644 --- a/third_party/double-conversion/string-to-double.cc +++ b/third_party/double-conversion/string-to-double.cc @@ -31,7 +31,6 @@ #include "third_party/libcxx/climits" #include "third_party/libcxx/cmath" #include "third_party/libcxx/locale" -// clang-format off asm(".ident\t\"\\n\\n\ double-conversion (BSD-3 License)\\n\ diff --git a/third_party/double-conversion/strtod.cc b/third_party/double-conversion/strtod.cc index 34a927464..9c00ef19c 100644 --- a/third_party/double-conversion/strtod.cc +++ b/third_party/double-conversion/strtod.cc @@ -30,7 +30,6 @@ #include "third_party/double-conversion/strtod.h" #include "third_party/libcxx/climits" #include "third_party/libcxx/cstdarg" -// clang-format off asm(".ident\t\"\\n\\n\ double-conversion (BSD-3 License)\\n\ diff --git a/third_party/double-conversion/strtod.h b/third_party/double-conversion/strtod.h index a1cf6adfb..812d8919a 100644 --- a/third_party/double-conversion/strtod.h +++ b/third_party/double-conversion/strtod.h @@ -2,7 +2,6 @@ #ifndef DOUBLE_CONVERSION_STRTOD_H_ #define DOUBLE_CONVERSION_STRTOD_H_ #include "third_party/double-conversion/utils.h" -// clang-format off namespace double_conversion { diff --git a/third_party/double-conversion/test/cctest.cc b/third_party/double-conversion/test/cctest.cc index eaa696bf7..a3eda8467 100644 --- a/third_party/double-conversion/test/cctest.cc +++ b/third_party/double-conversion/test/cctest.cc @@ -25,7 +25,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "third_party/double-conversion/test/cctest.h" -// clang-format off CcTest* CcTest::last_ = NULL; diff --git a/third_party/double-conversion/test/cctest.h b/third_party/double-conversion/test/cctest.h index a77473a36..0ab162b76 100644 --- a/third_party/double-conversion/test/cctest.h +++ b/third_party/double-conversion/test/cctest.h @@ -27,7 +27,6 @@ #ifndef CCTEST_H_ #define CCTEST_H_ #include "third_party/double-conversion/utils.h" -// clang-format off #ifndef TEST #define TEST(Name) \ diff --git a/third_party/double-conversion/test/checks.h b/third_party/double-conversion/test/checks.h index 6314ae8c8..2b7fe9e3f 100644 --- a/third_party/double-conversion/test/checks.h +++ b/third_party/double-conversion/test/checks.h @@ -27,7 +27,6 @@ #ifndef V8_CHECKS_H_ #define V8_CHECKS_H_ //#include "third_party/double-conversion/test/flags.h" -// clang-format off extern "C" void V8_Fatal(const char* file, int line, const char* format, ...); void API_Fatal(const char* location, const char* format, ...); diff --git a/third_party/double-conversion/test/gay-fixed.cc b/third_party/double-conversion/test/gay-fixed.cc index aa9fea7ca..838be1236 100644 --- a/third_party/double-conversion/test/gay-fixed.cc +++ b/third_party/double-conversion/test/gay-fixed.cc @@ -1,4 +1,3 @@ -// clang-format off // Copyright 2010 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/third_party/double-conversion/test/gay-precision.cc b/third_party/double-conversion/test/gay-precision.cc index 68714ca4b..503773b0a 100644 --- a/third_party/double-conversion/test/gay-precision.cc +++ b/third_party/double-conversion/test/gay-precision.cc @@ -1,4 +1,3 @@ -// clang-format off // Copyright 2010 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/third_party/double-conversion/test/gay-shortest-single.cc b/third_party/double-conversion/test/gay-shortest-single.cc index 20c570b8a..66e139def 100644 --- a/third_party/double-conversion/test/gay-shortest-single.cc +++ b/third_party/double-conversion/test/gay-shortest-single.cc @@ -1,4 +1,3 @@ -// clang-format off // Copyright 2011 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/third_party/double-conversion/test/gay-shortest.cc b/third_party/double-conversion/test/gay-shortest.cc index 1b018b507..81b47ab87 100644 --- a/third_party/double-conversion/test/gay-shortest.cc +++ b/third_party/double-conversion/test/gay-shortest.cc @@ -1,4 +1,3 @@ -// clang-format off // Copyright 2006-2008 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/third_party/double-conversion/test/test-bignum-dtoa.cc b/third_party/double-conversion/test/test-bignum-dtoa.cc index 0877a6d83..ca4bde065 100644 --- a/third_party/double-conversion/test/test-bignum-dtoa.cc +++ b/third_party/double-conversion/test/test-bignum-dtoa.cc @@ -32,7 +32,6 @@ #include "third_party/double-conversion/test/gay-shortest-single.h" #include "third_party/double-conversion/test/gay-shortest.h" #include "third_party/double-conversion/utils.h" -// clang-format off using namespace double_conversion; diff --git a/third_party/double-conversion/test/test-bignum.cc b/third_party/double-conversion/test/test-bignum.cc index 3b2642137..32ecab567 100644 --- a/third_party/double-conversion/test/test-bignum.cc +++ b/third_party/double-conversion/test/test-bignum.cc @@ -27,7 +27,6 @@ #include "third_party/double-conversion/bignum.h" #include "third_party/double-conversion/test/cctest.h" #include "third_party/double-conversion/utils.h" -// clang-format off using namespace double_conversion; diff --git a/third_party/double-conversion/test/test-conversions.cc b/third_party/double-conversion/test/test-conversions.cc index 9d229d71a..1479f9252 100644 --- a/third_party/double-conversion/test/test-conversions.cc +++ b/third_party/double-conversion/test/test-conversions.cc @@ -28,7 +28,6 @@ #include "third_party/double-conversion/ieee.h" #include "third_party/double-conversion/test/cctest.h" #include "third_party/double-conversion/utils.h" -// clang-format off // DoubleToString is already tested in test-dtoa.cc. diff --git a/third_party/double-conversion/test/test-diy-fp.cc b/third_party/double-conversion/test/test-diy-fp.cc index 3706e0e3c..24b4bc3db 100644 --- a/third_party/double-conversion/test/test-diy-fp.cc +++ b/third_party/double-conversion/test/test-diy-fp.cc @@ -27,7 +27,6 @@ #include "third_party/double-conversion/diy-fp.h" #include "third_party/double-conversion/test/cctest.h" #include "third_party/double-conversion/utils.h" -// clang-format off using namespace double_conversion; diff --git a/third_party/double-conversion/test/test-dtoa.cc b/third_party/double-conversion/test/test-dtoa.cc index d8e7a6eac..d4a04c6b3 100644 --- a/third_party/double-conversion/test/test-dtoa.cc +++ b/third_party/double-conversion/test/test-dtoa.cc @@ -31,7 +31,6 @@ #include "third_party/double-conversion/test/gay-precision.h" #include "third_party/double-conversion/test/gay-shortest-single.h" #include "third_party/double-conversion/test/gay-shortest.h" -// clang-format off using namespace double_conversion; diff --git a/third_party/double-conversion/test/test-fast-dtoa.cc b/third_party/double-conversion/test/test-fast-dtoa.cc index 9ad949e5e..b581fca4f 100644 --- a/third_party/double-conversion/test/test-fast-dtoa.cc +++ b/third_party/double-conversion/test/test-fast-dtoa.cc @@ -32,7 +32,6 @@ #include "third_party/double-conversion/test/gay-shortest-single.h" #include "third_party/double-conversion/test/gay-shortest.h" #include "third_party/double-conversion/utils.h" -// clang-format off using namespace double_conversion; diff --git a/third_party/double-conversion/test/test-fixed-dtoa.cc b/third_party/double-conversion/test/test-fixed-dtoa.cc index cc6178186..901406262 100644 --- a/third_party/double-conversion/test/test-fixed-dtoa.cc +++ b/third_party/double-conversion/test/test-fixed-dtoa.cc @@ -29,7 +29,6 @@ #include "third_party/double-conversion/test/cctest.h" #include "third_party/double-conversion/test/gay-fixed.h" #include "third_party/double-conversion/utils.h" -// clang-format off using namespace double_conversion; diff --git a/third_party/double-conversion/test/test-ieee.cc b/third_party/double-conversion/test/test-ieee.cc index 5c6700fd9..ec6027657 100644 --- a/third_party/double-conversion/test/test-ieee.cc +++ b/third_party/double-conversion/test/test-ieee.cc @@ -29,7 +29,6 @@ #include "third_party/double-conversion/test/cctest.h" #include "third_party/double-conversion/utils.h" #include "third_party/libcxx/limits" -// clang-format off using namespace double_conversion; diff --git a/third_party/double-conversion/test/test-strtod.cc b/third_party/double-conversion/test/test-strtod.cc index 35e0bee45..a41388f28 100644 --- a/third_party/double-conversion/test/test-strtod.cc +++ b/third_party/double-conversion/test/test-strtod.cc @@ -30,7 +30,6 @@ #include "third_party/double-conversion/strtod.h" #include "third_party/double-conversion/test/cctest.h" #include "third_party/double-conversion/utils.h" -// clang-format off using namespace double_conversion; diff --git a/third_party/double-conversion/utils.h b/third_party/double-conversion/utils.h index 81718ae6c..9b2a5cb02 100644 --- a/third_party/double-conversion/utils.h +++ b/third_party/double-conversion/utils.h @@ -7,7 +7,6 @@ #include "third_party/libcxx/cassert" #include "third_party/libcxx/cstdlib" #include "third_party/libcxx/cstring" -// clang-format off // [jart] use undefined behaavior to make code tinier // use ubsan build mode to troubleshoot errors diff --git a/third_party/double-conversion/wrapper.cc b/third_party/double-conversion/wrapper.cc index c29402003..3b34a6e7e 100644 --- a/third_party/double-conversion/wrapper.cc +++ b/third_party/double-conversion/wrapper.cc @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/double-conversion/wrapper.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/str/str.h" #include "third_party/double-conversion/double-conversion.h" #include "third_party/double-conversion/double-to-string.h" diff --git a/third_party/double-conversion/wrapper.h b/third_party/double-conversion/wrapper.h index 84a47b689..911f5a667 100644 --- a/third_party/double-conversion/wrapper.h +++ b/third_party/double-conversion/wrapper.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_DOUBLE_CONVERSION_WRAPPER_H_ #define COSMOPOLITAN_THIRD_PARTY_DOUBLE_CONVERSION_WRAPPER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *DoubleToLua(char[128], double); @@ -9,5 +8,4 @@ char *DoubleToEcmascript(char[128], double); double StringToDouble(const char *, size_t, int *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_DOUBLE_CONVERSION_WRAPPER_H_ */ diff --git a/third_party/finger/display.c b/third_party/finger/display.c index 78faecad4..7353a364a 100644 --- a/third_party/finger/display.c +++ b/third_party/finger/display.c @@ -42,7 +42,6 @@ #include "libc/sysv/consts/fileno.h" #include "libc/sysv/consts/termios.h" #include "third_party/finger/finger.h" -// clang-format off int getscreenwidth(void) diff --git a/third_party/finger/finger.c b/third_party/finger/finger.c index 0972414ae..c9e828918 100644 --- a/third_party/finger/finger.c +++ b/third_party/finger/finger.c @@ -50,7 +50,6 @@ #include "libc/time/time.h" #include "third_party/getopt/getopt.internal.h" #include "third_party/musl/passwd.h" -// clang-format off /* * Mail status reporting added 931007 by Luke Mewburn, . diff --git a/third_party/finger/finger.h b/third_party/finger/finger.h index 5bb17aa02..83d38b5e9 100644 --- a/third_party/finger/finger.h +++ b/third_party/finger/finger.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. diff --git a/third_party/finger/lprint.c b/third_party/finger/lprint.c index 3a9220028..e7a26d12c 100644 --- a/third_party/finger/lprint.c +++ b/third_party/finger/lprint.c @@ -43,7 +43,6 @@ #include "libc/time/struct/tm.h" #include "libc/time/time.h" #include "third_party/finger/finger.h" -// clang-format off /* * from: @(#)lprint.c 5.13 (Berkeley) 10/31/90 diff --git a/third_party/finger/net.c b/third_party/finger/net.c index ead55d7f2..b043a1922 100644 --- a/third_party/finger/net.c +++ b/third_party/finger/net.c @@ -42,7 +42,6 @@ #include "libc/sysv/consts/af.h" #include "libc/sysv/consts/sock.h" #include "third_party/finger/finger.h" -// clang-format off #ifndef lint /*static char sccsid[] = "from: @(#)net.c 5.5 (Berkeley) 6/1/90";*/ diff --git a/third_party/finger/sprint.c b/third_party/finger/sprint.c index c5ffc95cd..66bc491f0 100644 --- a/third_party/finger/sprint.c +++ b/third_party/finger/sprint.c @@ -40,7 +40,6 @@ #include "libc/time/struct/tm.h" #include "libc/time/time.h" #include "third_party/finger/finger.h" -// clang-format off #ifndef lint /*static char sccsid[] = "from: @(#)sprint.c 5.8 (Berkeley) 12/4/90";*/ diff --git a/third_party/finger/util.c b/third_party/finger/util.c index b1853a1f0..14a544d64 100644 --- a/third_party/finger/util.c +++ b/third_party/finger/util.c @@ -44,7 +44,6 @@ #include "libc/str/str.h" #include "libc/sysv/consts/o.h" #include "third_party/finger/finger.h" -// clang-format off #ifndef lint /*static char sccsid[] = "from: @(#)util.c 5.14 (Berkeley) 1/17/91";*/ diff --git a/third_party/gdtoa/dmisc.c b/third_party/gdtoa/dmisc.c index 2d6f4ebb9..928314b45 100644 --- a/third_party/gdtoa/dmisc.c +++ b/third_party/gdtoa/dmisc.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ void freedtoa(char *s) diff --git a/third_party/gdtoa/dtoa.c b/third_party/gdtoa/dtoa.c index 170ebabc9..8d3aa058a 100644 --- a/third_party/gdtoa/dtoa.c +++ b/third_party/gdtoa/dtoa.c @@ -31,7 +31,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/fenv.h" #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ /* dtoa for IEEE arithmetic (dmg): convert double to ASCII string. * diff --git a/third_party/gdtoa/g_Qfmt_p.c b/third_party/gdtoa/g_Qfmt_p.c index b53705271..90b2fb228 100644 --- a/third_party/gdtoa/g_Qfmt_p.c +++ b/third_party/gdtoa/g_Qfmt_p.c @@ -32,7 +32,6 @@ #include "libc/str/str.h" #include "third_party/gdtoa/gdtoa.h" #include "third_party/gdtoa/gdtoa.internal.h" -// clang-format off /** * Converts quadruple-precision floating-point number to string. diff --git a/third_party/gdtoa/g__fmt.c b/third_party/gdtoa/g__fmt.c index 20f4b5c2a..1e923f171 100644 --- a/third_party/gdtoa/g__fmt.c +++ b/third_party/gdtoa/g__fmt.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ #define dlen 0 #define HEXDIG "0123456789abcdef" diff --git a/third_party/gdtoa/g_ddfmt.c b/third_party/gdtoa/g_ddfmt.c index 9746c6459..7d4a73f1e 100644 --- a/third_party/gdtoa/g_ddfmt.c +++ b/third_party/gdtoa/g_ddfmt.c @@ -31,7 +31,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/runtime/fenv.h" #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ char * g_ddfmt(char *buf, double *dd0, int ndig, size_t bufsize) diff --git a/third_party/gdtoa/g_ddfmt_p.c b/third_party/gdtoa/g_ddfmt_p.c index 8cd4bbdde..baa391ff2 100644 --- a/third_party/gdtoa/g_ddfmt_p.c +++ b/third_party/gdtoa/g_ddfmt_p.c @@ -32,7 +32,6 @@ #include "libc/runtime/fenv.h" #include "libc/str/str.h" #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ extern ULong __gdtoa_NanDflt_d[2]; diff --git a/third_party/gdtoa/g_dfmt.c b/third_party/gdtoa/g_dfmt.c index a78b4cfc0..b7f78c157 100644 --- a/third_party/gdtoa/g_dfmt.c +++ b/third_party/gdtoa/g_dfmt.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ char* g_dfmt(char *buf, double *d, int ndig, size_t bufsize) diff --git a/third_party/gdtoa/g_dfmt_p.c b/third_party/gdtoa/g_dfmt_p.c index 36e9f67f3..b9f6380b9 100644 --- a/third_party/gdtoa/g_dfmt_p.c +++ b/third_party/gdtoa/g_dfmt_p.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ extern ULong __gdtoa_NanDflt_d[2]; diff --git a/third_party/gdtoa/g_ffmt.c b/third_party/gdtoa/g_ffmt.c index 7c76b9bd5..33c7a2286 100644 --- a/third_party/gdtoa/g_ffmt.c +++ b/third_party/gdtoa/g_ffmt.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ char* g_ffmt(char *buf, float *f, int ndig, size_t bufsize) diff --git a/third_party/gdtoa/g_ffmt_p.c b/third_party/gdtoa/g_ffmt_p.c index 68e0243b9..12e1250bc 100644 --- a/third_party/gdtoa/g_ffmt_p.c +++ b/third_party/gdtoa/g_ffmt_p.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ extern ULong __gdtoa_NanDflt_f[1]; diff --git a/third_party/gdtoa/g_xfmt.c b/third_party/gdtoa/g_xfmt.c index 14f01e0f0..0e50324db 100644 --- a/third_party/gdtoa/g_xfmt.c +++ b/third_party/gdtoa/g_xfmt.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ char* g_xfmt(char *buf, void *V, int ndig, size_t bufsize) diff --git a/third_party/gdtoa/g_xfmt_p.c b/third_party/gdtoa/g_xfmt_p.c index c22704248..8b9d5fed7 100644 --- a/third_party/gdtoa/g_xfmt_p.c +++ b/third_party/gdtoa/g_xfmt_p.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ extern UShort __gdtoa_NanDflt_ldus[5]; diff --git a/third_party/gdtoa/gdtoa.c b/third_party/gdtoa/gdtoa.c index e5e1c637b..b6753b1e1 100644 --- a/third_party/gdtoa/gdtoa.c +++ b/third_party/gdtoa/gdtoa.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ static Bigint * bitstob(ULong *bits, int nbits, int *bbits, ThInfo **PTI) diff --git a/third_party/gdtoa/gdtoa.h b/third_party/gdtoa/gdtoa.h index 222827e1f..cc8e3a7cc 100644 --- a/third_party/gdtoa/gdtoa.h +++ b/third_party/gdtoa/gdtoa.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GDTOA_GDTOA_H_ #define COSMOPOLITAN_THIRD_PARTY_GDTOA_GDTOA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define dtoa __dtoa @@ -135,5 +134,4 @@ int strtopx(const char *, char **, void *); int strtopxL(const char *, char **, void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GDTOA_GDTOA_H_ */ diff --git a/third_party/gdtoa/gdtoa_fltrnds.inc b/third_party/gdtoa/gdtoa_fltrnds.inc index 8023aa03d..cb973e85b 100644 --- a/third_party/gdtoa/gdtoa_fltrnds.inc +++ b/third_party/gdtoa/gdtoa_fltrnds.inc @@ -1,4 +1,3 @@ -/* clang-format off */ FPI fpi1; int Rounding; diff --git a/third_party/gdtoa/gethex.c b/third_party/gdtoa/gethex.c index 0a20063da..d6fec497b 100644 --- a/third_party/gdtoa/gethex.c +++ b/third_party/gdtoa/gethex.c @@ -31,7 +31,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/errno.h" #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ int __gdtoa_gethex(const char **sp, const FPI *fpi, diff --git a/third_party/gdtoa/gmisc.c b/third_party/gdtoa/gmisc.c index 0271e9c16..914f71ece 100644 --- a/third_party/gdtoa/gmisc.c +++ b/third_party/gdtoa/gmisc.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ void __gdtoa_rshift(Bigint *b, int k) diff --git a/third_party/gdtoa/hexnan.c b/third_party/gdtoa/hexnan.c index ecb80169f..4858ef19b 100644 --- a/third_party/gdtoa/hexnan.c +++ b/third_party/gdtoa/hexnan.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ static void L_shift(ULong *x, ULong *x1, int i) diff --git a/third_party/gdtoa/misc.c b/third_party/gdtoa/misc.c index 441b91a15..733c6a4f7 100644 --- a/third_party/gdtoa/misc.c +++ b/third_party/gdtoa/misc.c @@ -35,7 +35,6 @@ #include "libc/thread/thread.h" #include "libc/thread/tls.h" #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ static ThInfo TI0; static pthread_mutex_t __gdtoa_lock_obj; diff --git a/third_party/gdtoa/smisc.c b/third_party/gdtoa/smisc.c index 60ce43d4b..cff632dc8 100644 --- a/third_party/gdtoa/smisc.c +++ b/third_party/gdtoa/smisc.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ Bigint * __gdtoa_s2b(const char *s, int nd0, int nd, ULong y9, int dplen, ThInfo **PTI) diff --git a/third_party/gdtoa/strtoId.c b/third_party/gdtoa/strtoId.c index 7681429d7..42c16f155 100644 --- a/third_party/gdtoa/strtoId.c +++ b/third_party/gdtoa/strtoId.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ int strtoId(const char *s, char **sp, double *f0, double *f1) diff --git a/third_party/gdtoa/strtoIdd.c b/third_party/gdtoa/strtoIdd.c index d892687ab..6b3597355 100644 --- a/third_party/gdtoa/strtoIdd.c +++ b/third_party/gdtoa/strtoIdd.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ int strtoIdd(const char *s, char **sp, double *f0, double *f1) diff --git a/third_party/gdtoa/strtoIf.c b/third_party/gdtoa/strtoIf.c index 8d9995e52..e028f58ac 100644 --- a/third_party/gdtoa/strtoIf.c +++ b/third_party/gdtoa/strtoIf.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ int strtoIf(const char *s, char **sp, float *f0, float *f1) diff --git a/third_party/gdtoa/strtoIg.c b/third_party/gdtoa/strtoIg.c index 2abfe2047..bed531df2 100644 --- a/third_party/gdtoa/strtoIg.c +++ b/third_party/gdtoa/strtoIg.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ int __gdtoa_strtoIg(const char *s00, char **se, const FPI *fpi, Long *exp, Bigint **B, int *rvp) diff --git a/third_party/gdtoa/strtoIx.c b/third_party/gdtoa/strtoIx.c index 4f4e4d6a3..9a7098506 100644 --- a/third_party/gdtoa/strtoIx.c +++ b/third_party/gdtoa/strtoIx.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ int strtoIx(const char *s, char **sp, void *a, void *b) diff --git a/third_party/gdtoa/strtod.c b/third_party/gdtoa/strtod.c index 6597bc061..224a41e4b 100644 --- a/third_party/gdtoa/strtod.c +++ b/third_party/gdtoa/strtod.c @@ -33,7 +33,6 @@ #include "libc/fmt/conv.h" #include "libc/runtime/fenv.h" #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ #define Avoid_Underflow #define dplen 1 diff --git a/third_party/gdtoa/strtodI.c b/third_party/gdtoa/strtodI.c index 8a4ae9e97..68727643f 100644 --- a/third_party/gdtoa/strtodI.c +++ b/third_party/gdtoa/strtodI.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ static double __gdtoa_ulpdown(U *d) diff --git a/third_party/gdtoa/strtodg.c b/third_party/gdtoa/strtodg.c index f6d003417..75f3e8a96 100644 --- a/third_party/gdtoa/strtodg.c +++ b/third_party/gdtoa/strtodg.c @@ -31,7 +31,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/errno.h" #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ static const int fivesbits[] = { 0, 3, 5, 7, 10, 12, 14, 17, 19, 21, diff --git a/third_party/gdtoa/strtof.c b/third_party/gdtoa/strtof.c index d0248b9e2..d1ba9412e 100644 --- a/third_party/gdtoa/strtof.c +++ b/third_party/gdtoa/strtof.c @@ -32,7 +32,6 @@ #include "libc/fmt/conv.h" #include "third_party/gdtoa/gdtoa.h" #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ float strtof(const char *s, char **sp) diff --git a/third_party/gdtoa/strtopd.c b/third_party/gdtoa/strtopd.c index cfdcbf1b3..e8bc554bd 100644 --- a/third_party/gdtoa/strtopd.c +++ b/third_party/gdtoa/strtopd.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ int strtopd(const char *s, char **sp, double *d) diff --git a/third_party/gdtoa/strtopdd.c b/third_party/gdtoa/strtopdd.c index e5c9661e0..b34b45b85 100644 --- a/third_party/gdtoa/strtopdd.c +++ b/third_party/gdtoa/strtopdd.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ int strtopdd(const char *s, char **sp, double *dd) diff --git a/third_party/gdtoa/strtopf.c b/third_party/gdtoa/strtopf.c index 40e6c73c9..3334a6137 100644 --- a/third_party/gdtoa/strtopf.c +++ b/third_party/gdtoa/strtopf.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ int strtopf(const char *s, char **sp, float *f) diff --git a/third_party/gdtoa/strtopx.c b/third_party/gdtoa/strtopx.c index 664720a01..764076c37 100644 --- a/third_party/gdtoa/strtopx.c +++ b/third_party/gdtoa/strtopx.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ extern UShort __gdtoa_NanDflt_ldus[5]; diff --git a/third_party/gdtoa/strtord.c b/third_party/gdtoa/strtord.c index e94afec6c..60125d882 100644 --- a/third_party/gdtoa/strtord.c +++ b/third_party/gdtoa/strtord.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ extern ULong __gdtoa_NanDflt_d[2]; diff --git a/third_party/gdtoa/strtordd.c b/third_party/gdtoa/strtordd.c index e73d7668b..b746eecc6 100644 --- a/third_party/gdtoa/strtordd.c +++ b/third_party/gdtoa/strtordd.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ extern ULong __gdtoa_NanDflt_d[2]; diff --git a/third_party/gdtoa/strtorf.c b/third_party/gdtoa/strtorf.c index bcf5564d6..85edfb6c9 100644 --- a/third_party/gdtoa/strtorf.c +++ b/third_party/gdtoa/strtorf.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ extern ULong __gdtoa_NanDflt_f[1]; diff --git a/third_party/gdtoa/strtorx.c b/third_party/gdtoa/strtorx.c index 15ed37edc..0eb60800c 100644 --- a/third_party/gdtoa/strtorx.c +++ b/third_party/gdtoa/strtorx.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ extern UShort __gdtoa_NanDflt_ldus[5]; diff --git a/third_party/gdtoa/sum.c b/third_party/gdtoa/sum.c index de34fd9a0..746f42c4c 100644 --- a/third_party/gdtoa/sum.c +++ b/third_party/gdtoa/sum.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ Bigint * __gdtoa_sum(Bigint *a, Bigint *b, ThInfo **PTI) diff --git a/third_party/gdtoa/ulp.c b/third_party/gdtoa/ulp.c index d4d8218eb..89b325cfb 100644 --- a/third_party/gdtoa/ulp.c +++ b/third_party/gdtoa/ulp.c @@ -30,7 +30,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/gdtoa/gdtoa.internal.h" -/* clang-format off */ double __gdtoa_ulp(U *x) diff --git a/third_party/getopt/getopt.internal.h b/third_party/getopt/getopt.internal.h index 1af7e09dd..9ef787473 100644 --- a/third_party/getopt/getopt.internal.h +++ b/third_party/getopt/getopt.internal.h @@ -11,7 +11,6 @@ #define optreset __optreset #define getopt __getopt -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern char *optarg; @@ -20,5 +19,4 @@ extern int optind, opterr, optopt, optreset; int getopt(int, char *const[], const char *) paramsnonnull(); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_GETOPT_H_ */ diff --git a/third_party/getopt/getsubopt.c b/third_party/getopt/getsubopt.c index f836f05c6..35cbe8365 100644 --- a/third_party/getopt/getsubopt.c +++ b/third_party/getopt/getsubopt.c @@ -29,7 +29,6 @@ │ SUCH DAMAGE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -// clang-format off /* * The SVID interface to getsubopt provides no way of figuring out which diff --git a/third_party/getopt/long.c b/third_party/getopt/long.c index 913867a84..923d24da0 100644 --- a/third_party/getopt/long.c +++ b/third_party/getopt/long.c @@ -3,7 +3,6 @@ #include "libc/str/str.h" #include "third_party/getopt/long1.h" #include "third_party/getopt/long2.h" -// clang-format off /* $OpenBSD: getopt_long.c,v 1.32 2020/05/27 22:25:09 schwarze Exp $ */ /* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ diff --git a/third_party/getopt/long1.h b/third_party/getopt/long1.h index 9e8ebc8d0..0f9ffb407 100755 --- a/third_party/getopt/long1.h +++ b/third_party/getopt/long1.h @@ -3,7 +3,6 @@ #ifdef COSMOPOLITAN_GETOPT_H_ #error "don't mix getopt_long() with cosmo's getopt()" #endif -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern char *optarg; @@ -12,5 +11,4 @@ extern int optind, opterr, optopt, optreset; int getopt(int, char *const *, const char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _GETOPT_CORE_H */ diff --git a/third_party/getopt/long2.h b/third_party/getopt/long2.h index 5e7f6e8f2..f9e470b59 100644 --- a/third_party/getopt/long2.h +++ b/third_party/getopt/long2.h @@ -8,7 +8,6 @@ #define required_argument 1 #define optional_argument 2 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct option { @@ -23,5 +22,4 @@ int getopt_long_only(int, char *const *, const char *, const struct option *, int *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* _GETOPT_EXT_H */ diff --git a/third_party/ggml/common.cc b/third_party/ggml/common.cc index 2f8e1d04c..16057413e 100644 --- a/third_party/ggml/common.cc +++ b/third_party/ggml/common.cc @@ -51,7 +51,6 @@ asm(".ident\t\"\\n\\n\ llama.cpp (MIT License)\\n\ Copyright (c) 2023 Georgi Gerganov\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off static std::string replace_all(std::string const& original, std::string const& before, diff --git a/third_party/ggml/common.h b/third_party/ggml/common.h index 78851bbeb..bcd95ba1f 100644 --- a/third_party/ggml/common.h +++ b/third_party/ggml/common.h @@ -10,8 +10,6 @@ #include "third_party/libcxx/thread" #include "third_party/libcxx/unordered_map" #include "third_party/libcxx/vector" -#if !(__ASSEMBLER__ + __LINKER__ + 0) -// clang-format off // Various helper functions and utilities // @@ -133,5 +131,4 @@ void win32_console_init(bool enable_color); void win32_utf8_encode(const std::wstring & wstr, std::string & str); #endif -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_COMMON_H_ */ diff --git a/third_party/ggml/fp16.c b/third_party/ggml/fp16.c index 262047d65..ea7e30e30 100644 --- a/third_party/ggml/fp16.c +++ b/third_party/ggml/fp16.c @@ -35,7 +35,6 @@ asm(".ident\t\"\\n\\n\ GGML (MIT License)\\n\ Copyright (c) 2023 Georgi Gerganov\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off #if defined(__ARM_NEON) || defined(__wasm_simd128__) #define B1(c,s,n) 0x ## n ## c , 0x ## n ## s diff --git a/third_party/ggml/fp16.h b/third_party/ggml/fp16.h index c544a242b..fed6941bb 100644 --- a/third_party/ggml/fp16.h +++ b/third_party/ggml/fp16.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_F16_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_F16_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #ifdef __ARM_NEON @@ -20,5 +19,4 @@ void ggml_fp16_to_fp32_row(const ggml_fp16_t* x, float* y, size_t n); void ggml_fp32_to_fp16_row(const float* x, ggml_fp16_t* y, size_t n); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_F16_H_ */ diff --git a/third_party/ggml/fp16.internal.h b/third_party/ggml/fp16.internal.h index b59e28825..821370333 100644 --- a/third_party/ggml/fp16.internal.h +++ b/third_party/ggml/fp16.internal.h @@ -5,7 +5,6 @@ #include "third_party/ggml/fp16.h" #include "third_party/intel/immintrin.internal.h" #include "third_party/libcxx/math.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define GGML_GELU_FP16 @@ -28,7 +27,6 @@ inline static void ggml_vec_gelu_f16(const int n, ggml_fp16_t* y, } } -// clang-format off // 16-bit float // on Arm, we use __fp16 @@ -188,5 +186,4 @@ inline static float ggml_lookup_fp16_to_fp32(ggml_fp16_t f) { COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_FP16_INTERNAL_H_ */ diff --git a/third_party/ggml/ggjt.v1.c b/third_party/ggml/ggjt.v1.c index d242e569f..7858395da 100644 --- a/third_party/ggml/ggjt.v1.c +++ b/third_party/ggml/ggjt.v1.c @@ -25,7 +25,6 @@ #include "third_party/ggml/ggjt.v1.q8_0.h" #include "third_party/ggml/ggjt.v1.q8_1.h" #include "third_party/ggml/ggml.h" -// clang-format off static const int ggjt_v1_blck_size[GGML_TYPE_COUNT] = { [GGML_TYPE_F32] = 1, diff --git a/third_party/ggml/ggjt.v1.internal.h b/third_party/ggml/ggjt.v1.internal.h index 5d0149eea..b593cb227 100644 --- a/third_party/ggml/ggjt.v1.internal.h +++ b/third_party/ggml/ggjt.v1.internal.h @@ -2,9 +2,7 @@ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_INTERNAL_H_ #include "libc/str/str.h" #include "third_party/intel/immintrin.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -// clang-format off #ifdef __AVX__ // horizontally add 8 floats @@ -130,5 +128,4 @@ static inline __m128i packNibbles( __m128i bytes1, __m128i bytes2 ) { #endif /* __AVX__ */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_INTERNAL_H_ */ diff --git a/third_party/ggml/ggjt.v1.q4_0.c b/third_party/ggml/ggjt.v1.q4_0.c index 43bc7fe32..d6ba29ded 100644 --- a/third_party/ggml/ggjt.v1.q4_0.c +++ b/third_party/ggml/ggjt.v1.q4_0.c @@ -34,7 +34,6 @@ #include "third_party/ggml/ggjt.v1.q8_0.h" #include "third_party/intel/immintrin.internal.h" #include "third_party/libcxx/math.h" -// clang-format off // quantization for the ggjt.v1.q4_0 file format diff --git a/third_party/ggml/ggjt.v1.q4_0.h b/third_party/ggml/ggjt.v1.q4_0.h index d67f5c51f..afcf85f22 100644 --- a/third_party/ggml/ggjt.v1.q4_0.h +++ b/third_party/ggml/ggjt.v1.q4_0.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_V1_Q4_0_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_V1_Q4_0_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V1_QK4_0 32 @@ -18,5 +17,4 @@ void ggml_vec_dot_v1_q4_0_q8_0(const int, float* restrict, const void* restrict, const void* restrict); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_V1_Q4_0_H_ */ diff --git a/third_party/ggml/ggjt.v1.q4_1.c b/third_party/ggml/ggjt.v1.q4_1.c index 925f528ed..d8ec1d721 100644 --- a/third_party/ggml/ggjt.v1.q4_1.c +++ b/third_party/ggml/ggjt.v1.q4_1.c @@ -35,7 +35,6 @@ #include "third_party/ggml/ggjt.v1.q8_1.h" #include "third_party/intel/immintrin.internal.h" #include "third_party/libcxx/math.h" -// clang-format off // quantization for the ggjt.v1.q4_1 file format diff --git a/third_party/ggml/ggjt.v1.q4_1.h b/third_party/ggml/ggjt.v1.q4_1.h index ef74d95d2..b7bf0cce3 100644 --- a/third_party/ggml/ggjt.v1.q4_1.h +++ b/third_party/ggml/ggjt.v1.q4_1.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_V1_Q4_1_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_V1_Q4_1_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V1_QK4_1 32 @@ -18,5 +17,4 @@ void ggml_vec_dot_v1_q4_1_q8_1(const int, float* restrict, const void* restrict, void quantize_row_v1_q4_1_reference(const float* restrict, void* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_V1_Q4_1_H_ */ diff --git a/third_party/ggml/ggjt.v1.q4_2.c b/third_party/ggml/ggjt.v1.q4_2.c index e1547f05e..f7706f2d5 100644 --- a/third_party/ggml/ggjt.v1.q4_2.c +++ b/third_party/ggml/ggjt.v1.q4_2.c @@ -35,7 +35,6 @@ #include "third_party/ggml/ggjt.v1.q8_0.h" #include "third_party/intel/immintrin.internal.h" #include "third_party/libcxx/math.h" -// clang-format off static_assert(sizeof(block_v1_q4_2) == sizeof(ggml_fp16_t) + V1_QK4_2 / 2, "wrong q4_2 block size/padding"); diff --git a/third_party/ggml/ggjt.v1.q4_2.h b/third_party/ggml/ggjt.v1.q4_2.h index 3f5d0c5b8..bf7d50a46 100644 --- a/third_party/ggml/ggjt.v1.q4_2.h +++ b/third_party/ggml/ggjt.v1.q4_2.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q4_2_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q4_2_H_ #include "third_party/ggml/fp16.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V1_QK4_2 16 @@ -19,5 +18,4 @@ void quantize_row_v1_q4_2_reference(const float* restrict, block_v1_q4_2* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q4_2_H_ */ diff --git a/third_party/ggml/ggjt.v1.q5_0.c b/third_party/ggml/ggjt.v1.q5_0.c index 41a509c68..9d4798edc 100644 --- a/third_party/ggml/ggjt.v1.q5_0.c +++ b/third_party/ggml/ggjt.v1.q5_0.c @@ -32,7 +32,6 @@ #include "third_party/ggml/fp16.internal.h" #include "third_party/ggml/ggjt.v1.internal.h" #include "third_party/ggml/ggjt.v1.q8_0.h" -// clang-format off static_assert(sizeof(block_v1_q5_0) == sizeof(ggml_fp16_t) + sizeof(uint32_t) + V1_QK5_0 / 2, diff --git a/third_party/ggml/ggjt.v1.q5_0.h b/third_party/ggml/ggjt.v1.q5_0.h index 13c06e31d..1fada094c 100644 --- a/third_party/ggml/ggjt.v1.q5_0.h +++ b/third_party/ggml/ggjt.v1.q5_0.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q5_0_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q5_0_H_ #include "third_party/ggml/fp16.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V1_QK5_0 32 @@ -20,5 +19,4 @@ void quantize_row_v1_q5_0_reference(const float* restrict, block_v1_q5_0* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q5_0_H_ */ diff --git a/third_party/ggml/ggjt.v1.q5_1.c b/third_party/ggml/ggjt.v1.q5_1.c index 0166ef859..1dc9dafb4 100644 --- a/third_party/ggml/ggjt.v1.q5_1.c +++ b/third_party/ggml/ggjt.v1.q5_1.c @@ -24,7 +24,6 @@ #include "third_party/ggml/fp16.internal.h" #include "third_party/ggml/ggjt.v1.internal.h" #include "third_party/ggml/ggjt.v1.q8_1.h" -// clang-format off static_assert(sizeof(block_v1_q5_1) == 2 * sizeof(ggml_fp16_t) + sizeof(uint32_t) + V1_QK5_1 / 2, diff --git a/third_party/ggml/ggjt.v1.q5_1.h b/third_party/ggml/ggjt.v1.q5_1.h index c335f060d..fe0e04a43 100644 --- a/third_party/ggml/ggjt.v1.q5_1.h +++ b/third_party/ggml/ggjt.v1.q5_1.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q5_1_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q5_1_H_ #include "third_party/ggml/fp16.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V1_QK5_1 32 @@ -21,5 +20,4 @@ void quantize_row_v1_q5_1_reference(const float* restrict, block_v1_q5_1* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q5_1_H_ */ diff --git a/third_party/ggml/ggjt.v1.q8_0.c b/third_party/ggml/ggjt.v1.q8_0.c index dbb9e529b..c3daf88cc 100644 --- a/third_party/ggml/ggjt.v1.q8_0.c +++ b/third_party/ggml/ggjt.v1.q8_0.c @@ -24,7 +24,6 @@ #include "third_party/ggml/ggjt.v1.q8_0.h" #include "third_party/intel/immintrin.internal.h" #include "third_party/libcxx/math.h" -// clang-format off static_assert(sizeof(block_v1_q8_0) == sizeof(float) + V1_QK8_0, "wrong q8_0 block size/padding"); diff --git a/third_party/ggml/ggjt.v1.q8_0.h b/third_party/ggml/ggjt.v1.q8_0.h index 54765da77..cd24242de 100644 --- a/third_party/ggml/ggjt.v1.q8_0.h +++ b/third_party/ggml/ggjt.v1.q8_0.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q8_0_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q8_0_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V1_QK8_0 32 @@ -18,5 +17,4 @@ void quantize_row_v1_q8_0_reference(const float* restrict, block_v1_q8_0* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q8_0_H_ */ diff --git a/third_party/ggml/ggjt.v1.q8_1.c b/third_party/ggml/ggjt.v1.q8_1.c index cb9abf9c8..2d02bd64b 100644 --- a/third_party/ggml/ggjt.v1.q8_1.c +++ b/third_party/ggml/ggjt.v1.q8_1.c @@ -23,7 +23,6 @@ #include "third_party/ggml/ggml.h" #include "third_party/intel/immintrin.internal.h" #include "third_party/libcxx/math.h" -// clang-format off static_assert(sizeof(block_v1_q8_1) == 3 * sizeof(float) + V1_QK8_1, "wrong q8_1 block size/padding"); diff --git a/third_party/ggml/ggjt.v1.q8_1.h b/third_party/ggml/ggjt.v1.q8_1.h index 47fe9ec15..ef27dbbc6 100644 --- a/third_party/ggml/ggjt.v1.q8_1.h +++ b/third_party/ggml/ggjt.v1.q8_1.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q8_1_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q8_1_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V1_QK8_1 32 @@ -16,5 +15,4 @@ void quantize_row_v1_q8_1_reference(const float* restrict, block_v1_q8_1* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V1_Q8_1_H_ */ diff --git a/third_party/ggml/ggjt.v2.c b/third_party/ggml/ggjt.v2.c index 3d2ad1da5..a5bdd8f16 100644 --- a/third_party/ggml/ggjt.v2.c +++ b/third_party/ggml/ggjt.v2.c @@ -24,7 +24,6 @@ #include "third_party/ggml/ggjt.v2.q8_0.h" #include "third_party/ggml/ggjt.v2.q8_1.h" #include "third_party/ggml/ggml.h" -// clang-format off static const int ggjt_v2_blck_size[GGML_TYPE_COUNT] = { [GGML_TYPE_F32] = 1, diff --git a/third_party/ggml/ggjt.v2.internal.h b/third_party/ggml/ggjt.v2.internal.h index c0bcfa037..d54ca527a 100644 --- a/third_party/ggml/ggjt.v2.internal.h +++ b/third_party/ggml/ggjt.v2.internal.h @@ -3,7 +3,6 @@ #include "libc/str/str.h" #include "third_party/aarch64/arm_neon.internal.h" #include "third_party/intel/immintrin.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if __AVX__ || __AVX2__ || __AVX512F__ @@ -148,5 +147,4 @@ static inline __m256i bytes_from_nibbles_32(const uint8_t *rsi) { #endif /* AVX */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_INTERNAL_H_ */ diff --git a/third_party/ggml/ggjt.v2.q4_0.c b/third_party/ggml/ggjt.v2.q4_0.c index 19f31fc41..0c16a7466 100644 --- a/third_party/ggml/ggjt.v2.q4_0.c +++ b/third_party/ggml/ggjt.v2.q4_0.c @@ -31,7 +31,6 @@ #include "libc/math.h" #include "third_party/ggml/ggjt.v2.internal.h" #include "third_party/ggml/ggjt.v2.q8_0.h" -// clang-format off static_assert(sizeof(block_v2_q4_0) == sizeof(float) + V2_QK4_0 / 2, "wrong q4_0 block size/padding"); diff --git a/third_party/ggml/ggjt.v2.q4_0.h b/third_party/ggml/ggjt.v2.q4_0.h index 48207bb07..6e26b1848 100644 --- a/third_party/ggml/ggjt.v2.q4_0.h +++ b/third_party/ggml/ggjt.v2.q4_0.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_V2_Q4_0_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_V2_Q4_0_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V2_QK4_0 32 @@ -18,5 +17,4 @@ void ggml_vec_dot_v2_q4_0_q8_0(const int, float* restrict, const void* restrict, const void* restrict); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_V2_Q4_0_H_ */ diff --git a/third_party/ggml/ggjt.v2.q4_1.c b/third_party/ggml/ggjt.v2.q4_1.c index ddc53fab1..69c15bc2b 100644 --- a/third_party/ggml/ggjt.v2.q4_1.c +++ b/third_party/ggml/ggjt.v2.q4_1.c @@ -31,7 +31,6 @@ #include "libc/math.h" #include "third_party/ggml/ggjt.v2.internal.h" #include "third_party/ggml/ggjt.v2.q8_1.h" -// clang-format off static_assert(sizeof(block_v2_q4_1) == 2 * sizeof(float) + V2_QK4_1 / 2, "wrong q4_1 block size/padding"); diff --git a/third_party/ggml/ggjt.v2.q4_1.h b/third_party/ggml/ggjt.v2.q4_1.h index 56a984143..74e931d42 100644 --- a/third_party/ggml/ggjt.v2.q4_1.h +++ b/third_party/ggml/ggjt.v2.q4_1.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_V2_Q4_1_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_V2_Q4_1_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V2_QK4_1 32 @@ -18,5 +17,4 @@ void ggml_vec_dot_v2_q4_1_q8_1(const int, float* restrict, const void* restrict, void quantize_row_v2_q4_1_reference(const float* restrict, void* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_V2_Q4_1_H_ */ diff --git a/third_party/ggml/ggjt.v2.q5_0.c b/third_party/ggml/ggjt.v2.q5_0.c index 4d80366f2..bc89a9ba6 100644 --- a/third_party/ggml/ggjt.v2.q5_0.c +++ b/third_party/ggml/ggjt.v2.q5_0.c @@ -34,7 +34,6 @@ #include "third_party/ggml/fp16.internal.h" #include "third_party/ggml/ggjt.v2.internal.h" #include "third_party/ggml/ggjt.v2.q8_0.h" -// clang-format off static_assert(sizeof(block_v2_q5_0) == sizeof(ggml_fp16_t) + sizeof(uint32_t) + V2_QK5_0 / 2, "wrong q5_0 block size/padding"); diff --git a/third_party/ggml/ggjt.v2.q5_0.h b/third_party/ggml/ggjt.v2.q5_0.h index 54be059a1..e34379f7e 100644 --- a/third_party/ggml/ggjt.v2.q5_0.h +++ b/third_party/ggml/ggjt.v2.q5_0.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q5_0_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q5_0_H_ #include "third_party/ggml/fp16.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V2_QK5_0 32 @@ -20,5 +19,4 @@ void quantize_row_v2_q5_0_reference(const float* restrict, block_v2_q5_0* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q5_0_H_ */ diff --git a/third_party/ggml/ggjt.v2.q5_1.c b/third_party/ggml/ggjt.v2.q5_1.c index 584640eff..cdb3e5b45 100644 --- a/third_party/ggml/ggjt.v2.q5_1.c +++ b/third_party/ggml/ggjt.v2.q5_1.c @@ -32,7 +32,6 @@ #include "third_party/ggml/fp16.internal.h" #include "third_party/ggml/ggjt.v2.internal.h" #include "third_party/ggml/ggjt.v2.q8_1.h" -// clang-format off static_assert(sizeof(block_v2_q5_1) == 2 * sizeof(ggml_fp16_t) + sizeof(uint32_t) + V2_QK5_1 / 2, "wrong q5_1 block size/padding"); diff --git a/third_party/ggml/ggjt.v2.q5_1.h b/third_party/ggml/ggjt.v2.q5_1.h index 92b4ebe42..22c76a6a7 100644 --- a/third_party/ggml/ggjt.v2.q5_1.h +++ b/third_party/ggml/ggjt.v2.q5_1.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q5_1_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q5_1_H_ #include "third_party/ggml/fp16.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V2_QK5_1 32 @@ -21,5 +20,4 @@ void quantize_row_v2_q5_1_reference(const float* restrict, block_v2_q5_1* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q5_1_H_ */ diff --git a/third_party/ggml/ggjt.v2.q8_0.c b/third_party/ggml/ggjt.v2.q8_0.c index 3b43c2151..13324b40b 100644 --- a/third_party/ggml/ggjt.v2.q8_0.c +++ b/third_party/ggml/ggjt.v2.q8_0.c @@ -30,7 +30,6 @@ #include "libc/macros.internal.h" #include "libc/math.h" #include "third_party/ggml/ggjt.v2.internal.h" -// clang-format off static_assert(sizeof(block_v2_q8_0) == sizeof(float) + V2_QK8_0, "wrong q8_0 block size/padding"); diff --git a/third_party/ggml/ggjt.v2.q8_0.h b/third_party/ggml/ggjt.v2.q8_0.h index 2e5b2107d..e03c28cc6 100644 --- a/third_party/ggml/ggjt.v2.q8_0.h +++ b/third_party/ggml/ggjt.v2.q8_0.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q8_0_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q8_0_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V2_QK8_0 32 @@ -18,5 +17,4 @@ void quantize_row_v2_q8_0_reference(const float* restrict, block_v2_q8_0* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q8_0_H_ */ diff --git a/third_party/ggml/ggjt.v2.q8_1.c b/third_party/ggml/ggjt.v2.q8_1.c index f52010ec9..05193907e 100644 --- a/third_party/ggml/ggjt.v2.q8_1.c +++ b/third_party/ggml/ggjt.v2.q8_1.c @@ -30,7 +30,6 @@ #include "libc/macros.internal.h" #include "libc/math.h" #include "third_party/ggml/ggjt.v2.internal.h" -// clang-format off static_assert(sizeof(block_v2_q8_1) == 2*sizeof(float) + V2_QK8_1, "wrong q8_1 block size/padding"); diff --git a/third_party/ggml/ggjt.v2.q8_1.h b/third_party/ggml/ggjt.v2.q8_1.h index 88b38ea17..2ab3acdd0 100644 --- a/third_party/ggml/ggjt.v2.q8_1.h +++ b/third_party/ggml/ggjt.v2.q8_1.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q8_1_H_ #define COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q8_1_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define V2_QK8_1 32 @@ -15,5 +14,4 @@ void quantize_row_v2_q8_1_reference(const float* restrict, block_v2_q8_1* restrict, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_GGML_GGJT_V2_Q8_1_H_ */ diff --git a/third_party/ggml/ggml.c b/third_party/ggml/ggml.c index 80f1b8af5..458346391 100644 --- a/third_party/ggml/ggml.c +++ b/third_party/ggml/ggml.c @@ -55,7 +55,6 @@ asm(".ident\t\"\\n\\n\ GGML (MIT License)\\n\ Copyright (c) 2023 Georgi Gerganov\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off typedef void* thread_ret_t; diff --git a/third_party/ggml/ggml.h b/third_party/ggml/ggml.h index a81a4d768..220452c58 100644 --- a/third_party/ggml/ggml.h +++ b/third_party/ggml/ggml.h @@ -1,9 +1,7 @@ // -*- c; c-basic-offset:4 -*- #ifndef COSMOPOLITAN_THIRD_PARTY_LLAMA_CPP_GGML_H_ #define COSMOPOLITAN_THIRD_PARTY_LLAMA_CPP_GGML_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -// clang-format off // // GGML Tensor Library @@ -1156,5 +1154,4 @@ COSMOPOLITAN_C_START_ extern const quantize_chunk_f *const *GGML_QUANTIZE_CHUNK; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_LLAMA_CPP_GGML_H_ */ diff --git a/third_party/ggml/llama.cc b/third_party/ggml/llama.cc index a6cb47b5a..055f70767 100644 --- a/third_party/ggml/llama.cc +++ b/third_party/ggml/llama.cc @@ -28,7 +28,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/ggml/llama.h" #include "libc/assert.h" -#include "libc/intrin/bits.h" #include "libc/macros.internal.h" #include "libc/stdio/stdio.h" #include "libc/sysv/consts/posix.h" @@ -60,7 +59,6 @@ asm(".ident\t\"\\n\\n\ llama.cpp (MIT License)\\n\ Copyright (c) 2023 Georgi Gerganov\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off #define LLAMA_USE_SCRATCH #define LLAMA_MAX_SCRATCH_BUFFERS 16 diff --git a/third_party/ggml/llama.h b/third_party/ggml/llama.h index b44d15106..62d5a01c3 100644 --- a/third_party/ggml/llama.h +++ b/third_party/ggml/llama.h @@ -1,10 +1,8 @@ // -*- c++; c-basic-offset:4 -*- #ifndef LLAMA_H #define LLAMA_H -#include "libc/intrin/bits.h" #include "third_party/libcxx/string" #include "third_party/libcxx/vector" -// clang-format off #ifdef LLAMA_SHARED # if defined(_WIN32) && !defined(__MINGW32__) diff --git a/third_party/ggml/llama_util.h b/third_party/ggml/llama_util.h index 533b1f26f..58d69abf7 100755 --- a/third_party/ggml/llama_util.h +++ b/third_party/ggml/llama_util.h @@ -18,7 +18,6 @@ #include "third_party/libcxx/cstring" #include "third_party/libcxx/string" #include "third_party/libcxx/vector" -// clang-format off // Internal header to be included only by llama.cpp. // Contains wrappers around OS interfaces. diff --git a/third_party/ggml/main.cc b/third_party/ggml/main.cc index 37d17d36f..f642a6072 100644 --- a/third_party/ggml/main.cc +++ b/third_party/ggml/main.cc @@ -31,7 +31,6 @@ #include "libc/calls/struct/sched_param.h" #include "libc/calls/struct/sigaction.h" #include "libc/calls/struct/stat.h" -#include "libc/intrin/bits.h" #include "libc/log/log.h" #include "libc/macros.internal.h" #include "libc/nexgen32e/x86feature.h" @@ -50,6 +49,7 @@ #include "third_party/libcxx/atomic" #include "third_party/libcxx/iostream" #include "third_party/libcxx/string" +#include "libc/serialize.h" #include "third_party/libcxx/vector" #define EPHEMERAL(fmt) "\r\e[K\033[1;35m" fmt " \033[0m" @@ -58,7 +58,6 @@ asm(".ident\t\"\\n\\n\ llama.cpp (MIT License)\\n\ Copyright (c) 2023 Georgi Gerganov\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off static gpt_params params; static llama_context * ctx; diff --git a/third_party/ggml/perplexity.cc b/third_party/ggml/perplexity.cc index 0e54f40b3..84ac32dec 100644 --- a/third_party/ggml/perplexity.cc +++ b/third_party/ggml/perplexity.cc @@ -33,7 +33,6 @@ asm(".ident\t\"\\n\\n\ llama.cpp (MIT License)\\n\ Copyright (c) 2023 Georgi Gerganov\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off std::vector softmax(const std::vector& logits) { std::vector probs(logits.size()); diff --git a/third_party/ggml/quantize.cc b/third_party/ggml/quantize.cc index 9a0e70ddb..49fa4208a 100644 --- a/third_party/ggml/quantize.cc +++ b/third_party/ggml/quantize.cc @@ -38,7 +38,6 @@ asm(".ident\t\"\\n\\n\ llama.cpp (MIT License)\\n\ Copyright (c) 2023 Georgi Gerganov\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off static const std::map LLAMA_FTYPE_MAP = { {"f32", LLAMA_FTYPE_ALL_F32 }, diff --git a/third_party/hiredis/alloc.c b/third_party/hiredis/alloc.c index 9efc7200e..280217311 100644 --- a/third_party/hiredis/alloc.c +++ b/third_party/hiredis/alloc.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2020, Michael Grunder * diff --git a/third_party/hiredis/alloc.h b/third_party/hiredis/alloc.h index 951458252..4f86922c4 100644 --- a/third_party/hiredis/alloc.h +++ b/third_party/hiredis/alloc.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2020, Michael Grunder * diff --git a/third_party/hiredis/async.c b/third_party/hiredis/async.c index 31e250b67..b6c721d45 100644 --- a/third_party/hiredis/async.c +++ b/third_party/hiredis/async.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2009-2011, Salvatore Sanfilippo * Copyright (c) 2010-2011, Pieter Noordhuis diff --git a/third_party/hiredis/async.h b/third_party/hiredis/async.h index 8776e84c9..60e02939d 100644 --- a/third_party/hiredis/async.h +++ b/third_party/hiredis/async.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2009-2011, Salvatore Sanfilippo * Copyright (c) 2010-2011, Pieter Noordhuis diff --git a/third_party/hiredis/async_private.inc b/third_party/hiredis/async_private.inc index 7e52cf4ae..ea0558d42 100644 --- a/third_party/hiredis/async_private.inc +++ b/third_party/hiredis/async_private.inc @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2009-2011, Salvatore Sanfilippo * Copyright (c) 2010-2011, Pieter Noordhuis diff --git a/third_party/hiredis/dict.c b/third_party/hiredis/dict.c index dfdf09206..3156c8175 100644 --- a/third_party/hiredis/dict.c +++ b/third_party/hiredis/dict.c @@ -1,4 +1,3 @@ -// clang-format off /* Hash table implementation. * * This file implements in memory hash tables with insert/del/replace/find/ diff --git a/third_party/hiredis/dict.h b/third_party/hiredis/dict.h index b4dcbcab9..6ad0acd8d 100644 --- a/third_party/hiredis/dict.h +++ b/third_party/hiredis/dict.h @@ -1,4 +1,3 @@ -// clang-format off /* Hash table implementation. * * This file implements in memory hash tables with insert/del/replace/find/ diff --git a/third_party/hiredis/hiredis.c b/third_party/hiredis/hiredis.c index e8d4faba6..7f551c990 100644 --- a/third_party/hiredis/hiredis.c +++ b/third_party/hiredis/hiredis.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2009-2011, Salvatore Sanfilippo * Copyright (c) 2010-2014, Pieter Noordhuis diff --git a/third_party/hiredis/hiredis.h b/third_party/hiredis/hiredis.h index 0549dd980..ba7ba50fd 100644 --- a/third_party/hiredis/hiredis.h +++ b/third_party/hiredis/hiredis.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2009-2011, Salvatore Sanfilippo * Copyright (c) 2010-2014, Pieter Noordhuis diff --git a/third_party/hiredis/net.c b/third_party/hiredis/net.c index e4309b20e..ef89de8e1 100644 --- a/third_party/hiredis/net.c +++ b/third_party/hiredis/net.c @@ -1,4 +1,3 @@ -// clang-format off /* Extracted from anet.c to work properly with Hiredis error reporting. * * Copyright (c) 2009-2011, Salvatore Sanfilippo diff --git a/third_party/hiredis/net.h b/third_party/hiredis/net.h index 26c489be1..d97d4f4e2 100644 --- a/third_party/hiredis/net.h +++ b/third_party/hiredis/net.h @@ -1,4 +1,3 @@ -// clang-format off /* Extracted from anet.c to work properly with Hiredis error reporting. * * Copyright (c) 2009-2011, Salvatore Sanfilippo diff --git a/third_party/hiredis/read.c b/third_party/hiredis/read.c index 734d18c99..ff8e2220f 100644 --- a/third_party/hiredis/read.c +++ b/third_party/hiredis/read.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2009-2011, Salvatore Sanfilippo * Copyright (c) 2010-2011, Pieter Noordhuis diff --git a/third_party/hiredis/read.h b/third_party/hiredis/read.h index d2010edfc..e6368a1ef 100644 --- a/third_party/hiredis/read.h +++ b/third_party/hiredis/read.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2009-2011, Salvatore Sanfilippo * Copyright (c) 2010-2011, Pieter Noordhuis diff --git a/third_party/hiredis/sds.c b/third_party/hiredis/sds.c index 8b0036cc6..7f2f5692d 100644 --- a/third_party/hiredis/sds.c +++ b/third_party/hiredis/sds.c @@ -1,4 +1,3 @@ -// clang-format off /* SDSLib 2.0 -- A C dynamic strings library * * Copyright (c) 2006-2015, Salvatore Sanfilippo diff --git a/third_party/hiredis/sds.h b/third_party/hiredis/sds.h index d894350cc..4d7e0af9b 100644 --- a/third_party/hiredis/sds.h +++ b/third_party/hiredis/sds.h @@ -1,4 +1,3 @@ -// clang-format off /* SDSLib 2.0 -- A C dynamic strings library * * Copyright (c) 2006-2015, Salvatore Sanfilippo diff --git a/third_party/hiredis/sdsalloc.h b/third_party/hiredis/sdsalloc.h index bb40521c7..f5dbbbf34 100644 --- a/third_party/hiredis/sdsalloc.h +++ b/third_party/hiredis/sdsalloc.h @@ -1,4 +1,3 @@ -// clang-format off /* SDSLib 2.0 -- A C dynamic strings library * * Copyright (c) 2006-2015, Salvatore Sanfilippo diff --git a/third_party/intel/adxintrin.internal.h b/third_party/intel/adxintrin.internal.h index 3689b9a0e..79529f669 100644 --- a/third_party/intel/adxintrin.internal.h +++ b/third_party/intel/adxintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/ammintrin.internal.h b/third_party/intel/ammintrin.internal.h index 3b41f0e9b..f6069f1be 100644 --- a/third_party/intel/ammintrin.internal.h +++ b/third_party/intel/ammintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _AMMINTRIN_H_INCLUDED #define _AMMINTRIN_H_INCLUDED diff --git a/third_party/intel/amxbf16intrin.internal.h b/third_party/intel/amxbf16intrin.internal.h index 1d60e0c15..d7b31ecb0 100644 --- a/third_party/intel/amxbf16intrin.internal.h +++ b/third_party/intel/amxbf16intrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/amxint8intrin.internal.h b/third_party/intel/amxint8intrin.internal.h index 9ae0b506a..f1d25d11f 100644 --- a/third_party/intel/amxint8intrin.internal.h +++ b/third_party/intel/amxint8intrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/amxtileintrin.internal.h b/third_party/intel/amxtileintrin.internal.h index c7dd73554..3913c900e 100644 --- a/third_party/intel/amxtileintrin.internal.h +++ b/third_party/intel/amxtileintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx2intrin.internal.h b/third_party/intel/avx2intrin.internal.h index a44141ac5..e323cf2fd 100644 --- a/third_party/intel/avx2intrin.internal.h +++ b/third_party/intel/avx2intrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/avx5124fmapsintrin.internal.h b/third_party/intel/avx5124fmapsintrin.internal.h index 7cbfc4404..7134f1227 100644 --- a/third_party/intel/avx5124fmapsintrin.internal.h +++ b/third_party/intel/avx5124fmapsintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/avx5124vnniwintrin.internal.h b/third_party/intel/avx5124vnniwintrin.internal.h index ff6a97762..b94ca1d2f 100644 --- a/third_party/intel/avx5124vnniwintrin.internal.h +++ b/third_party/intel/avx5124vnniwintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/avx512bf16intrin.internal.h b/third_party/intel/avx512bf16intrin.internal.h index 7da74bec0..088340d6a 100644 --- a/third_party/intel/avx512bf16intrin.internal.h +++ b/third_party/intel/avx512bf16intrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512bf16vlintrin.internal.h b/third_party/intel/avx512bf16vlintrin.internal.h index f5e13a35a..83019cf5f 100644 --- a/third_party/intel/avx512bf16vlintrin.internal.h +++ b/third_party/intel/avx512bf16vlintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512bitalgintrin.internal.h b/third_party/intel/avx512bitalgintrin.internal.h index eb63af884..aa7750fec 100644 --- a/third_party/intel/avx512bitalgintrin.internal.h +++ b/third_party/intel/avx512bitalgintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/avx512bwintrin.internal.h b/third_party/intel/avx512bwintrin.internal.h index ddf888c7b..27f94a612 100644 --- a/third_party/intel/avx512bwintrin.internal.h +++ b/third_party/intel/avx512bwintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512cdintrin.internal.h b/third_party/intel/avx512cdintrin.internal.h index 1aaa7ac4d..83b643edb 100644 --- a/third_party/intel/avx512cdintrin.internal.h +++ b/third_party/intel/avx512cdintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512dqintrin.internal.h b/third_party/intel/avx512dqintrin.internal.h index 5563c8a55..38d8010f1 100644 --- a/third_party/intel/avx512dqintrin.internal.h +++ b/third_party/intel/avx512dqintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512erintrin.internal.h b/third_party/intel/avx512erintrin.internal.h index d963eb2bd..d50aba432 100644 --- a/third_party/intel/avx512erintrin.internal.h +++ b/third_party/intel/avx512erintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512fintrin.internal.h b/third_party/intel/avx512fintrin.internal.h index c3005f8be..79158ec85 100644 --- a/third_party/intel/avx512fintrin.internal.h +++ b/third_party/intel/avx512fintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512ifmaintrin.internal.h b/third_party/intel/avx512ifmaintrin.internal.h index 5d10237e1..c26b71b24 100644 --- a/third_party/intel/avx512ifmaintrin.internal.h +++ b/third_party/intel/avx512ifmaintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512ifmavlintrin.internal.h b/third_party/intel/avx512ifmavlintrin.internal.h index c5cff3ebd..38dedfee7 100644 --- a/third_party/intel/avx512ifmavlintrin.internal.h +++ b/third_party/intel/avx512ifmavlintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512pfintrin.internal.h b/third_party/intel/avx512pfintrin.internal.h index 0704fe6fc..4a9d538f4 100644 --- a/third_party/intel/avx512pfintrin.internal.h +++ b/third_party/intel/avx512pfintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vbmi2intrin.internal.h b/third_party/intel/avx512vbmi2intrin.internal.h index 0085907c2..71cee34b0 100644 --- a/third_party/intel/avx512vbmi2intrin.internal.h +++ b/third_party/intel/avx512vbmi2intrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vbmi2vlintrin.internal.h b/third_party/intel/avx512vbmi2vlintrin.internal.h index 88ec57aab..07f97fb52 100644 --- a/third_party/intel/avx512vbmi2vlintrin.internal.h +++ b/third_party/intel/avx512vbmi2vlintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vbmiintrin.internal.h b/third_party/intel/avx512vbmiintrin.internal.h index cf5756939..54ebf1fce 100644 --- a/third_party/intel/avx512vbmiintrin.internal.h +++ b/third_party/intel/avx512vbmiintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vbmivlintrin.internal.h b/third_party/intel/avx512vbmivlintrin.internal.h index 6ba410426..a61ec41d4 100644 --- a/third_party/intel/avx512vbmivlintrin.internal.h +++ b/third_party/intel/avx512vbmivlintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vlbwintrin.internal.h b/third_party/intel/avx512vlbwintrin.internal.h index 808abdc8d..03b3f5d04 100644 --- a/third_party/intel/avx512vlbwintrin.internal.h +++ b/third_party/intel/avx512vlbwintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vldqintrin.internal.h b/third_party/intel/avx512vldqintrin.internal.h index 2e7d56993..a3e0ba447 100644 --- a/third_party/intel/avx512vldqintrin.internal.h +++ b/third_party/intel/avx512vldqintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vlintrin.internal.h b/third_party/intel/avx512vlintrin.internal.h index 756e1c767..73d7e3054 100644 --- a/third_party/intel/avx512vlintrin.internal.h +++ b/third_party/intel/avx512vlintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vnniintrin.internal.h b/third_party/intel/avx512vnniintrin.internal.h index e9e04ea73..a9c41879b 100644 --- a/third_party/intel/avx512vnniintrin.internal.h +++ b/third_party/intel/avx512vnniintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vnnivlintrin.internal.h b/third_party/intel/avx512vnnivlintrin.internal.h index 52a339c26..f403563b8 100644 --- a/third_party/intel/avx512vnnivlintrin.internal.h +++ b/third_party/intel/avx512vnnivlintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vp2intersectintrin.internal.h b/third_party/intel/avx512vp2intersectintrin.internal.h index bf944f3c2..189aa37b2 100644 --- a/third_party/intel/avx512vp2intersectintrin.internal.h +++ b/third_party/intel/avx512vp2intersectintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vp2intersectvlintrin.internal.h b/third_party/intel/avx512vp2intersectvlintrin.internal.h index 78fabb027..e38624ebf 100644 --- a/third_party/intel/avx512vp2intersectvlintrin.internal.h +++ b/third_party/intel/avx512vp2intersectvlintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/avx512vpopcntdqintrin.internal.h b/third_party/intel/avx512vpopcntdqintrin.internal.h index e6c4de3a4..fe4d5c834 100644 --- a/third_party/intel/avx512vpopcntdqintrin.internal.h +++ b/third_party/intel/avx512vpopcntdqintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/avx512vpopcntdqvlintrin.internal.h b/third_party/intel/avx512vpopcntdqvlintrin.internal.h index af1cd345a..a86d84ce3 100644 --- a/third_party/intel/avx512vpopcntdqvlintrin.internal.h +++ b/third_party/intel/avx512vpopcntdqvlintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/avxintrin.internal.h b/third_party/intel/avxintrin.internal.h index 3676121d8..f2c84ef94 100644 --- a/third_party/intel/avxintrin.internal.h +++ b/third_party/intel/avxintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/avxvnniintrin.internal.h b/third_party/intel/avxvnniintrin.internal.h index ddb392944..73f3d64d1 100644 --- a/third_party/intel/avxvnniintrin.internal.h +++ b/third_party/intel/avxvnniintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/bmi2intrin.internal.h b/third_party/intel/bmi2intrin.internal.h index 32bbde82d..0a4db56eb 100644 --- a/third_party/intel/bmi2intrin.internal.h +++ b/third_party/intel/bmi2intrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/bmiintrin.internal.h b/third_party/intel/bmiintrin.internal.h index 7425e0db9..cf2042f1b 100644 --- a/third_party/intel/bmiintrin.internal.h +++ b/third_party/intel/bmiintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/cetintrin.internal.h b/third_party/intel/cetintrin.internal.h index 6121ecad0..2607cf0ab 100644 --- a/third_party/intel/cetintrin.internal.h +++ b/third_party/intel/cetintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/cldemoteintrin.internal.h b/third_party/intel/cldemoteintrin.internal.h index 304c8f226..186d70250 100644 --- a/third_party/intel/cldemoteintrin.internal.h +++ b/third_party/intel/cldemoteintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/clflushoptintrin.internal.h b/third_party/intel/clflushoptintrin.internal.h index 4d27e0c3d..5f182df0a 100644 --- a/third_party/intel/clflushoptintrin.internal.h +++ b/third_party/intel/clflushoptintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/clwbintrin.internal.h b/third_party/intel/clwbintrin.internal.h index 270c60aa9..441f16d6d 100644 --- a/third_party/intel/clwbintrin.internal.h +++ b/third_party/intel/clwbintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/clzerointrin.internal.h b/third_party/intel/clzerointrin.internal.h index 8402f80ef..a5097e7f5 100644 --- a/third_party/intel/clzerointrin.internal.h +++ b/third_party/intel/clzerointrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _CLZEROINTRIN_H_INCLUDED #define _CLZEROINTRIN_H_INCLUDED diff --git a/third_party/intel/cpuid.internal.h b/third_party/intel/cpuid.internal.h index 1f675485d..081886d9b 100644 --- a/third_party/intel/cpuid.internal.h +++ b/third_party/intel/cpuid.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _CPUID_H_INCLUDED #define _CPUID_H_INCLUDED diff --git a/third_party/intel/emmintrin.internal.h b/third_party/intel/emmintrin.internal.h index c70096736..d54c75287 100644 --- a/third_party/intel/emmintrin.internal.h +++ b/third_party/intel/emmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _EMMINTRIN_H_INCLUDED #define _EMMINTRIN_H_INCLUDED diff --git a/third_party/intel/enqcmdintrin.internal.h b/third_party/intel/enqcmdintrin.internal.h index 179b35553..bb5b73359 100644 --- a/third_party/intel/enqcmdintrin.internal.h +++ b/third_party/intel/enqcmdintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/f16cintrin.internal.h b/third_party/intel/f16cintrin.internal.h index 13d390ae4..e272f4092 100644 --- a/third_party/intel/f16cintrin.internal.h +++ b/third_party/intel/f16cintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _X86INTRIN_H_INCLUDED && !defined _IMMINTRIN_H_INCLUDED # error "Never use directly; include or instead." diff --git a/third_party/intel/fma4intrin.internal.h b/third_party/intel/fma4intrin.internal.h index f95f38583..32b1d00b9 100644 --- a/third_party/intel/fma4intrin.internal.h +++ b/third_party/intel/fma4intrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86INTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/fmaintrin.internal.h b/third_party/intel/fmaintrin.internal.h index 77921c49a..0a8a09f69 100644 --- a/third_party/intel/fmaintrin.internal.h +++ b/third_party/intel/fmaintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/fxsrintrin.internal.h b/third_party/intel/fxsrintrin.internal.h index e81b81d80..a21f5d0f0 100644 --- a/third_party/intel/fxsrintrin.internal.h +++ b/third_party/intel/fxsrintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/gfniintrin.internal.h b/third_party/intel/gfniintrin.internal.h index 987efe2cb..6dfe26778 100644 --- a/third_party/intel/gfniintrin.internal.h +++ b/third_party/intel/gfniintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/hresetintrin.internal.h b/third_party/intel/hresetintrin.internal.h index 9ff5504d4..c6f8fa233 100644 --- a/third_party/intel/hresetintrin.internal.h +++ b/third_party/intel/hresetintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/ia32intrin.internal.h b/third_party/intel/ia32intrin.internal.h index fb167fcf6..faeaff648 100644 --- a/third_party/intel/ia32intrin.internal.h +++ b/third_party/intel/ia32intrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/immintrin.internal.h b/third_party/intel/immintrin.internal.h index a375eda47..60b7ec6d9 100644 --- a/third_party/intel/immintrin.internal.h +++ b/third_party/intel/immintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #define _IMMINTRIN_H_INCLUDED diff --git a/third_party/intel/keylockerintrin.internal.h b/third_party/intel/keylockerintrin.internal.h index e071080f2..bf92b7a56 100644 --- a/third_party/intel/keylockerintrin.internal.h +++ b/third_party/intel/keylockerintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/lwpintrin.internal.h b/third_party/intel/lwpintrin.internal.h index 3a076903e..3c4884512 100644 --- a/third_party/intel/lwpintrin.internal.h +++ b/third_party/intel/lwpintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/lzcntintrin.internal.h b/third_party/intel/lzcntintrin.internal.h index b72e35777..65f36e10f 100644 --- a/third_party/intel/lzcntintrin.internal.h +++ b/third_party/intel/lzcntintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/mm3dnow.internal.h b/third_party/intel/mm3dnow.internal.h index 9e43e1086..e7bd4fd23 100644 --- a/third_party/intel/mm3dnow.internal.h +++ b/third_party/intel/mm3dnow.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _MM3DNOW_H_INCLUDED #define _MM3DNOW_H_INCLUDED diff --git a/third_party/intel/mm_malloc.internal.h b/third_party/intel/mm_malloc.internal.h index 127c46315..e3b5a0423 100644 --- a/third_party/intel/mm_malloc.internal.h +++ b/third_party/intel/mm_malloc.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _MM_MALLOC_H_INCLUDED #define _MM_MALLOC_H_INCLUDED diff --git a/third_party/intel/mmintrin.internal.h b/third_party/intel/mmintrin.internal.h index 2ec674bbb..cc0c27122 100644 --- a/third_party/intel/mmintrin.internal.h +++ b/third_party/intel/mmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _MMINTRIN_H_INCLUDED #define _MMINTRIN_H_INCLUDED diff --git a/third_party/intel/movdirintrin.internal.h b/third_party/intel/movdirintrin.internal.h index f8cca6ac9..366851580 100644 --- a/third_party/intel/movdirintrin.internal.h +++ b/third_party/intel/movdirintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/mwaitxintrin.internal.h b/third_party/intel/mwaitxintrin.internal.h index 00de10a18..4f6cab238 100644 --- a/third_party/intel/mwaitxintrin.internal.h +++ b/third_party/intel/mwaitxintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _MWAITXINTRIN_H_INCLUDED #define _MWAITXINTRIN_H_INCLUDED diff --git a/third_party/intel/nmmintrin.internal.h b/third_party/intel/nmmintrin.internal.h index 503e4a4c0..bab159615 100644 --- a/third_party/intel/nmmintrin.internal.h +++ b/third_party/intel/nmmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _NMMINTRIN_H_INCLUDED #define _NMMINTRIN_H_INCLUDED diff --git a/third_party/intel/pconfigintrin.internal.h b/third_party/intel/pconfigintrin.internal.h index bca106a0e..12c96c52d 100644 --- a/third_party/intel/pconfigintrin.internal.h +++ b/third_party/intel/pconfigintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/pkuintrin.internal.h b/third_party/intel/pkuintrin.internal.h index 17daff8ea..616105525 100644 --- a/third_party/intel/pkuintrin.internal.h +++ b/third_party/intel/pkuintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/pmmintrin.internal.h b/third_party/intel/pmmintrin.internal.h index 4a5b6c00e..abac40c73 100644 --- a/third_party/intel/pmmintrin.internal.h +++ b/third_party/intel/pmmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _PMMINTRIN_H_INCLUDED #define _PMMINTRIN_H_INCLUDED diff --git a/third_party/intel/popcntintrin.internal.h b/third_party/intel/popcntintrin.internal.h index 18a9f9da1..19780f1a1 100644 --- a/third_party/intel/popcntintrin.internal.h +++ b/third_party/intel/popcntintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _POPCNTINTRIN_H_INCLUDED #define _POPCNTINTRIN_H_INCLUDED diff --git a/third_party/intel/prfchwintrin.internal.h b/third_party/intel/prfchwintrin.internal.h index d98fd07de..bfd39c25a 100644 --- a/third_party/intel/prfchwintrin.internal.h +++ b/third_party/intel/prfchwintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if !defined _IMMINTRIN_H_INCLUDED && !defined _MM3DNOW_H_INCLUDED # error "Never use directly; include or instead." diff --git a/third_party/intel/rdseedintrin.internal.h b/third_party/intel/rdseedintrin.internal.h index c8975d18c..6a50b94c3 100644 --- a/third_party/intel/rdseedintrin.internal.h +++ b/third_party/intel/rdseedintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/rtmintrin.internal.h b/third_party/intel/rtmintrin.internal.h index 9d950f401..1a85547ad 100644 --- a/third_party/intel/rtmintrin.internal.h +++ b/third_party/intel/rtmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/serializeintrin.internal.h b/third_party/intel/serializeintrin.internal.h index f783a91d7..a68abbf43 100644 --- a/third_party/intel/serializeintrin.internal.h +++ b/third_party/intel/serializeintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/sgxintrin.internal.h b/third_party/intel/sgxintrin.internal.h index e6d713811..2c1c19544 100644 --- a/third_party/intel/sgxintrin.internal.h +++ b/third_party/intel/sgxintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _SGXINTRIN_H_INCLUDED #define _SGXINTRIN_H_INCLUDED diff --git a/third_party/intel/shaintrin.internal.h b/third_party/intel/shaintrin.internal.h index 914db8cc3..f8746f268 100644 --- a/third_party/intel/shaintrin.internal.h +++ b/third_party/intel/shaintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/smmintrin.internal.h b/third_party/intel/smmintrin.internal.h index aed50ea41..2fae19a10 100644 --- a/third_party/intel/smmintrin.internal.h +++ b/third_party/intel/smmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _SMMINTRIN_H_INCLUDED #define _SMMINTRIN_H_INCLUDED diff --git a/third_party/intel/tbmintrin.internal.h b/third_party/intel/tbmintrin.internal.h index 9b63f1c68..4a578bd51 100644 --- a/third_party/intel/tbmintrin.internal.h +++ b/third_party/intel/tbmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/tmmintrin.internal.h b/third_party/intel/tmmintrin.internal.h index 8bbd38f6d..22f386947 100644 --- a/third_party/intel/tmmintrin.internal.h +++ b/third_party/intel/tmmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _TMMINTRIN_H_INCLUDED #define _TMMINTRIN_H_INCLUDED diff --git a/third_party/intel/tsxldtrkintrin.internal.h b/third_party/intel/tsxldtrkintrin.internal.h index 5a1509378..926765b78 100644 --- a/third_party/intel/tsxldtrkintrin.internal.h +++ b/third_party/intel/tsxldtrkintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/uintrintrin.internal.h b/third_party/intel/uintrintrin.internal.h index b5c4fc84c..0511c9ee9 100644 --- a/third_party/intel/uintrintrin.internal.h +++ b/third_party/intel/uintrintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/upgrade.sh b/third_party/intel/upgrade.sh index 64d870d15..02458cbe1 100755 --- a/third_party/intel/upgrade.sh +++ b/third_party/intel/upgrade.sh @@ -126,7 +126,6 @@ done for f in third_party/intel/*.h; do ( - printf %s\\n '/* clang-format off */' printf %s\\n '#if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0)' cat $f printf %s\\n '#endif' diff --git a/third_party/intel/vaesintrin.internal.h b/third_party/intel/vaesintrin.internal.h index a930ebefb..e0b577112 100644 --- a/third_party/intel/vaesintrin.internal.h +++ b/third_party/intel/vaesintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/vpclmulqdqintrin.internal.h b/third_party/intel/vpclmulqdqintrin.internal.h index bbb18799d..f2726d0e3 100644 --- a/third_party/intel/vpclmulqdqintrin.internal.h +++ b/third_party/intel/vpclmulqdqintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _IMMINTRIN_H_INCLUDED #error "Never use directly; include instead." diff --git a/third_party/intel/waitpkgintrin.internal.h b/third_party/intel/waitpkgintrin.internal.h index 64e8c73fe..359338a84 100644 --- a/third_party/intel/waitpkgintrin.internal.h +++ b/third_party/intel/waitpkgintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/wbnoinvdintrin.internal.h b/third_party/intel/wbnoinvdintrin.internal.h index 5d8d9456b..65549253b 100644 --- a/third_party/intel/wbnoinvdintrin.internal.h +++ b/third_party/intel/wbnoinvdintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/wmmintrin.internal.h b/third_party/intel/wmmintrin.internal.h index 60df795ff..ff5dee236 100644 --- a/third_party/intel/wmmintrin.internal.h +++ b/third_party/intel/wmmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _WMMINTRIN_H_INCLUDED #define _WMMINTRIN_H_INCLUDED diff --git a/third_party/intel/x86gprintrin.internal.h b/third_party/intel/x86gprintrin.internal.h index 400a9a4f2..3f8aedf78 100644 --- a/third_party/intel/x86gprintrin.internal.h +++ b/third_party/intel/x86gprintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED #define _X86GPRINTRIN_H_INCLUDED diff --git a/third_party/intel/x86intrin.internal.h b/third_party/intel/x86intrin.internal.h index 14b142ffb..aba08c7d1 100644 --- a/third_party/intel/x86intrin.internal.h +++ b/third_party/intel/x86intrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86INTRIN_H_INCLUDED #define _X86INTRIN_H_INCLUDED diff --git a/third_party/intel/xmmintrin.internal.h b/third_party/intel/xmmintrin.internal.h index dd8367730..7c744991b 100644 --- a/third_party/intel/xmmintrin.internal.h +++ b/third_party/intel/xmmintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _XMMINTRIN_H_INCLUDED #define _XMMINTRIN_H_INCLUDED diff --git a/third_party/intel/xopintrin.internal.h b/third_party/intel/xopintrin.internal.h index 36f0d8d96..69dfd0e9e 100644 --- a/third_party/intel/xopintrin.internal.h +++ b/third_party/intel/xopintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86INTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/xsavecintrin.internal.h b/third_party/intel/xsavecintrin.internal.h index 649beb1bf..fca16ce15 100644 --- a/third_party/intel/xsavecintrin.internal.h +++ b/third_party/intel/xsavecintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/xsaveintrin.internal.h b/third_party/intel/xsaveintrin.internal.h index fa72c42b2..180fa112b 100644 --- a/third_party/intel/xsaveintrin.internal.h +++ b/third_party/intel/xsaveintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/xsaveoptintrin.internal.h b/third_party/intel/xsaveoptintrin.internal.h index a50f9ef3f..cb179be0c 100644 --- a/third_party/intel/xsaveoptintrin.internal.h +++ b/third_party/intel/xsaveoptintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/xsavesintrin.internal.h b/third_party/intel/xsavesintrin.internal.h index 4e2631ecb..70e59a19e 100644 --- a/third_party/intel/xsavesintrin.internal.h +++ b/third_party/intel/xsavesintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/intel/xtestintrin.internal.h b/third_party/intel/xtestintrin.internal.h index 4101998c7..eff063ae7 100644 --- a/third_party/intel/xtestintrin.internal.h +++ b/third_party/intel/xtestintrin.internal.h @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #ifndef _X86GPRINTRIN_H_INCLUDED # error "Never use directly; include instead." diff --git a/third_party/libcxx/.clang-format b/third_party/libcxx/.clang-format deleted file mode 100644 index dd596813f..000000000 --- a/third_party/libcxx/.clang-format +++ /dev/null @@ -1,13 +0,0 @@ -BasedOnStyle: LLVM - ---- -Language: Cpp -Standard: Cpp03 - -AlwaysBreakTemplateDeclarations: true -PointerAlignment: Left - -# Disable formatting options which may break tests. -SortIncludes: false -ReflowComments: false ---- diff --git a/third_party/libcxx/__sso_allocator b/third_party/libcxx/__sso_allocator index f28f2cf2f..a98ae6b06 100644 --- a/third_party/libcxx/__sso_allocator +++ b/third_party/libcxx/__sso_allocator @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===----------------------------------------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/__std_stream b/third_party/libcxx/__std_stream index 9c85d638f..064e8ed2a 100644 --- a/third_party/libcxx/__std_stream +++ b/third_party/libcxx/__std_stream @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===----------------------------------------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/algorithm.cc b/third_party/libcxx/algorithm.cc index bf0112a8f..fd1cebb9e 100644 --- a/third_party/libcxx/algorithm.cc +++ b/third_party/libcxx/algorithm.cc @@ -1,4 +1,3 @@ -// clang-format off //===----------------------- algorithm.cpp --------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/any b/third_party/libcxx/any index 8593a2fb2..4bb510ed9 100644 --- a/third_party/libcxx/any +++ b/third_party/libcxx/any @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===------------------------------ any -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/atomic b/third_party/libcxx/atomic index 98744bed7..6ae35dfdf 100644 --- a/third_party/libcxx/atomic +++ b/third_party/libcxx/atomic @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- atomic -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/ccomplex b/third_party/libcxx/ccomplex index c916e7df0..14cfa27c4 100644 --- a/third_party/libcxx/ccomplex +++ b/third_party/libcxx/ccomplex @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- ccomplex ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/cfenv b/third_party/libcxx/cfenv index 346266d77..bba3dcd31 100644 --- a/third_party/libcxx/cfenv +++ b/third_party/libcxx/cfenv @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===---------------------------- cfenv -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/cfloat b/third_party/libcxx/cfloat index aa6bcdabd..9b5e73c3a 100644 --- a/third_party/libcxx/cfloat +++ b/third_party/libcxx/cfloat @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- cfloat -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/chrono.cc b/third_party/libcxx/chrono.cc index 4063102bb..b1efb89ed 100644 --- a/third_party/libcxx/chrono.cc +++ b/third_party/libcxx/chrono.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------- chrono.cpp ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/cinttypes b/third_party/libcxx/cinttypes index 8bec5fdf4..61d1334dd 100644 --- a/third_party/libcxx/cinttypes +++ b/third_party/libcxx/cinttypes @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- cinttypes --------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/ciso646 b/third_party/libcxx/ciso646 index da5811403..6749b74c0 100644 --- a/third_party/libcxx/ciso646 +++ b/third_party/libcxx/ciso646 @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- ciso646 ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/clocale b/third_party/libcxx/clocale index 6fc1a1785..bad5ab57f 100644 --- a/third_party/libcxx/clocale +++ b/third_party/libcxx/clocale @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- clocale ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/codecvt b/third_party/libcxx/codecvt index a32698c4b..e87d8bf32 100644 --- a/third_party/libcxx/codecvt +++ b/third_party/libcxx/codecvt @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===-------------------------- codecvt -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/compare b/third_party/libcxx/compare index 03981697b..947bdcf57 100644 --- a/third_party/libcxx/compare +++ b/third_party/libcxx/compare @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===-------------------------- compare -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/complex b/third_party/libcxx/complex index 764e54a0f..81675fb4d 100644 --- a/third_party/libcxx/complex +++ b/third_party/libcxx/complex @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- complex ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/condition_variable b/third_party/libcxx/condition_variable index 0667bb142..f0a2cffe4 100644 --- a/third_party/libcxx/condition_variable +++ b/third_party/libcxx/condition_variable @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===---------------------- condition_variable ----------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/condition_variable.cc b/third_party/libcxx/condition_variable.cc index 596cd14b1..95c358b76 100644 --- a/third_party/libcxx/condition_variable.cc +++ b/third_party/libcxx/condition_variable.cc @@ -1,4 +1,3 @@ -// clang-format off //===-------------------- condition_variable.cpp --------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/condition_variable_destructor.cc b/third_party/libcxx/condition_variable_destructor.cc index 55a911f26..f06cb734b 100644 --- a/third_party/libcxx/condition_variable_destructor.cc +++ b/third_party/libcxx/condition_variable_destructor.cc @@ -1,4 +1,3 @@ -// clang-format off //===---------------- condition_variable_destructor.cpp ------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/csetjmp b/third_party/libcxx/csetjmp index 3888e7e1e..9dc5f49bf 100644 --- a/third_party/libcxx/csetjmp +++ b/third_party/libcxx/csetjmp @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- csetjmp ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/csignal b/third_party/libcxx/csignal index 4bf5553f7..8530f6248 100644 --- a/third_party/libcxx/csignal +++ b/third_party/libcxx/csignal @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- csignal ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/cstdbool b/third_party/libcxx/cstdbool index d5ac7ee36..a32e40195 100644 --- a/third_party/libcxx/cstdbool +++ b/third_party/libcxx/cstdbool @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- cstdbool ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/ctgmath b/third_party/libcxx/ctgmath index 3561bdd3d..5e8c8c410 100644 --- a/third_party/libcxx/ctgmath +++ b/third_party/libcxx/ctgmath @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===-------------------------- ctgmath -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/directory_iterator.cc b/third_party/libcxx/directory_iterator.cc index 63400ff7d..042fd298a 100644 --- a/third_party/libcxx/directory_iterator.cc +++ b/third_party/libcxx/directory_iterator.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------ directory_iterator.cpp ----------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/execution b/third_party/libcxx/execution index f497d122e..5d7d010fe 100644 --- a/third_party/libcxx/execution +++ b/third_party/libcxx/execution @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===------------------------- execution ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/experimental/__config b/third_party/libcxx/experimental/__config index 51a7610a4..8507be7f4 100644 --- a/third_party/libcxx/experimental/__config +++ b/third_party/libcxx/experimental/__config @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- __config ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/filesystem b/third_party/libcxx/filesystem index 01c255537..f51e0a0cd 100644 --- a/third_party/libcxx/filesystem +++ b/third_party/libcxx/filesystem @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- filesystem -------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/filesystem_common.hh b/third_party/libcxx/filesystem_common.hh index c2686af0b..97ebc058c 100644 --- a/third_party/libcxx/filesystem_common.hh +++ b/third_party/libcxx/filesystem_common.hh @@ -1,4 +1,3 @@ -// clang-format off //===----------------------------------------------------------------------===//// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/forward_list b/third_party/libcxx/forward_list index 6c779a396..46770cc49 100644 --- a/third_party/libcxx/forward_list +++ b/third_party/libcxx/forward_list @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===----------------------- forward_list ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/fstream b/third_party/libcxx/fstream index 8b44a29ca..d734e7a75 100644 --- a/third_party/libcxx/fstream +++ b/third_party/libcxx/fstream @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===------------------------- fstream ------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/functional.cc b/third_party/libcxx/functional.cc index 692e469ec..e234da9f5 100644 --- a/third_party/libcxx/functional.cc +++ b/third_party/libcxx/functional.cc @@ -1,4 +1,3 @@ -// clang-format off //===----------------------- functional.cpp -------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/future b/third_party/libcxx/future index a89cabb6d..552b8168b 100644 --- a/third_party/libcxx/future +++ b/third_party/libcxx/future @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- future -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/future.cc b/third_party/libcxx/future.cc index 90fcb5ad9..25dc5bc42 100644 --- a/third_party/libcxx/future.cc +++ b/third_party/libcxx/future.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------- future.cpp ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/hash.cc b/third_party/libcxx/hash.cc index 2af66ee90..1c1d545b7 100644 --- a/third_party/libcxx/hash.cc +++ b/third_party/libcxx/hash.cc @@ -1,4 +1,3 @@ -// clang-format off //===-------------------------- hash.cpp ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/include/atomic_support.hh b/third_party/libcxx/include/atomic_support.hh index c03a85c4b..de73084bb 100644 --- a/third_party/libcxx/include/atomic_support.hh +++ b/third_party/libcxx/include/atomic_support.hh @@ -1,4 +1,3 @@ -// clang-format off //===----------------------------------------------------------------------===//// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/include/config_elast.hh b/third_party/libcxx/include/config_elast.hh index 089607ff3..3fb3dddd4 100644 --- a/third_party/libcxx/include/config_elast.hh +++ b/third_party/libcxx/include/config_elast.hh @@ -1,4 +1,3 @@ -// clang-format off //===----------------------- config_elast.h -------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/iomanip b/third_party/libcxx/iomanip index d9b9b64f6..193c4cc8c 100644 --- a/third_party/libcxx/iomanip +++ b/third_party/libcxx/iomanip @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- iomanip ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/ios.cc b/third_party/libcxx/ios.cc index 9124a2d7d..fb819f5ad 100644 --- a/third_party/libcxx/ios.cc +++ b/third_party/libcxx/ios.cc @@ -1,4 +1,3 @@ -// clang-format off //===-------------------------- ios.cpp -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/iostream b/third_party/libcxx/iostream index 46665a80b..2b20c4b4b 100644 --- a/third_party/libcxx/iostream +++ b/third_party/libcxx/iostream @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- iostream ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/iostream.cc b/third_party/libcxx/iostream.cc index 8f70b27e3..a4b952167 100644 --- a/third_party/libcxx/iostream.cc +++ b/third_party/libcxx/iostream.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------ iostream.cpp --------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/locale1.cc b/third_party/libcxx/locale1.cc index 72e4d6dde..522ce051b 100644 --- a/third_party/libcxx/locale1.cc +++ b/third_party/libcxx/locale1.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------- locale.cpp ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/locale2.cc b/third_party/libcxx/locale2.cc index a4dc16220..f27e11c31 100644 --- a/third_party/libcxx/locale2.cc +++ b/third_party/libcxx/locale2.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------- locale.cpp ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/locale3.cc b/third_party/libcxx/locale3.cc index ecc91ef27..40dab5b35 100644 --- a/third_party/libcxx/locale3.cc +++ b/third_party/libcxx/locale3.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------- locale.cpp ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/locale4.cc b/third_party/libcxx/locale4.cc index 0809bc0a7..b3b6082f1 100644 --- a/third_party/libcxx/locale4.cc +++ b/third_party/libcxx/locale4.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------- locale.cpp ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/memory.cc b/third_party/libcxx/memory.cc index dd22ca165..789669c8a 100644 --- a/third_party/libcxx/memory.cc +++ b/third_party/libcxx/memory.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------ memory.cpp ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/mutex b/third_party/libcxx/mutex index df2b59592..5addc0cfe 100644 --- a/third_party/libcxx/mutex +++ b/third_party/libcxx/mutex @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- mutex ------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/mutex.cc b/third_party/libcxx/mutex.cc index acd7bbb4e..9b4920d31 100644 --- a/third_party/libcxx/mutex.cc +++ b/third_party/libcxx/mutex.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------- mutex.cpp ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/operations.cc b/third_party/libcxx/operations.cc index 03c555929..9b91f177e 100644 --- a/third_party/libcxx/operations.cc +++ b/third_party/libcxx/operations.cc @@ -1,4 +1,3 @@ -// clang-format off //===--------------------- filesystem/ops.cpp -----------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/optional.cc b/third_party/libcxx/optional.cc index 4339c414b..b16a4ec52 100644 --- a/third_party/libcxx/optional.cc +++ b/third_party/libcxx/optional.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------ optional.cpp --------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/regex b/third_party/libcxx/regex index d53a5f924..e3a2dd9a7 100644 --- a/third_party/libcxx/regex +++ b/third_party/libcxx/regex @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- regex ------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/regex.cc b/third_party/libcxx/regex.cc index 8518ae086..e4985e094 100644 --- a/third_party/libcxx/regex.cc +++ b/third_party/libcxx/regex.cc @@ -1,4 +1,3 @@ -// clang-format off //===-------------------------- regex.cpp ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/scoped_allocator b/third_party/libcxx/scoped_allocator index 72785c3d6..d4ef4f02f 100644 --- a/third_party/libcxx/scoped_allocator +++ b/third_party/libcxx/scoped_allocator @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===-------------------------- scoped_allocator --------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/shared_mutex b/third_party/libcxx/shared_mutex index 13aeae9fb..97870c168 100644 --- a/third_party/libcxx/shared_mutex +++ b/third_party/libcxx/shared_mutex @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===------------------------ shared_mutex --------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/shared_mutex.cc b/third_party/libcxx/shared_mutex.cc index 034e0fb16..6881e1f72 100644 --- a/third_party/libcxx/shared_mutex.cc +++ b/third_party/libcxx/shared_mutex.cc @@ -1,4 +1,3 @@ -// clang-format off //===---------------------- shared_mutex.cpp ------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/span b/third_party/libcxx/span index c56bed57e..53d9a2ac7 100644 --- a/third_party/libcxx/span +++ b/third_party/libcxx/span @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===------------------------------ span ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/stack b/third_party/libcxx/stack index a6a556a99..46c7202bf 100644 --- a/third_party/libcxx/stack +++ b/third_party/libcxx/stack @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===---------------------------- stack -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/string.cc b/third_party/libcxx/string.cc index 8c30f3a15..69ae2bb4b 100644 --- a/third_party/libcxx/string.cc +++ b/third_party/libcxx/string.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------- string.cpp ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/strstream b/third_party/libcxx/strstream index 5ef123ba4..23fd3804d 100644 --- a/third_party/libcxx/strstream +++ b/third_party/libcxx/strstream @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- strstream --------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/strstream.cc b/third_party/libcxx/strstream.cc index 9fdb2398c..af3befe2b 100644 --- a/third_party/libcxx/strstream.cc +++ b/third_party/libcxx/strstream.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------ strstream.cpp -------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/thread b/third_party/libcxx/thread index 9e2c4fbb4..3c070fba3 100644 --- a/third_party/libcxx/thread +++ b/third_party/libcxx/thread @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===--------------------------- thread -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/thread.cc b/third_party/libcxx/thread.cc index 179f5eddb..e1e367383 100644 --- a/third_party/libcxx/thread.cc +++ b/third_party/libcxx/thread.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------- thread.cpp----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/typeindex b/third_party/libcxx/typeindex index b69943c29..de01b756f 100644 --- a/third_party/libcxx/typeindex +++ b/third_party/libcxx/typeindex @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===-------------------------- typeindex ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/valarray b/third_party/libcxx/valarray index 6bb5d2e48..e970d4bd5 100644 --- a/third_party/libcxx/valarray +++ b/third_party/libcxx/valarray @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===-------------------------- valarray ----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/valarray.cc b/third_party/libcxx/valarray.cc index 10598d059..777e50018 100644 --- a/third_party/libcxx/valarray.cc +++ b/third_party/libcxx/valarray.cc @@ -1,4 +1,3 @@ -// clang-format off //===------------------------ valarray.cpp --------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/libcxx/variant b/third_party/libcxx/variant index dca523ebe..c3606f8e0 100644 --- a/third_party/libcxx/variant +++ b/third_party/libcxx/variant @@ -1,5 +1,4 @@ // -*- C++ -*- -// clang-format off //===------------------------------ variant -------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/third_party/linenoise/linenoise.c b/third_party/linenoise/linenoise.c index 1f66e8dcc..fe6de0612 100644 --- a/third_party/linenoise/linenoise.c +++ b/third_party/linenoise/linenoise.c @@ -139,7 +139,7 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/intrin/asan.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsr.h" #include "libc/intrin/nomultics.internal.h" #include "libc/intrin/strace.internal.h" diff --git a/third_party/linenoise/linenoise.h b/third_party/linenoise/linenoise.h index 246b79b9f..ac2f7f73b 100644 --- a/third_party/linenoise/linenoise.h +++ b/third_party/linenoise/linenoise.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_LINENOISE_LINENOISE_H_ #include "libc/calls/struct/winsize.h" #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct linenoiseState; @@ -51,5 +50,4 @@ void linenoiseRefreshLine(struct linenoiseState *); char *linenoiseRaw(const char *, int, int) __wur; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_LINENOISE_LINENOISE_H_ */ diff --git a/third_party/lua/cosmo.h b/third_party/lua/cosmo.h index cc0969c64..0c6f17fe4 100644 --- a/third_party/lua/cosmo.h +++ b/third_party/lua/cosmo.h @@ -4,7 +4,6 @@ #include "net/http/url.h" #include "third_party/lua/lauxlib.h" #include "third_party/lua/visitor.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct EncoderConfig { @@ -39,5 +38,4 @@ int SerializeObjectEnd(char **, struct Serializer *, int, bool); int SerializeObjectIndent(char **, struct Serializer *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_LUA_COSMO_H_ */ diff --git a/third_party/lua/lapi.c b/third_party/lua/lapi.c index 0c8f52172..99907ab95 100644 --- a/third_party/lua/lapi.c +++ b/third_party/lua/lapi.c @@ -42,7 +42,6 @@ #include "third_party/lua/lua.h" #include "third_party/lua/lundump.h" #include "third_party/lua/lvm.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lapi.h b/third_party/lua/lapi.h index 0c5d784d7..ee8f01a2b 100644 --- a/third_party/lua/lapi.h +++ b/third_party/lua/lapi.h @@ -4,7 +4,6 @@ #include "third_party/lua/llimits.h" #include "third_party/lua/lstate.h" -/* clang-format off */ /* Increments 'L->top', checking for stack overflows */ #define api_incr_top(L) {L->top++; api_check(L, L->top <= L->ci->top, \ diff --git a/third_party/lua/lauxlib.c b/third_party/lua/lauxlib.c index 9014af4ad..e4cd8a43b 100644 --- a/third_party/lua/lauxlib.c +++ b/third_party/lua/lauxlib.c @@ -34,7 +34,6 @@ #include "third_party/lua/lauxlib.h" #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lauxlib.h b/third_party/lua/lauxlib.h index 6d8d024a9..194cf3e62 100644 --- a/third_party/lua/lauxlib.h +++ b/third_party/lua/lauxlib.h @@ -4,7 +4,6 @@ #include "libc/stdio/stdio.h" #include "third_party/lua/lua.h" #include "third_party/lua/luaconf.h" -/* clang-format off */ /* global table */ #define LUA_GNAME "_G" diff --git a/third_party/lua/lbaselib.c b/third_party/lua/lbaselib.c index a636184ec..f84028601 100644 --- a/third_party/lua/lbaselib.c +++ b/third_party/lua/lbaselib.c @@ -32,7 +32,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lcode.c b/third_party/lua/lcode.c index 1e54b3f6a..5777f4bd4 100644 --- a/third_party/lua/lcode.c +++ b/third_party/lua/lcode.c @@ -42,7 +42,6 @@ #include "third_party/lua/ltable.h" #include "third_party/lua/lua.h" #include "third_party/lua/lvm.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lcode.h b/third_party/lua/lcode.h index fe7da153a..7e519ee03 100644 --- a/third_party/lua/lcode.h +++ b/third_party/lua/lcode.h @@ -6,7 +6,6 @@ #include "third_party/lua/lopcodes.h" #include "third_party/lua/lparser.h" -/* clang-format off */ /* ** Marks the end of a patch list. It is an invalid value both as an absolute diff --git a/third_party/lua/lcorolib.c b/third_party/lua/lcorolib.c index 6cb615f10..81d77424b 100644 --- a/third_party/lua/lcorolib.c +++ b/third_party/lua/lcorolib.c @@ -31,7 +31,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/ldblib.c b/third_party/lua/ldblib.c index c7060b3eb..e86d208a4 100644 --- a/third_party/lua/ldblib.c +++ b/third_party/lua/ldblib.c @@ -32,7 +32,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/ldebug.c b/third_party/lua/ldebug.c index 7917778bc..485d839e3 100644 --- a/third_party/lua/ldebug.c +++ b/third_party/lua/ldebug.c @@ -42,7 +42,6 @@ #include "third_party/lua/ltm.h" #include "third_party/lua/lua.h" #include "third_party/lua/lvm.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/ldebug.h b/third_party/lua/ldebug.h index fb87123e7..2e5d59b1b 100644 --- a/third_party/lua/ldebug.h +++ b/third_party/lua/ldebug.h @@ -3,7 +3,6 @@ #include "third_party/lua/lstate.h" -/* clang-format off */ #define pcRel(pc, p) (cast_int((pc) - (p)->code) - 1) diff --git a/third_party/lua/ldo.c b/third_party/lua/ldo.c index 0d1f30a0b..2e39b9de4 100644 --- a/third_party/lua/ldo.c +++ b/third_party/lua/ldo.c @@ -51,7 +51,6 @@ #include "third_party/lua/lundump.h" #include "third_party/lua/lvm.h" #include "third_party/lua/lzio.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/ldo.h b/third_party/lua/ldo.h index 5a5bff6a8..314913c8b 100644 --- a/third_party/lua/ldo.h +++ b/third_party/lua/ldo.h @@ -5,7 +5,6 @@ #include "third_party/lua/lstate.h" #include "third_party/lua/lzio.h" -/* clang-format off */ /* ** Macro to check stack size and grow stack if needed. Parameters diff --git a/third_party/lua/ldump.c b/third_party/lua/ldump.c index 05c2c1cab..fe4060647 100644 --- a/third_party/lua/ldump.c +++ b/third_party/lua/ldump.c @@ -32,7 +32,6 @@ #include "third_party/lua/lstate.h" #include "third_party/lua/lua.h" #include "third_party/lua/lundump.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lfunc.c b/third_party/lua/lfunc.c index cedce1480..48e13eae4 100644 --- a/third_party/lua/lfunc.c +++ b/third_party/lua/lfunc.c @@ -37,7 +37,6 @@ #include "third_party/lua/lstate.h" #include "third_party/lua/ltm.h" #include "third_party/lua/lua.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lfunc.h b/third_party/lua/lfunc.h index 4f15eb98b..68c26419a 100644 --- a/third_party/lua/lfunc.h +++ b/third_party/lua/lfunc.h @@ -3,7 +3,6 @@ #include "third_party/lua/lobject.h" -/* clang-format off */ #define sizeCclosure(n) (cast_int(offsetof(CClosure, upvalue)) + \ cast_int(sizeof(TValue)) * (n)) diff --git a/third_party/lua/lgc.c b/third_party/lua/lgc.c index 5e5b5e8e7..c59dcda9b 100644 --- a/third_party/lua/lgc.c +++ b/third_party/lua/lgc.c @@ -40,7 +40,6 @@ #include "third_party/lua/ltable.h" #include "third_party/lua/ltm.h" #include "third_party/lua/lua.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lgc.h b/third_party/lua/lgc.h index efe88f329..f01f15b7a 100644 --- a/third_party/lua/lgc.h +++ b/third_party/lua/lgc.h @@ -4,7 +4,6 @@ #include "third_party/lua/lobject.h" #include "third_party/lua/lstate.h" -/* clang-format off */ /* ** Collectable objects may have one of three colors: white, which means diff --git a/third_party/lua/linit.c b/third_party/lua/linit.c index f64dd1327..44fc5b246 100644 --- a/third_party/lua/linit.c +++ b/third_party/lua/linit.c @@ -46,7 +46,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/liolib.c b/third_party/lua/liolib.c index a6502cd2b..5beb9a312 100644 --- a/third_party/lua/liolib.c +++ b/third_party/lua/liolib.c @@ -37,7 +37,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/llex.c b/third_party/lua/llex.c index 7907a089b..83fa2890d 100644 --- a/third_party/lua/llex.c +++ b/third_party/lua/llex.c @@ -40,7 +40,6 @@ #include "third_party/lua/ltable.h" #include "third_party/lua/lua.h" #include "third_party/lua/lzio.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/llex.h b/third_party/lua/llex.h index ae20dc87f..b9222e851 100644 --- a/third_party/lua/llex.h +++ b/third_party/lua/llex.h @@ -10,7 +10,6 @@ #include "third_party/lua/lobject.h" #include "third_party/lua/lzio.h" -/* clang-format off */ /* ** Single-char tokens (terminal symbols) are represented by their own diff --git a/third_party/lua/llimits.h b/third_party/lua/llimits.h index 03c2fd812..cc202ff79 100644 --- a/third_party/lua/llimits.h +++ b/third_party/lua/llimits.h @@ -5,7 +5,6 @@ #include "libc/math.h" #include "third_party/lua/lua.h" -/* clang-format off */ /* ** 'lu_mem' and 'l_mem' are unsigned/signed integers big enough to count diff --git a/third_party/lua/lmathlib.c b/third_party/lua/lmathlib.c index 59e4bb51b..b253d14d3 100644 --- a/third_party/lua/lmathlib.c +++ b/third_party/lua/lmathlib.c @@ -34,7 +34,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lmem.c b/third_party/lua/lmem.c index 8025eab7c..d26b2f227 100644 --- a/third_party/lua/lmem.c +++ b/third_party/lua/lmem.c @@ -36,7 +36,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lstate.h" #include "third_party/lua/lua.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lmem.h b/third_party/lua/lmem.h index e3b4f4d01..96187a836 100644 --- a/third_party/lua/lmem.h +++ b/third_party/lua/lmem.h @@ -4,7 +4,6 @@ #include "third_party/lua/llimits.h" #include "third_party/lua/lua.h" -/* clang-format off */ #define luaM_error(L) luaD_throw(L, LUA_ERRMEM) diff --git a/third_party/lua/loadlib.c b/third_party/lua/loadlib.c index 35ba0d973..c4b0e9527 100644 --- a/third_party/lua/loadlib.c +++ b/third_party/lua/loadlib.c @@ -34,7 +34,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lobject.c b/third_party/lua/lobject.c index 4e0b2d6af..5169a7c8e 100644 --- a/third_party/lua/lobject.c +++ b/third_party/lua/lobject.c @@ -38,7 +38,6 @@ #include "third_party/lua/lstring.h" #include "third_party/lua/lua.h" #include "third_party/lua/lvm.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lobject.h b/third_party/lua/lobject.h index af5c03956..b02a6e2ff 100644 --- a/third_party/lua/lobject.h +++ b/third_party/lua/lobject.h @@ -5,7 +5,6 @@ #include "third_party/lua/llimits.h" #include "third_party/lua/lua.h" -/* clang-format off */ /* ** Extra types for collectable non-values diff --git a/third_party/lua/lopcodes.c b/third_party/lua/lopcodes.c index 9af17c352..5bf4b0afa 100644 --- a/third_party/lua/lopcodes.c +++ b/third_party/lua/lopcodes.c @@ -29,7 +29,6 @@ #define LUA_CORE #include "third_party/lua/lopcodes.h" #include "third_party/lua/lprefix.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lopcodes.h b/third_party/lua/lopcodes.h index 7ae716b85..e84553c11 100644 --- a/third_party/lua/lopcodes.h +++ b/third_party/lua/lopcodes.h @@ -3,7 +3,6 @@ #include "third_party/lua/llimits.h" -/* clang-format off */ /*=========================================================================== We assume that instructions are unsigned 32-bit integers. diff --git a/third_party/lua/loslib.c b/third_party/lua/loslib.c index 7022712f8..8ed0d0bd0 100644 --- a/third_party/lua/loslib.c +++ b/third_party/lua/loslib.c @@ -41,7 +41,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lparser.c b/third_party/lua/lparser.c index a8a0689ad..b0903b30f 100644 --- a/third_party/lua/lparser.c +++ b/third_party/lua/lparser.c @@ -42,7 +42,6 @@ #include "third_party/lua/lstring.h" #include "third_party/lua/ltable.h" #include "third_party/lua/lua.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lparser.h b/third_party/lua/lparser.h index 96ad3bc31..2bb3df406 100644 --- a/third_party/lua/lparser.h +++ b/third_party/lua/lparser.h @@ -5,7 +5,6 @@ #include "third_party/lua/lobject.h" #include "third_party/lua/lzio.h" -/* clang-format off */ /* ** Expression and variable descriptor. diff --git a/third_party/lua/lrepl.c b/third_party/lua/lrepl.c index 89d9659b8..4fb0f5a8e 100644 --- a/third_party/lua/lrepl.c +++ b/third_party/lua/lrepl.c @@ -48,7 +48,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lrepl.h b/third_party/lua/lrepl.h index e66232e0c..a2294c5ca 100644 --- a/third_party/lua/lrepl.h +++ b/third_party/lua/lrepl.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_LUA_LREPL_H_ #include "third_party/linenoise/linenoise.h" #include "third_party/lua/lauxlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern bool lua_repl_blocking; @@ -25,5 +24,4 @@ char *lua_readline_hint(const char *, const char **, const char **); void lua_readline_completions(const char *, linenoiseCompletions *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_LUA_LREPL_H_ */ diff --git a/third_party/lua/lstate.c b/third_party/lua/lstate.c index b136094ec..5a1f70cd5 100644 --- a/third_party/lua/lstate.c +++ b/third_party/lua/lstate.c @@ -42,7 +42,6 @@ #include "third_party/lua/ltable.h" #include "third_party/lua/ltm.h" #include "third_party/lua/lua.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lstate.h b/third_party/lua/lstate.h index b0b7cd17f..3e3318d96 100644 --- a/third_party/lua/lstate.h +++ b/third_party/lua/lstate.h @@ -7,7 +7,6 @@ #include "third_party/lua/lzio.h" #include "third_party/lua/tms.h" -/* clang-format off */ /* ** Some notes about garbage-collected objects: All objects in Lua must diff --git a/third_party/lua/lstring.c b/third_party/lua/lstring.c index ec4e500bd..f13c4ac72 100644 --- a/third_party/lua/lstring.c +++ b/third_party/lua/lstring.c @@ -36,7 +36,6 @@ #include "third_party/lua/lstate.h" #include "third_party/lua/lstring.h" #include "third_party/lua/lua.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lstring.h b/third_party/lua/lstring.h index d9cd11ada..4393cf0c1 100644 --- a/third_party/lua/lstring.h +++ b/third_party/lua/lstring.h @@ -5,7 +5,6 @@ #include "third_party/lua/lobject.h" #include "third_party/lua/lstate.h" -/* clang-format off */ /* ** Memory-allocation error message must be preallocated (it cannot diff --git a/third_party/lua/lstrlib.c b/third_party/lua/lstrlib.c index 906b46a3a..39287c7c4 100644 --- a/third_party/lua/lstrlib.c +++ b/third_party/lua/lstrlib.c @@ -34,7 +34,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/ltable.c b/third_party/lua/ltable.c index a5bf84153..fce2b7cb5 100644 --- a/third_party/lua/ltable.c +++ b/third_party/lua/ltable.c @@ -38,7 +38,6 @@ #include "third_party/lua/ltable.h" #include "third_party/lua/lua.h" #include "third_party/lua/lvm.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/ltable.h b/third_party/lua/ltable.h index 7b4014e14..7a4d8d5f2 100644 --- a/third_party/lua/ltable.h +++ b/third_party/lua/ltable.h @@ -3,7 +3,6 @@ #include "third_party/lua/lobject.h" -/* clang-format off */ #define gnode(t,i) (&(t)->node[i]) #define gval(n) (&(n)->i_val) diff --git a/third_party/lua/ltablib.c b/third_party/lua/ltablib.c index 4ed8f478e..9891fa17a 100644 --- a/third_party/lua/ltablib.c +++ b/third_party/lua/ltablib.c @@ -34,7 +34,6 @@ #include "third_party/lua/lprefix.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/ltests.c b/third_party/lua/ltests.c index f0cf71020..1d8e1e720 100644 --- a/third_party/lua/ltests.c +++ b/third_party/lua/ltests.c @@ -43,7 +43,6 @@ #include "third_party/lua/ltable.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/ltests.h b/third_party/lua/ltests.h index 20fe75070..6c00b98fa 100644 --- a/third_party/lua/ltests.h +++ b/third_party/lua/ltests.h @@ -2,7 +2,6 @@ #define ltests_h #include "third_party/lua/lua.h" -/* clang-format off */ /* test Lua with compatibility code */ #define LUA_COMPAT_MATHLIB diff --git a/third_party/lua/ltm.c b/third_party/lua/ltm.c index 25becb214..c803ecaa5 100644 --- a/third_party/lua/ltm.c +++ b/third_party/lua/ltm.c @@ -38,7 +38,6 @@ #include "third_party/lua/ltm.h" #include "third_party/lua/lua.h" #include "third_party/lua/lvm.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/ltm.h b/third_party/lua/ltm.h index 0bc15fddf..b369bde8c 100644 --- a/third_party/lua/ltm.h +++ b/third_party/lua/ltm.h @@ -3,7 +3,6 @@ #include "third_party/lua/lobject.h" #include "third_party/lua/luaconf.h" #include "third_party/lua/tms.h" -/* clang-format off */ /* ** Mask with 1 in all fast-access methods. A 1 in any of these bits diff --git a/third_party/lua/lua.h b/third_party/lua/lua.h index 4e9b825f2..430f74216 100644 --- a/third_party/lua/lua.h +++ b/third_party/lua/lua.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_LUA_LUA_H_ #define COSMOPOLITAN_THIRD_PARTY_LUA_LUA_H_ #include "third_party/lua/luaconf.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #define LUA_VERSION_MAJOR "5" #define LUA_VERSION_MINOR "4" @@ -482,5 +480,4 @@ struct lua_Debug { extern const char *g_lua_path_default; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_LUA_LUA_H_ */ diff --git a/third_party/lua/lua.main.c b/third_party/lua/lua.main.c index 1375c6d4e..2c0aa802e 100644 --- a/third_party/lua/lua.main.c +++ b/third_party/lua/lua.main.c @@ -50,7 +50,6 @@ #include "third_party/lua/lualib.h" #include "third_party/lua/lunix.h" #include "tool/args/args.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/luac.main.c b/third_party/lua/luac.main.c index 9548a57db..454ed7cb6 100644 --- a/third_party/lua/luac.main.c +++ b/third_party/lua/luac.main.c @@ -43,7 +43,6 @@ #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" #include "third_party/lua/lundump.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/luaconf.h b/third_party/lua/luaconf.h index 4a30d889c..d3f2519a5 100644 --- a/third_party/lua/luaconf.h +++ b/third_party/lua/luaconf.h @@ -10,7 +10,6 @@ #define LUA_USE_POSIX #define LUA_USE_LINENOISE -/* clang-format off */ /* ** =================================================================== diff --git a/third_party/lua/luaencodejsondata.c b/third_party/lua/luaencodejsondata.c index 849f7341d..69ca6c77a 100644 --- a/third_party/lua/luaencodejsondata.c +++ b/third_party/lua/luaencodejsondata.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/likely.h" #include "libc/log/log.h" #include "libc/log/rop.internal.h" diff --git a/third_party/lua/luaencodeluadata.c b/third_party/lua/luaencodeluadata.c index 723f3535e..ec0e95497 100644 --- a/third_party/lua/luaencodeluadata.c +++ b/third_party/lua/luaencodeluadata.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/log/rop.internal.h" #include "libc/math.h" #include "libc/mem/mem.h" @@ -165,7 +165,6 @@ int main(int argc, char *argv[]) { } #endif -// clang-format off static const char kLuaStrXlat[256] = { 1,1,1,1,1,1,1,'a','b','t','n','v','f','r',1,1, // 0x00 1,1,1,1,1,1,1,1,1,1,1,'e',1,1,1,1, // 0x10 diff --git a/third_party/lua/lualib.h b/third_party/lua/lualib.h index 47dfc39e3..ae0207cdf 100644 --- a/third_party/lua/lualib.h +++ b/third_party/lua/lualib.h @@ -2,7 +2,6 @@ #define lualib_h #include "third_party/lua/lua.h" -/* clang-format off */ /* version suffix for environment variable names */ #define LUA_VERSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR diff --git a/third_party/lua/lundump.c b/third_party/lua/lundump.c index beb991090..c993542dc 100644 --- a/third_party/lua/lundump.c +++ b/third_party/lua/lundump.c @@ -19,7 +19,6 @@ #include "third_party/lua/lundump.h" #include "third_party/lua/lzio.h" -/* clang-format off */ #if !defined(luai_verifycode) #define luai_verifycode(L,f) /* empty */ diff --git a/third_party/lua/lundump.h b/third_party/lua/lundump.h index 84fa58ab3..03efd23e5 100644 --- a/third_party/lua/lundump.h +++ b/third_party/lua/lundump.h @@ -4,7 +4,6 @@ #include "third_party/lua/lobject.h" #include "third_party/lua/lzio.h" -/* clang-format off */ /* data to catch conversion errors */ #define LUAC_DATA "\x19\x93\r\n\x1a\n" diff --git a/third_party/lua/lunix.c b/third_party/lua/lunix.c index a16b92c1f..6027be070 100644 --- a/third_party/lua/lunix.c +++ b/third_party/lua/lunix.c @@ -46,7 +46,7 @@ #include "libc/fmt/itoa.h" #include "libc/fmt/magnumstrs.internal.h" #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/strace.internal.h" #include "libc/limits.h" #include "libc/log/log.h" diff --git a/third_party/lua/lunix.h b/third_party/lua/lunix.h index 947e0ced7..099e84ff7 100644 --- a/third_party/lua/lunix.h +++ b/third_party/lua/lunix.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_LUA_LUNIX_H_ #define COSMOPOLITAN_THIRD_PARTY_LUA_LUNIX_H_ #include "third_party/lua/lauxlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct UnixErrno { @@ -14,5 +13,4 @@ int LuaUnix(lua_State *); int LuaUnixSysretErrno(lua_State *, const char *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_LUA_LUNIX_H_ */ diff --git a/third_party/lua/lutf8lib.c b/third_party/lua/lutf8lib.c index 670108b37..00e2b1ff3 100644 --- a/third_party/lua/lutf8lib.c +++ b/third_party/lua/lutf8lib.c @@ -12,7 +12,6 @@ #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" -/* clang-format off */ #define MAXUNICODE 0x10FFFFu diff --git a/third_party/lua/lvm.c b/third_party/lua/lvm.c index 13dd54d8f..37c296e97 100644 --- a/third_party/lua/lvm.c +++ b/third_party/lua/lvm.c @@ -41,7 +41,6 @@ #include "third_party/lua/ltm.h" #include "third_party/lua/lua.h" #include "third_party/lua/lvm.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lvm.h b/third_party/lua/lvm.h index 9abf879ce..ff2d47ed7 100644 --- a/third_party/lua/lvm.h +++ b/third_party/lua/lvm.h @@ -4,7 +4,6 @@ #include "third_party/lua/lobject.h" #include "third_party/lua/ltm.h" -/* clang-format off */ #if !defined(LUA_NOCVTN2S) #define cvt2str(o) ttisnumber(o) diff --git a/third_party/lua/lzio.c b/third_party/lua/lzio.c index 6e0ea173b..c8206ad31 100644 --- a/third_party/lua/lzio.c +++ b/third_party/lua/lzio.c @@ -34,7 +34,6 @@ #include "third_party/lua/lstate.h" #include "third_party/lua/lua.h" #include "third_party/lua/lzio.h" -// clang-format off asm(".ident\t\"\\n\\n\ Lua 5.4.3 (MIT License)\\n\ diff --git a/third_party/lua/lzio.h b/third_party/lua/lzio.h index 0f539ade8..cff150c3e 100644 --- a/third_party/lua/lzio.h +++ b/third_party/lua/lzio.h @@ -10,7 +10,6 @@ #include "third_party/lua/lmem.h" #include "third_party/lua/lua.h" -/* clang-format off */ #define EOZ (-1) /* end of stream */ diff --git a/third_party/lua/tms.h b/third_party/lua/tms.h index fa04079e1..ddb8f8cf2 100644 --- a/third_party/lua/tms.h +++ b/third_party/lua/tms.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_LUA_TMS_H_ #define COSMOPOLITAN_THIRD_PARTY_LUA_TMS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* @@ -37,5 +36,4 @@ typedef enum { } TMS; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_LUA_TMS_H_ */ diff --git a/third_party/lua/visitor.h b/third_party/lua/visitor.h index 49f719b1f..861b5de9b 100644 --- a/third_party/lua/visitor.h +++ b/third_party/lua/visitor.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_LUA_VISITOR_H_ #define COSMOPOLITAN_THIRD_PARTY_LUA_VISITOR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct LuaVisited { @@ -12,5 +11,4 @@ int LuaPushVisit(struct LuaVisited *, const void *); void LuaPopVisit(struct LuaVisited *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_LUA_VISITOR_H_ */ diff --git a/third_party/lz4cli/bench.c b/third_party/lz4cli/bench.c index 48ba7a701..e651b7931 100644 --- a/third_party/lz4cli/bench.c +++ b/third_party/lz4cli/bench.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* bench.c - Demo program to benchmark open-source compression algorithms Copyright (C) Yann Collet 2012-2016 diff --git a/third_party/lz4cli/bench.h b/third_party/lz4cli/bench.h index ce5efedc2..ad85be863 100644 --- a/third_party/lz4cli/bench.h +++ b/third_party/lz4cli/bench.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* bench.h - Demo program to benchmark open-source compression algorithm Copyright (C) Yann Collet 2012-2016 diff --git a/third_party/lz4cli/datagen.c b/third_party/lz4cli/datagen.c index 37326dcd2..89cf630b8 100644 --- a/third_party/lz4cli/datagen.c +++ b/third_party/lz4cli/datagen.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* datagen.c - compressible data generator test tool Copyright (C) Yann Collet 2012-2016 diff --git a/third_party/lz4cli/datagen.h b/third_party/lz4cli/datagen.h index 6ba9ae425..aa00a2ffc 100644 --- a/third_party/lz4cli/datagen.h +++ b/third_party/lz4cli/datagen.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* datagen.h - compressible data generator header Copyright (C) Yann Collet 2012-2016 diff --git a/third_party/lz4cli/lz4.c b/third_party/lz4cli/lz4.c index 7f39742a3..e7b55bcaa 100644 --- a/third_party/lz4cli/lz4.c +++ b/third_party/lz4cli/lz4.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* LZ4 - Fast LZ compression algorithm Copyright (C) 2011-present, Yann Collet. diff --git a/third_party/lz4cli/lz4.h b/third_party/lz4cli/lz4.h index 9302878f8..c5d819fd3 100644 --- a/third_party/lz4cli/lz4.h +++ b/third_party/lz4cli/lz4.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* * LZ4 - Fast LZ compression algorithm * Header File diff --git a/third_party/lz4cli/lz4cli.c b/third_party/lz4cli/lz4cli.c index 2903cc9c8..a2e5ecc57 100644 --- a/third_party/lz4cli/lz4cli.c +++ b/third_party/lz4cli/lz4cli.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* LZ4cli - LZ4 Command Line Interface Copyright (C) Yann Collet 2011-2016 diff --git a/third_party/lz4cli/lz4frame.c b/third_party/lz4cli/lz4frame.c index 2d979164a..8e0fb3b02 100644 --- a/third_party/lz4cli/lz4frame.c +++ b/third_party/lz4cli/lz4frame.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* LZ4 auto-framing library Copyright (C) 2011-2016, Yann Collet. diff --git a/third_party/lz4cli/lz4frame.h b/third_party/lz4cli/lz4frame.h index 5894f91b3..9df250b54 100644 --- a/third_party/lz4cli/lz4frame.h +++ b/third_party/lz4cli/lz4frame.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* LZ4 auto-framing library Header File diff --git a/third_party/lz4cli/lz4hc.c b/third_party/lz4cli/lz4hc.c index fa8cc4025..b33f465b8 100644 --- a/third_party/lz4cli/lz4hc.c +++ b/third_party/lz4cli/lz4hc.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* LZ4 HC - High Compression Mode of LZ4 Copyright (C) 2011-2017, Yann Collet. diff --git a/third_party/lz4cli/lz4hc.h b/third_party/lz4cli/lz4hc.h index f412c5da0..31c20c557 100644 --- a/third_party/lz4cli/lz4hc.h +++ b/third_party/lz4cli/lz4hc.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* LZ4 HC - High Compression Mode of LZ4 Header File diff --git a/third_party/lz4cli/lz4io.c b/third_party/lz4cli/lz4io.c index 8934ccae9..cbfa1757b 100644 --- a/third_party/lz4cli/lz4io.c +++ b/third_party/lz4cli/lz4io.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* LZ4io.c - LZ4 File/Stream Interface Copyright (C) Yann Collet 2011-2017 diff --git a/third_party/lz4cli/lz4io.h b/third_party/lz4cli/lz4io.h index 82f2a4606..81c29b651 100644 --- a/third_party/lz4cli/lz4io.h +++ b/third_party/lz4cli/lz4io.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* LZ4io.h - LZ4 File/Stream Interface Copyright (C) Yann Collet 2011-2016 diff --git a/third_party/lz4cli/platform.h b/third_party/lz4cli/platform.h index 6da8d6fe6..6a780b5bc 100644 --- a/third_party/lz4cli/platform.h +++ b/third_party/lz4cli/platform.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* platform.h - compiler and OS detection Copyright (C) 2016-present, Przemyslaw Skibinski, Yann Collet diff --git a/third_party/lz4cli/util.h b/third_party/lz4cli/util.h index c1997568b..1bb76c175 100644 --- a/third_party/lz4cli/util.h +++ b/third_party/lz4cli/util.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* util.h - utility functions Copyright (C) 2016-present, Przemyslaw Skibinski, Yann Collet diff --git a/third_party/lz4cli/xxhash.c b/third_party/lz4cli/xxhash.c index 2e157f83a..0018bf857 100644 --- a/third_party/lz4cli/xxhash.c +++ b/third_party/lz4cli/xxhash.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * xxHash - Fast Hash algorithm * Copyright (C) 2012-2016, Yann Collet diff --git a/third_party/lz4cli/xxhash.h b/third_party/lz4cli/xxhash.h index 0048760f5..79d74d968 100644 --- a/third_party/lz4cli/xxhash.h +++ b/third_party/lz4cli/xxhash.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* xxHash - Extremely Fast Hash algorithm Header File diff --git a/third_party/make/alloca.h b/third_party/make/alloca.h index 7932af7f9..7d23d903a 100644 --- a/third_party/make/alloca.h +++ b/third_party/make/alloca.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Memory allocation on the stack. diff --git a/third_party/make/ar.c b/third_party/make/ar.c index 696647305..93a0305f8 100644 --- a/third_party/make/ar.c +++ b/third_party/make/ar.c @@ -20,7 +20,6 @@ this program. If not, see . */ #include "third_party/make/dep.h" #include "third_party/make/filedef.h" #include "third_party/musl/fnmatch.h" -/* clang-format off */ /* Return nonzero if NAME is an archive-member reference, zero if not. An archive-member reference is a name like 'lib(member)' where member is a diff --git a/third_party/make/arscan.c b/third_party/make/arscan.c index 925e12783..bd948bad5 100644 --- a/third_party/make/arscan.c +++ b/third_party/make/arscan.c @@ -16,7 +16,6 @@ this program. If not, see . */ #include "libc/sysv/consts/o.h" #include "third_party/make/makeint.inc" -/* clang-format off */ #ifdef TEST /* Hack, the real error() routine eventually pulls in die from main.c */ diff --git a/third_party/make/basename-lgpl.c b/third_party/make/basename-lgpl.c index 4161cc4da..682bd1847 100644 --- a/third_party/make/basename-lgpl.c +++ b/third_party/make/basename-lgpl.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* basename.c -- return the last element in a file name Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2020 Free Software @@ -21,7 +20,6 @@ /**/ #include "libc/str/str.h" #include "third_party/make/dirname.h" -/* clang-format off */ /* Return the address of the last file name component of NAME. If NAME has no relative file name components because it is a file diff --git a/third_party/make/commands.c b/third_party/make/commands.c index 595002b63..11e344239 100644 --- a/third_party/make/commands.c +++ b/third_party/make/commands.c @@ -24,7 +24,6 @@ this program. If not, see . */ #include "libc/runtime/runtime.h" #include "libc/sysv/consts/sig.h" #include "third_party/make/commands.h" -/* clang-format off */ #define FILE_LIST_SEPARATOR ' ' diff --git a/third_party/make/commands.h b/third_party/make/commands.h index e9700fbdb..d86752c8b 100644 --- a/third_party/make/commands.h +++ b/third_party/make/commands.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Definition of data structures describing shell commands for GNU Make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/concat-filename.c b/third_party/make/concat-filename.c index 457c8ff87..1b84fe860 100644 --- a/third_party/make/concat-filename.c +++ b/third_party/make/concat-filename.c @@ -21,7 +21,6 @@ #include "third_party/make/concat-filename.h" #include "third_party/make/filename.h" #include "third_party/make/config.h" -/* clang-format off */ /* Concatenate a directory filename, a relative filename and an optional suffix. The directory may end with the directory separator. The second diff --git a/third_party/make/concat-filename.h b/third_party/make/concat-filename.h index e1b2ccafa..64b461e39 100644 --- a/third_party/make/concat-filename.h +++ b/third_party/make/concat-filename.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Construct a full filename from a directory and a relative filename. Copyright (C) 2001-2004, 2007-2020 Free Software Foundation, Inc. diff --git a/third_party/make/debug.h b/third_party/make/debug.h index 84440f107..66e17ff15 100644 --- a/third_party/make/debug.h +++ b/third_party/make/debug.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Debugging macros and interface. Copyright (C) 1999-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/default.c b/third_party/make/default.c index 1ba88c285..c97040e97 100644 --- a/third_party/make/default.c +++ b/third_party/make/default.c @@ -14,7 +14,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/makeint.inc" /**/ #include "third_party/make/filedef.h" diff --git a/third_party/make/dep.h b/third_party/make/dep.h index a5237b550..84319f15a 100644 --- a/third_party/make/dep.h +++ b/third_party/make/dep.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Definitions of dependency data structures for GNU Make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/dir.c b/third_party/make/dir.c index 363e957de..0e0fabc7f 100644 --- a/third_party/make/dir.c +++ b/third_party/make/dir.c @@ -22,7 +22,6 @@ this program. If not, see . */ #include "third_party/make/filedef.h" #include "third_party/make/hash.h" #include "third_party/musl/glob.h" -/* clang-format off */ #ifndef __ptr_t #define __ptr_t void * diff --git a/third_party/make/dirname-lgpl.c b/third_party/make/dirname-lgpl.c index 1d69e3c9a..65d686564 100644 --- a/third_party/make/dirname-lgpl.c +++ b/third_party/make/dirname-lgpl.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* dirname.c -- return all but the last element in a file name Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2020 Free Software @@ -22,7 +21,6 @@ #include "libc/mem/mem.h" #include "libc/str/str.h" #include "third_party/make/dirname.h" -/* clang-format off */ /* Return the length of the prefix of FILE that will be used by dir_name. If FILE is in the working directory, this returns zero diff --git a/third_party/make/dirname.h b/third_party/make/dirname.h index 07d6bee16..80e1b300d 100644 --- a/third_party/make/dirname.h +++ b/third_party/make/dirname.h @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #ifndef DIRNAME_H_ # define DIRNAME_H_ 1 diff --git a/third_party/make/error.c b/third_party/make/error.c index edcf84228..c663b1b69 100644 --- a/third_party/make/error.c +++ b/third_party/make/error.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Error handler for noninteractive utilities Copyright (C) 1990-1998, 2000-2007, 2009-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/third_party/make/error.h b/third_party/make/error.h index 5a3509414..bad47a16d 100644 --- a/third_party/make/error.h +++ b/third_party/make/error.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Declaration for error-reporting function Copyright (C) 1995-1997, 2003, 2006, 2008-2020 Free Software Foundation, Inc. diff --git a/third_party/make/exitfail.c b/third_party/make/exitfail.c index cd3613c67..6b073520d 100644 --- a/third_party/make/exitfail.c +++ b/third_party/make/exitfail.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Failure exit status Copyright (C) 2002-2003, 2005-2007, 2009-2020 Free Software Foundation, Inc. diff --git a/third_party/make/exitfail.h b/third_party/make/exitfail.h index b8916774c..a69a03bbd 100644 --- a/third_party/make/exitfail.h +++ b/third_party/make/exitfail.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Failure exit status Copyright (C) 2002, 2009-2020 Free Software Foundation, Inc. diff --git a/third_party/make/expand.c b/third_party/make/expand.c index dec21e2fd..0a3aa17bd 100644 --- a/third_party/make/expand.c +++ b/third_party/make/expand.c @@ -14,7 +14,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/makeint.inc" /**/ #include "third_party/make/filedef.h" diff --git a/third_party/make/fcntl.c b/third_party/make/fcntl.c index 7123e1d02..a98139605 100644 --- a/third_party/make/fcntl.c +++ b/third_party/make/fcntl.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Provide file descriptor control. Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/third_party/make/fcntl.h b/third_party/make/fcntl.h index bf588e69b..54af7da7f 100644 --- a/third_party/make/fcntl.h +++ b/third_party/make/fcntl.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Like , but with non-working flags defined to 0. diff --git a/third_party/make/fd-hook.c b/third_party/make/fd-hook.c index 1add5ecea..852e4ab2c 100644 --- a/third_party/make/fd-hook.c +++ b/third_party/make/fd-hook.c @@ -1,5 +1,3 @@ -/* clang-format off */ -/* clang-format off */ /* Hook for making file descriptor functions close(), ioctl() extensible. Copyright (C) 2009-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2009. diff --git a/third_party/make/fd-hook.h b/third_party/make/fd-hook.h index 5bb643595..ed1a15a23 100644 --- a/third_party/make/fd-hook.h +++ b/third_party/make/fd-hook.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Hook for making file descriptor functions close(), ioctl() extensible. Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/third_party/make/file.c b/third_party/make/file.c index fd5724a72..991a3f5e7 100644 --- a/third_party/make/file.c +++ b/third_party/make/file.c @@ -14,7 +14,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/makeint.inc" /**/ #include "third_party/make/filedef.h" diff --git a/third_party/make/filedef.h b/third_party/make/filedef.h index 5bdf90058..aab75773c 100644 --- a/third_party/make/filedef.h +++ b/third_party/make/filedef.h @@ -19,7 +19,6 @@ this program. If not, see . */ All of these are chained together through 'next'. */ #include "third_party/make/hash.h" -/* clang-format off */ struct commands; struct dep; diff --git a/third_party/make/filename.h b/third_party/make/filename.h index beb24dd13..6a9533982 100644 --- a/third_party/make/filename.h +++ b/third_party/make/filename.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Basic filename support macros. Copyright (C) 2001-2004, 2007-2020 Free Software Foundation, Inc. diff --git a/third_party/make/findprog-in.c b/third_party/make/findprog-in.c index 826b766f3..4ae85ef10 100644 --- a/third_party/make/findprog-in.c +++ b/third_party/make/findprog-in.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Locating a program in a given path. Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2001, 2019. diff --git a/third_party/make/findprog.h b/third_party/make/findprog.h index c6f9c8742..60f432530 100644 --- a/third_party/make/findprog.h +++ b/third_party/make/findprog.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Locating a program in PATH. Copyright (C) 2001-2003, 2009-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2001. diff --git a/third_party/make/function.c b/third_party/make/function.c index e94888216..5fe386045 100644 --- a/third_party/make/function.c +++ b/third_party/make/function.c @@ -14,7 +14,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/makeint.inc" /**/ #include "third_party/make/filedef.h" diff --git a/third_party/make/getopt.c b/third_party/make/getopt.c index 74838c83a..cd8994e33 100644 --- a/third_party/make/getopt.c +++ b/third_party/make/getopt.c @@ -22,7 +22,6 @@ this program. If not, see . */ #include "libc/stdio/stdio.h" #include "libc/str/str.h" -/* clang-format off */ /* This tells Alpha OSF/1 not to define a getopt prototype in . Ditto for AIX 3.2 and . */ diff --git a/third_party/make/getopt.h b/third_party/make/getopt.h index 6fda5391d..a0a58d8f9 100644 --- a/third_party/make/getopt.h +++ b/third_party/make/getopt.h @@ -16,7 +16,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #ifndef _GETOPT_H #define _GETOPT_H 1 diff --git a/third_party/make/getopt1.c b/third_party/make/getopt1.c index d0e42fdfb..59f57e700 100644 --- a/third_party/make/getopt1.c +++ b/third_party/make/getopt1.c @@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include "third_party/make/getopt.h" -/* clang-format off */ #ifdef HAVE_CONFIG_H #include "third_party/make/config.h" diff --git a/third_party/make/getprogname.c b/third_party/make/getprogname.c index 36e70ecf7..209160423 100644 --- a/third_party/make/getprogname.c +++ b/third_party/make/getprogname.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/config.h" #include "third_party/make/getprogname.h" #include "libc/intrin/safemacros.internal.h" diff --git a/third_party/make/getprogname.h b/third_party/make/getprogname.h index c75c5075e..ff899585b 100644 --- a/third_party/make/getprogname.h +++ b/third_party/make/getprogname.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Program name management. Copyright (C) 2016-2020 Free Software Foundation, Inc. diff --git a/third_party/make/gettext.h b/third_party/make/gettext.h index 87af5b136..38ffc10bc 100644 --- a/third_party/make/gettext.h +++ b/third_party/make/gettext.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Convenience header for conditional use of GNU . Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2020 Free Software Foundation, Inc. diff --git a/third_party/make/gnumake.h b/third_party/make/gnumake.h index 6dbdaf97a..fe0f7f309 100644 --- a/third_party/make/gnumake.h +++ b/third_party/make/gnumake.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* External interfaces usable by dynamic objects loaded into GNU Make. --THIS API IS A "TECHNOLOGY PREVIEW" ONLY. IT IS NOT A STABLE INTERFACE-- diff --git a/third_party/make/guile.c b/third_party/make/guile.c index b3a5e7099..18b526624 100644 --- a/third_party/make/guile.c +++ b/third_party/make/guile.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* GNU Guile interface for GNU Make. Copyright (C) 2011-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/hash.c b/third_party/make/hash.c index 6068a6e5a..0012dcdcc 100644 --- a/third_party/make/hash.c +++ b/third_party/make/hash.c @@ -17,14 +17,13 @@ this program. If not, see . */ #include "third_party/make/makeint.inc" /**/ #include "libc/assert.h" -#include "libc/intrin/bits.h" #include "libc/intrin/bsr.h" #include "libc/intrin/likely.h" #include "libc/log/check.h" #include "libc/runtime/runtime.h" #include "libc/x/x.h" +#include "libc/serialize.h" #include "third_party/make/hash.h" -/* clang-format off */ #define CALLOC(t, n) ((t *) xcalloc (1, sizeof (t) * (n))) #define MALLOC(t, n) ((t *) xmalloc (sizeof (t) * (n))) diff --git a/third_party/make/hash.h b/third_party/make/hash.h index 1ba92f222..52222cb2d 100644 --- a/third_party/make/hash.h +++ b/third_party/make/hash.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* hash.h -- decls for hash table Copyright (C) 1995, 1999, 2002, 2010 Free Software Foundation, Inc. Written by Greg McGary diff --git a/third_party/make/implicit.c b/third_party/make/implicit.c index e83e5192c..6538da3b4 100644 --- a/third_party/make/implicit.c +++ b/third_party/make/implicit.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Implicit rule searching for GNU Make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/intprops.h b/third_party/make/intprops.h index 1243a7b32..283282c54 100644 --- a/third_party/make/intprops.h +++ b/third_party/make/intprops.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* intprops.h -- properties of integer types Copyright (C) 2001-2020 Free Software Foundation, Inc. diff --git a/third_party/make/job.c b/third_party/make/job.c index 688393068..a9e1ff1c1 100644 --- a/third_party/make/job.c +++ b/third_party/make/job.c @@ -37,7 +37,6 @@ this program. If not, see . */ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/fmt/libgen.h" -#include "libc/intrin/bits.h" #include "libc/intrin/promises.internal.h" #include "libc/intrin/safemacros.internal.h" #include "libc/log/backtrace.internal.h" @@ -65,8 +64,8 @@ this program. If not, see . */ #include "third_party/make/dep.h" #include "third_party/make/findprog.h" #include "third_party/make/os.h" +#include "libc/serialize.h" #include "third_party/make/variable.h" -// clang-format off #define USE_POSIX_SPAWN (!IsLinux() && !IsOpenbsd()) #define HAVE_POSIX_SPAWNATTR_SETSIGMASK diff --git a/third_party/make/job.h b/third_party/make/job.h index 6992485aa..41236962a 100644 --- a/third_party/make/job.h +++ b/third_party/make/job.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Definitions for managing subprocesses in GNU Make. Copyright (C) 1992-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/load.c b/third_party/make/load.c index 86466a8fc..facf5bfa7 100644 --- a/third_party/make/load.c +++ b/third_party/make/load.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Loading dynamic objects for GNU Make. Copyright (C) 2012-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/loadapi.c b/third_party/make/loadapi.c index 627e270b6..0d03212f5 100644 --- a/third_party/make/loadapi.c +++ b/third_party/make/loadapi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* API for GNU Make dynamic objects. Copyright (C) 2013-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/main.c b/third_party/make/main.c index 64697f8c0..bbe688ec9 100644 --- a/third_party/make/main.c +++ b/third_party/make/main.c @@ -43,7 +43,6 @@ this program. If not, see . */ #include "libc/sysv/consts/pr.h" #include "libc/sysv/consts/sig.h" #include "third_party/make/getopt.h" -// clang-format off STATIC_STACK_SIZE(0x00800000); // 8mb stack diff --git a/third_party/make/makeint.inc b/third_party/make/makeint.inc index e8d9f0a1f..7ba9c3732 100644 --- a/third_party/make/makeint.inc +++ b/third_party/make/makeint.inc @@ -51,7 +51,6 @@ this program. If not, see . */ #include "libc/time/time.h" #include "third_party/gdtoa/gdtoa.h" #include "third_party/musl/glob.h" -/* clang-format off */ /* We use instead of "config.h" so that a compilation using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h diff --git a/third_party/make/misc.c b/third_party/make/misc.c index ee93ae300..0a06bd3ad 100644 --- a/third_party/make/misc.c +++ b/third_party/make/misc.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Miscellaneous generic support functions for GNU Make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/os.h b/third_party/make/os.h index 6187604a1..e7bf37a5c 100644 --- a/third_party/make/os.h +++ b/third_party/make/os.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Declarations for operating system interfaces for GNU Make. Copyright (C) 2016-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/output.c b/third_party/make/output.c index 1733caf7f..902d598a3 100644 --- a/third_party/make/output.c +++ b/third_party/make/output.c @@ -14,7 +14,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/makeint.inc" #include "third_party/make/os.h" #include "third_party/make/output.h" diff --git a/third_party/make/output.h b/third_party/make/output.h index 08d1cfdcd..abc6ca575 100644 --- a/third_party/make/output.h +++ b/third_party/make/output.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Output to stdout / stderr for GNU make Copyright (C) 2013-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/posixos.c b/third_party/make/posixos.c index a7a64db55..032a9d611 100644 --- a/third_party/make/posixos.c +++ b/third_party/make/posixos.c @@ -25,7 +25,6 @@ this program. If not, see . */ #include "third_party/make/debug.h" #include "third_party/make/job.h" #include "third_party/make/os.h" -/* clang-format off */ #ifdef MAKE_JOBSERVER diff --git a/third_party/make/read.c b/third_party/make/read.c index b0cb6028c..e40eab123 100644 --- a/third_party/make/read.c +++ b/third_party/make/read.c @@ -14,7 +14,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/makeint.inc" #include "third_party/make/filedef.h" #include "third_party/make/dep.h" diff --git a/third_party/make/remake.c b/third_party/make/remake.c index d8282aa44..0b24e3dfc 100644 --- a/third_party/make/remake.c +++ b/third_party/make/remake.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Basic dependency engine for GNU Make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/remote-stub.c b/third_party/make/remote-stub.c index 4f51daae1..88a224e37 100644 --- a/third_party/make/remote-stub.c +++ b/third_party/make/remote-stub.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Template for the remote job exportation interface to GNU Make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/rule.c b/third_party/make/rule.c index ad367d1ee..a0e47c487 100644 --- a/third_party/make/rule.c +++ b/third_party/make/rule.c @@ -14,7 +14,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/makeint.inc" #include "third_party/make/filedef.h" #include "third_party/make/dep.h" diff --git a/third_party/make/rule.h b/third_party/make/rule.h index 757cdf437..120a6827b 100644 --- a/third_party/make/rule.h +++ b/third_party/make/rule.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Definitions for using pattern rules in GNU Make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/stddef.h b/third_party/make/stddef.h index 444f0f725..8b4e07db1 100644 --- a/third_party/make/stddef.h +++ b/third_party/make/stddef.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute for POSIX 2008 , for platforms that have issues. diff --git a/third_party/make/stdint.h b/third_party/make/stdint.h index 8a670de61..2dc75fe88 100644 --- a/third_party/make/stdint.h +++ b/third_party/make/stdint.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Copyright (C) 2001-2002, 2004-2020 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. diff --git a/third_party/make/stdio.h b/third_party/make/stdio.h index 40d71f3ff..91b1b154e 100644 --- a/third_party/make/stdio.h +++ b/third_party/make/stdio.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . diff --git a/third_party/make/stdlib.h b/third_party/make/stdlib.h index f5002666d..eb4eb77b8 100644 --- a/third_party/make/stdlib.h +++ b/third_party/make/stdlib.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . diff --git a/third_party/make/strcache.c b/third_party/make/strcache.c index 6add30cab..f22e58ab5 100644 --- a/third_party/make/strcache.c +++ b/third_party/make/strcache.c @@ -14,7 +14,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/makeint.inc" #include "third_party/make/hash.h" diff --git a/third_party/make/stripslash.c b/third_party/make/stripslash.c index 1b27fb032..7e2b986d3 100644 --- a/third_party/make/stripslash.c +++ b/third_party/make/stripslash.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* stripslash.c -- remove redundant trailing slashes from a file name Copyright (C) 1990, 2001, 2003-2006, 2009-2020 Free Software Foundation, diff --git a/third_party/make/unistd.c b/third_party/make/unistd.c index b52b1b50b..cfbab7415 100644 --- a/third_party/make/unistd.c +++ b/third_party/make/unistd.c @@ -1,4 +1,3 @@ -/* clang-format off */ #include "third_party/make/config.h" #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE #include "third_party/make/unistd.h" diff --git a/third_party/make/unistd.h b/third_party/make/unistd.h index 8b0979c79..5e0a56513 100644 --- a/third_party/make/unistd.h +++ b/third_party/make/unistd.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Substitute for and wrapper around . Copyright (C) 2003-2020 Free Software Foundation, Inc. diff --git a/third_party/make/variable.c b/third_party/make/variable.c index 0a13fcd8a..2b1c53214 100644 --- a/third_party/make/variable.c +++ b/third_party/make/variable.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Internals of variables for GNU Make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/variable.h b/third_party/make/variable.h index 9099cca49..c7884e0f0 100644 --- a/third_party/make/variable.h +++ b/third_party/make/variable.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Definitions for using variables in GNU Make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/version.c b/third_party/make/version.c index cfe376d35..e793c75aa 100644 --- a/third_party/make/version.c +++ b/third_party/make/version.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Record version and build host architecture for GNU make. Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GNU Make. diff --git a/third_party/make/vpath.c b/third_party/make/vpath.c index 643701939..836537e90 100644 --- a/third_party/make/vpath.c +++ b/third_party/make/vpath.c @@ -14,7 +14,6 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* clang-format off */ #include "third_party/make/makeint.inc" #include "third_party/make/filedef.h" #include "third_party/make/variable.h" diff --git a/third_party/make/xalloc-die.c b/third_party/make/xalloc-die.c index bf48529e1..c7a62a5f0 100644 --- a/third_party/make/xalloc-die.c +++ b/third_party/make/xalloc-die.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Report a memory allocation failure and exit. Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2020 Free Software diff --git a/third_party/make/xalloc-oversized.h b/third_party/make/xalloc-oversized.h index 816006767..ed09c7001 100644 --- a/third_party/make/xalloc-oversized.h +++ b/third_party/make/xalloc-oversized.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* xalloc-oversized.h -- memory allocation size checking Copyright (C) 1990-2000, 2003-2004, 2006-2020 Free Software Foundation, Inc. diff --git a/third_party/make/xalloc.h b/third_party/make/xalloc.h index 70c57bea9..6b813fa00 100644 --- a/third_party/make/xalloc.h +++ b/third_party/make/xalloc.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* xalloc.h -- malloc with out-of-memory checking Copyright (C) 1990-2000, 2003-2004, 2006-2020 Free Software Foundation, Inc. diff --git a/third_party/make/xconcat-filename.c b/third_party/make/xconcat-filename.c index 3c111095c..3aad7842a 100644 --- a/third_party/make/xconcat-filename.c +++ b/third_party/make/xconcat-filename.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Construct a full filename from a directory and a relative filename. Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc. diff --git a/third_party/make/xmalloc.c b/third_party/make/xmalloc.c index 3487f1520..f60f85e34 100644 --- a/third_party/make/xmalloc.c +++ b/third_party/make/xmalloc.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* xmalloc.c -- malloc with out of memory checking Copyright (C) 1990-2000, 2002-2006, 2008-2020 Free Software Foundation, Inc. diff --git a/third_party/maxmind/maxminddb.c b/third_party/maxmind/maxminddb.c index d20fc0f6d..09b5320ab 100644 --- a/third_party/maxmind/maxminddb.c +++ b/third_party/maxmind/maxminddb.c @@ -22,7 +22,7 @@ #include "libc/calls/weirdtypes.h" #include "libc/errno.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/inttypes.h" #include "libc/limits.h" #include "libc/mem/mem.h" diff --git a/third_party/maxmind/maxminddb.h b/third_party/maxmind/maxminddb.h index b805bc853..ab47610fe 100644 --- a/third_party/maxmind/maxminddb.h +++ b/third_party/maxmind/maxminddb.h @@ -41,7 +41,6 @@ #define MMDB_INVALID_NODE_NUMBER_ERROR 10 #define MMDB_IPV6_LOOKUP_IN_IPV4_DATABASE_ERROR 11 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* This is a pointer into the data section for a given IP address lookup */ @@ -178,5 +177,4 @@ const char *MMDB_strerror(int); const char *GetMetroName(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MAXMIND_MAXMINDDB_H_ */ diff --git a/third_party/mbedtls/aes.c b/third_party/mbedtls/aes.c index 6f63c16ca..d9b60be1a 100644 --- a/third_party/mbedtls/aes.c +++ b/third_party/mbedtls/aes.c @@ -16,7 +16,7 @@ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/mbedtls/aes.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/nexgen32e/x86feature.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" @@ -33,7 +33,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview FIPS-197 compliant AES implementation diff --git a/third_party/mbedtls/aes.h b/third_party/mbedtls/aes.h index 5b17ec5f6..6a039da52 100644 --- a/third_party/mbedtls/aes.h +++ b/third_party/mbedtls/aes.h @@ -2,7 +2,6 @@ #define MBEDTLS_AES_H_ #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* padlock.c and aesni.c rely on these values! */ #define MBEDTLS_AES_ENCRYPT 1 /*< AES encryption. */ diff --git a/third_party/mbedtls/aesce.c b/third_party/mbedtls/aesce.c index 9d2779e95..6b53ae6a8 100644 --- a/third_party/mbedtls/aesce.c +++ b/third_party/mbedtls/aesce.c @@ -24,7 +24,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* * Armv8-A Cryptographic Extension support functions for Aarch64 diff --git a/third_party/mbedtls/aesce.h b/third_party/mbedtls/aesce.h index 88a56d49d..174377902 100644 --- a/third_party/mbedtls/aesce.h +++ b/third_party/mbedtls/aesce.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_AESCE_H_ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_AESCE_H_ #include "third_party/mbedtls/aes.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /** @@ -58,5 +57,4 @@ int mbedtls_aesce_setkey_enc(unsigned char *rk, const unsigned char *key, size_t bits); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_AESCE_H_ */ diff --git a/third_party/mbedtls/aesni.c b/third_party/mbedtls/aesni.c index cc1d6a36b..8ee995428 100644 --- a/third_party/mbedtls/aesni.c +++ b/third_party/mbedtls/aesni.c @@ -16,7 +16,7 @@ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/mbedtls/aesni.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/str/str.h" #include "third_party/mbedtls/common.h" @@ -26,7 +26,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * [AES-WP] http://software.intel.com/en-us/articles/intel-advanced-encryption-standard-aes-instructions-set * [CLMUL-WP] http://software.intel.com/en-us/articles/intel-carry-less-multiplication-instruction-and-its-usage-for-computing-the-gcm-mode/ diff --git a/third_party/mbedtls/aesni.h b/third_party/mbedtls/aesni.h index 1ba509dde..92e73cea2 100644 --- a/third_party/mbedtls/aesni.h +++ b/third_party/mbedtls/aesni.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/aes.h" #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_AESNI_AES 0x02000000u #define MBEDTLS_AESNI_CLMUL 0x00000002u diff --git a/third_party/mbedtls/asn1.h b/third_party/mbedtls/asn1.h index 0bffed0df..97ec93f9a 100644 --- a/third_party/mbedtls/asn1.h +++ b/third_party/mbedtls/asn1.h @@ -3,7 +3,6 @@ #include "libc/str/str.h" #include "third_party/mbedtls/bignum.h" #include "third_party/mbedtls/config.h" -/* clang-format off */ /** * \addtogroup asn1_module diff --git a/third_party/mbedtls/asn1parse.c b/third_party/mbedtls/asn1parse.c index 2e630fab1..5a1115512 100644 --- a/third_party/mbedtls/asn1parse.c +++ b/third_party/mbedtls/asn1parse.c @@ -27,7 +27,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #if defined(MBEDTLS_ASN1_PARSE_C) diff --git a/third_party/mbedtls/asn1write.c b/third_party/mbedtls/asn1write.c index 4cd0c64c9..5077e6134 100644 --- a/third_party/mbedtls/asn1write.c +++ b/third_party/mbedtls/asn1write.c @@ -26,7 +26,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview ASN.1 buffer writing functionality diff --git a/third_party/mbedtls/asn1write.h b/third_party/mbedtls/asn1write.h index 0d0f5c953..405d52082 100644 --- a/third_party/mbedtls/asn1write.h +++ b/third_party/mbedtls/asn1write.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/asn1.h" #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ASN1_CHK_ADD(g, f) \ do \ diff --git a/third_party/mbedtls/base64.c b/third_party/mbedtls/base64.c index 85f7a43f1..ba62912d4 100644 --- a/third_party/mbedtls/base64.c +++ b/third_party/mbedtls/base64.c @@ -25,7 +25,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #define ENC "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" diff --git a/third_party/mbedtls/base64.h b/third_party/mbedtls/base64.h index 5df543f72..a345a1ef5 100644 --- a/third_party/mbedtls/base64.h +++ b/third_party/mbedtls/base64.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_BASE64_H_ #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL -0x002A /*< Output buffer too small. */ #define MBEDTLS_ERR_BASE64_INVALID_CHARACTER -0x002C /*< Invalid character in input. */ diff --git a/third_party/mbedtls/bigmul.c b/third_party/mbedtls/bigmul.c index 56710ecbb..1682b2f75 100644 --- a/third_party/mbedtls/bigmul.c +++ b/third_party/mbedtls/bigmul.c @@ -15,7 +15,6 @@ │ See the License for the specific language governing permissions and │ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/log/backtrace.internal.h" #include "libc/log/check.h" #include "libc/macros.internal.h" @@ -24,7 +23,6 @@ #include "third_party/mbedtls/bignum.h" #include "third_party/mbedtls/bignum_internal.h" #include "third_party/mbedtls/profile.h" -/* clang-format off */ void Mul(uint64_t *c, const uint64_t *A, unsigned n, const uint64_t *B, unsigned m) { diff --git a/third_party/mbedtls/bigmul4.c b/third_party/mbedtls/bigmul4.c index d012a4cca..7acae9e26 100644 --- a/third_party/mbedtls/bigmul4.c +++ b/third_party/mbedtls/bigmul4.c @@ -18,7 +18,6 @@ #include "libc/nexgen32e/x86feature.h" #include "third_party/mbedtls/bignum_internal.h" #include "third_party/mbedtls/math.h" -/* clang-format off */ /** * Computes 512-bit product of 256-bit and 256-bit numbers. diff --git a/third_party/mbedtls/bignum.c b/third_party/mbedtls/bignum.c index 301b1041c..2a67ddcf3 100644 --- a/third_party/mbedtls/bignum.c +++ b/third_party/mbedtls/bignum.c @@ -16,7 +16,7 @@ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/mbedtls/bignum.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsf.h" #include "libc/intrin/bswap.h" #include "libc/macros.internal.h" @@ -39,7 +39,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview Big Numbers. diff --git a/third_party/mbedtls/bignum.h b/third_party/mbedtls/bignum.h index fb0e104be..7b6552044 100644 --- a/third_party/mbedtls/bignum.h +++ b/third_party/mbedtls/bignum.h @@ -5,7 +5,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/platform.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_MPI_FILE_IO_ERROR -0x0002 /*< An error occurred while reading from or writing to a file. */ #define MBEDTLS_ERR_MPI_BAD_INPUT_DATA -0x0004 /*< Bad input parameters to function. */ diff --git a/third_party/mbedtls/bignum_internal.h b/third_party/mbedtls/bignum_internal.h index 9c64dc77b..21a0ede99 100644 --- a/third_party/mbedtls/bignum_internal.h +++ b/third_party/mbedtls/bignum_internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_BIGNUM_INTERNAL_H_ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_BIGNUM_INTERNAL_H_ #include "third_party/mbedtls/platform.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define MPI_VALIDATE_RET(cond) \ @@ -36,5 +35,4 @@ void mbedtls_mpi_mul_hlp(size_t, const uint64_t *, uint64_t *, uint64_t); void mbedtls_mpi_mul_hlp1(size_t, const uint64_t *, uint64_t *, uint64_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_BIGNUM_INTERNAL_H_ */ diff --git a/third_party/mbedtls/bigshift.c b/third_party/mbedtls/bigshift.c index 265d93767..8cee75a89 100644 --- a/third_party/mbedtls/bigshift.c +++ b/third_party/mbedtls/bigshift.c @@ -20,7 +20,6 @@ #include "third_party/mbedtls/bignum.h" #include "third_party/mbedtls/bignum_internal.h" #include "third_party/mbedtls/platform.h" -/* clang-format off */ typedef long long xmm_t __attribute__((__vector_size__(16), __aligned__(1))); diff --git a/third_party/mbedtls/blake2b256.c b/third_party/mbedtls/blake2b256.c index 2ffec50a8..6a42eeb99 100644 --- a/third_party/mbedtls/blake2b256.c +++ b/third_party/mbedtls/blake2b256.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/blake2.h" #include "third_party/mbedtls/md.h" -/* clang-format off */ const mbedtls_md_info_t mbedtls_blake2b256_info = { "BLAKE2B256", diff --git a/third_party/mbedtls/ccm.c b/third_party/mbedtls/ccm.c index e018be40a..a77b09a01 100644 --- a/third_party/mbedtls/ccm.c +++ b/third_party/mbedtls/ccm.c @@ -26,7 +26,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview NIST SP800-38C compliant CCM implementation diff --git a/third_party/mbedtls/ccm.h b/third_party/mbedtls/ccm.h index dc98e39bc..d9b64265d 100644 --- a/third_party/mbedtls/ccm.h +++ b/third_party/mbedtls/ccm.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_CCM_H_ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_CCM_H_ #include "third_party/mbedtls/cipher.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define MBEDTLS_ERR_CCM_BAD_INPUT \ @@ -49,5 +48,4 @@ int mbedtls_ccm_star_auth_decrypt(mbedtls_ccm_context *, size_t, int mbedtls_ccm_self_test(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_CCM_H_ */ diff --git a/third_party/mbedtls/certs.c b/third_party/mbedtls/certs.c index cdcf71f75..cf5b29152 100644 --- a/third_party/mbedtls/certs.c +++ b/third_party/mbedtls/certs.c @@ -23,7 +23,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #if defined(MBEDTLS_CERTS_C) diff --git a/third_party/mbedtls/certs.h b/third_party/mbedtls/certs.h index a98b20584..eca327b2b 100644 --- a/third_party/mbedtls/certs.h +++ b/third_party/mbedtls/certs.h @@ -1,7 +1,6 @@ #ifndef MBEDTLS_CERTS_H #define MBEDTLS_CERTS_H #include "third_party/mbedtls/config.h" -/* clang-format off */ #ifdef __cplusplus extern "C" { diff --git a/third_party/mbedtls/chacha20.c b/third_party/mbedtls/chacha20.c index 3fec6a6d8..1ff2d1f2d 100644 --- a/third_party/mbedtls/chacha20.c +++ b/third_party/mbedtls/chacha20.c @@ -15,10 +15,10 @@ │ See the License for the specific language governing permissions and │ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "third_party/mbedtls/chacha20.h" +#include "libc/serialize.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -#include "third_party/mbedtls/chacha20.h" #include "third_party/mbedtls/common.h" #include "third_party/mbedtls/error.h" #include "third_party/mbedtls/platform.h" @@ -28,7 +28,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* Parameter validation macros */ #define CHACHA20_VALIDATE_RET( cond ) \ diff --git a/third_party/mbedtls/chacha20.h b/third_party/mbedtls/chacha20.h index 92d222edd..6444b4f02 100644 --- a/third_party/mbedtls/chacha20.h +++ b/third_party/mbedtls/chacha20.h @@ -2,7 +2,6 @@ #define MBEDTLS_CHACHA20_H_ #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA -0x0051 /*< Invalid input parameter(s). */ diff --git a/third_party/mbedtls/chachapoly.c b/third_party/mbedtls/chachapoly.c index c449bb535..1b0537d82 100644 --- a/third_party/mbedtls/chachapoly.c +++ b/third_party/mbedtls/chachapoly.c @@ -27,7 +27,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview ChaCha20-Poly1305 AEAD construction based on RFC 7539. diff --git a/third_party/mbedtls/chachapoly.h b/third_party/mbedtls/chachapoly.h index 032074f2c..5a340bbe5 100644 --- a/third_party/mbedtls/chachapoly.h +++ b/third_party/mbedtls/chachapoly.h @@ -2,7 +2,6 @@ #define MBEDTLS_CHACHAPOLY_H #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/poly1305.h" -/* clang-format off */ #define MBEDTLS_ERR_CHACHAPOLY_BAD_STATE -0x0054 /*< The requested operation is not permitted in the current state. */ #define MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED -0x0056 /*< Authenticated decryption failed: data was not authentic. */ diff --git a/third_party/mbedtls/check.inc b/third_party/mbedtls/check.inc index 4603ae108..1fef483b7 100644 --- a/third_party/mbedtls/check.inc +++ b/third_party/mbedtls/check.inc @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(TARGET_LIKE_MBED) && \ ( defined(MBEDTLS_NET_C) || defined(MBEDTLS_TIMING_C) ) diff --git a/third_party/mbedtls/cipher.c b/third_party/mbedtls/cipher.c index f2af20eca..64a7a607d 100644 --- a/third_party/mbedtls/cipher.c +++ b/third_party/mbedtls/cipher.c @@ -32,7 +32,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #if defined(MBEDTLS_CIPHER_C) diff --git a/third_party/mbedtls/cipher.h b/third_party/mbedtls/cipher.h index ac6d32782..65f64bac6 100644 --- a/third_party/mbedtls/cipher.h +++ b/third_party/mbedtls/cipher.h @@ -2,7 +2,6 @@ #define MBEDTLS_CIPHER_H #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/platform.h" -/* clang-format off */ #define MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE -0x6080 /*< The selected feature is not available. */ #define MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA -0x6100 /*< Bad input parameters. */ diff --git a/third_party/mbedtls/cipher_internal.h b/third_party/mbedtls/cipher_internal.h index 06fe74adb..ffd7a6729 100644 --- a/third_party/mbedtls/cipher_internal.h +++ b/third_party/mbedtls/cipher_internal.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/cipher.h" #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /** * Base cipher information. The non-mode specific functions and values. diff --git a/third_party/mbedtls/cipher_wrap.c b/third_party/mbedtls/cipher_wrap.c index fe586ede9..2df1117b4 100644 --- a/third_party/mbedtls/cipher_wrap.c +++ b/third_party/mbedtls/cipher_wrap.c @@ -33,7 +33,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #if defined(MBEDTLS_CIPHER_C) diff --git a/third_party/mbedtls/ctr_drbg.c b/third_party/mbedtls/ctr_drbg.c index 7d01d94ac..cd3906391 100644 --- a/third_party/mbedtls/ctr_drbg.c +++ b/third_party/mbedtls/ctr_drbg.c @@ -21,7 +21,6 @@ #include "third_party/mbedtls/ctr_drbg.h" #include "third_party/mbedtls/error.h" #include "third_party/mbedtls/platform.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ Mbed TLS (Apache 2.0)\\n\ diff --git a/third_party/mbedtls/ctr_drbg.h b/third_party/mbedtls/ctr_drbg.h index 72adf0136..f18d8c568 100644 --- a/third_party/mbedtls/ctr_drbg.h +++ b/third_party/mbedtls/ctr_drbg.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/aes.h" #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED -0x0034 /*< The entropy source failed. */ #define MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG -0x0036 /*< The requested random buffer length is too big. */ diff --git a/third_party/mbedtls/debug.c b/third_party/mbedtls/debug.c index a79626110..ed8366599 100644 --- a/third_party/mbedtls/debug.c +++ b/third_party/mbedtls/debug.c @@ -26,7 +26,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ char mbedtls_debug_threshold; diff --git a/third_party/mbedtls/des.c b/third_party/mbedtls/des.c index 19775b766..bfa25a868 100644 --- a/third_party/mbedtls/des.c +++ b/third_party/mbedtls/des.c @@ -28,7 +28,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview FIPS-46-3 compliant Triple-DES implementation diff --git a/third_party/mbedtls/des.h b/third_party/mbedtls/des.h index f5e7d03a9..b74c7694f 100644 --- a/third_party/mbedtls/des.h +++ b/third_party/mbedtls/des.h @@ -1,7 +1,6 @@ #ifndef MBEDTLS_DES_H #define MBEDTLS_DES_H #include "third_party/mbedtls/config.h" -/* clang-format off */ #define MBEDTLS_DES_ENCRYPT 1 #define MBEDTLS_DES_DECRYPT 0 diff --git a/third_party/mbedtls/dhm.c b/third_party/mbedtls/dhm.c index 8d41b82e6..28339adb6 100644 --- a/third_party/mbedtls/dhm.c +++ b/third_party/mbedtls/dhm.c @@ -30,7 +30,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview Diffie-Hellman-Merkle key exchange diff --git a/third_party/mbedtls/dhm.h b/third_party/mbedtls/dhm.h index 32fea84e2..cf7eba957 100644 --- a/third_party/mbedtls/dhm.h +++ b/third_party/mbedtls/dhm.h @@ -2,7 +2,6 @@ #define MBEDTLS_DHM_H #include "third_party/mbedtls/bignum.h" #include "third_party/mbedtls/config.h" -/* clang-format off */ /* * DHM Error codes diff --git a/third_party/mbedtls/ecdh.c b/third_party/mbedtls/ecdh.c index 4e686bfb9..221e44b3a 100644 --- a/third_party/mbedtls/ecdh.c +++ b/third_party/mbedtls/ecdh.c @@ -25,7 +25,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview Elliptic curve Diffie-Hellman diff --git a/third_party/mbedtls/ecdh.h b/third_party/mbedtls/ecdh.h index 8356175c6..121dd3f6c 100644 --- a/third_party/mbedtls/ecdh.h +++ b/third_party/mbedtls/ecdh.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/ecdh_everest.h" #include "third_party/mbedtls/ecp.h" -/* clang-format off */ #ifdef __cplusplus extern "C" { diff --git a/third_party/mbedtls/ecdh_everest.c b/third_party/mbedtls/ecdh_everest.c index 04b9c1042..d4c019790 100644 --- a/third_party/mbedtls/ecdh_everest.c +++ b/third_party/mbedtls/ecdh_everest.c @@ -26,7 +26,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * \brief This function sets up the ECDH context with the information diff --git a/third_party/mbedtls/ecdsa.c b/third_party/mbedtls/ecdsa.c index 39ca48ba9..b94a32c0f 100644 --- a/third_party/mbedtls/ecdsa.c +++ b/third_party/mbedtls/ecdsa.c @@ -29,7 +29,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview Elliptic curve Digital Signature Algorithm diff --git a/third_party/mbedtls/ecdsa.h b/third_party/mbedtls/ecdsa.h index 4dd088591..3d5a60716 100644 --- a/third_party/mbedtls/ecdsa.h +++ b/third_party/mbedtls/ecdsa.h @@ -4,7 +4,6 @@ #include "third_party/mbedtls/ecp.h" #include "third_party/mbedtls/md.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /** * \brief Maximum ECDSA signature size for a given curve bit size diff --git a/third_party/mbedtls/ecp.c b/third_party/mbedtls/ecp.c index 53aedd803..8e7245c65 100644 --- a/third_party/mbedtls/ecp.c +++ b/third_party/mbedtls/ecp.c @@ -38,7 +38,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview Elliptic curves over GF(p): generic functions diff --git a/third_party/mbedtls/ecp.h b/third_party/mbedtls/ecp.h index ffdfb86ab..f85b7a3cf 100644 --- a/third_party/mbedtls/ecp.h +++ b/third_party/mbedtls/ecp.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/bignum.h" #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_ECP_BAD_INPUT_DATA -0x4F80 /*< Bad input parameters to function. */ #define MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL -0x4F00 /*< The buffer is too small to write to. */ diff --git a/third_party/mbedtls/ecp256.c b/third_party/mbedtls/ecp256.c index 0fc8dc8be..cfd3f477b 100644 --- a/third_party/mbedtls/ecp256.c +++ b/third_party/mbedtls/ecp256.c @@ -26,7 +26,6 @@ #include "third_party/mbedtls/math.h" #include "third_party/mbedtls/profile.h" #include "third_party/mbedtls/select.h" -/* clang-format off */ static bool mbedtls_p256_isz( uint64_t p[4] ) diff --git a/third_party/mbedtls/ecp384.c b/third_party/mbedtls/ecp384.c index b9002fd5a..a2a7d6aa4 100644 --- a/third_party/mbedtls/ecp384.c +++ b/third_party/mbedtls/ecp384.c @@ -27,7 +27,6 @@ #include "third_party/mbedtls/math.h" #include "third_party/mbedtls/profile.h" #include "third_party/mbedtls/select.h" -/* clang-format off */ static bool mbedtls_p384_isz( uint64_t p[6] ) diff --git a/third_party/mbedtls/ecp_curves.c b/third_party/mbedtls/ecp_curves.c index 36a56d48a..e2e9642fa 100644 --- a/third_party/mbedtls/ecp_curves.c +++ b/third_party/mbedtls/ecp_curves.c @@ -27,7 +27,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Elliptic curves over GF(p): curve-specific data and functions * diff --git a/third_party/mbedtls/ecp_internal.h b/third_party/mbedtls/ecp_internal.h index 4a5af7dd4..85d193567 100644 --- a/third_party/mbedtls/ecp_internal.h +++ b/third_party/mbedtls/ecp_internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_ECP_INTERNAL_H_ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/ecp.h" -/* clang-format off */ #if defined(MBEDTLS_ECP_INTERNAL_ALT) diff --git a/third_party/mbedtls/ecpshl.c b/third_party/mbedtls/ecpshl.c index b84a1cd40..295068ce1 100644 --- a/third_party/mbedtls/ecpshl.c +++ b/third_party/mbedtls/ecpshl.c @@ -17,7 +17,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/mbedtls/ecp.h" #include "third_party/mbedtls/math.h" -/* clang-format off */ static void mbedtls_mpi_shift_l_mod_p256( const mbedtls_ecp_group *G, mbedtls_mpi *X ) diff --git a/third_party/mbedtls/entropy.c b/third_party/mbedtls/entropy.c index a94203f94..6420e4cf6 100644 --- a/third_party/mbedtls/entropy.c +++ b/third_party/mbedtls/entropy.c @@ -30,7 +30,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Entropy accumulator implementation * diff --git a/third_party/mbedtls/entropy.h b/third_party/mbedtls/entropy.h index eebcbcd07..453ac82ae 100644 --- a/third_party/mbedtls/entropy.h +++ b/third_party/mbedtls/entropy.h @@ -4,7 +4,6 @@ #include "third_party/mbedtls/sha256.h" #include "third_party/mbedtls/sha512.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_ENTROPY_FORCE_SHA256) #define MBEDTLS_ENTROPY_SHA512_ACCUMULATOR diff --git a/third_party/mbedtls/entropy_poll.h b/third_party/mbedtls/entropy_poll.h index d1f7c6505..01a57b380 100644 --- a/third_party/mbedtls/entropy_poll.h +++ b/third_party/mbedtls/entropy_poll.h @@ -8,7 +8,6 @@ int mbedtls_hardclock_poll(void *, unsigned char *, size_t, size_t *); int mbedtls_hardware_poll(void *, unsigned char *, size_t, size_t *); COSMOPOLITAN_C_END_ -/* clang-format off */ #define MBEDTLS_ENTROPY_MIN_PLATFORM 32 /*< Minimum for platform source */ #define MBEDTLS_ENTROPY_MIN_HARDCLOCK 4 /*< Minimum for mbedtls_timing_hardclock() */ #define MBEDTLS_ENTROPY_MIN_HARDWARE 32 /*< Minimum for the hardware source */ diff --git a/third_party/mbedtls/error.c b/third_party/mbedtls/error.c index 69a372b35..4887e47f3 100644 --- a/third_party/mbedtls/error.c +++ b/third_party/mbedtls/error.c @@ -55,7 +55,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Error message information * diff --git a/third_party/mbedtls/error.h b/third_party/mbedtls/error.h index 0d02c1c2d..10678654d 100644 --- a/third_party/mbedtls/error.h +++ b/third_party/mbedtls/error.h @@ -1,7 +1,6 @@ #ifndef MBEDTLS_ERROR_H #define MBEDTLS_ERROR_H #include "third_party/mbedtls/config.h" -/* clang-format off */ /** * Error code layout. diff --git a/third_party/mbedtls/everest.c b/third_party/mbedtls/everest.c index 17bb15e03..bda81eeed 100644 --- a/third_party/mbedtls/everest.c +++ b/third_party/mbedtls/everest.c @@ -15,7 +15,7 @@ │ See the License for the specific language governing permissions and │ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "third_party/mbedtls/endian.h" asm(".ident\t\"\\n\\n\ diff --git a/third_party/mbedtls/everest.h b/third_party/mbedtls/everest.h index 592aff1ea..220887799 100644 --- a/third_party/mbedtls/everest.h +++ b/third_party/mbedtls/everest.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_EVEREST_H_ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_EVEREST_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void curve25519(uint8_t[32], const uint8_t[32], const uint8_t[32]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_EVEREST_H_ */ diff --git a/third_party/mbedtls/fastdiv.h b/third_party/mbedtls/fastdiv.h index 9f50adfac..16d866a5c 100644 --- a/third_party/mbedtls/fastdiv.h +++ b/third_party/mbedtls/fastdiv.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_FASTDIV_H_ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_FASTDIV_H_ #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Divisor { @@ -30,5 +29,4 @@ forceinline uint64_t Divide(uint64_t x, struct Divisor d) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_FASTDIV_H_ */ diff --git a/third_party/mbedtls/formatclientciphers.c b/third_party/mbedtls/formatclientciphers.c index bb1075b34..62caffdc2 100644 --- a/third_party/mbedtls/formatclientciphers.c +++ b/third_party/mbedtls/formatclientciphers.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/macros.internal.h" #include "libc/stdio/append.h" #include "third_party/mbedtls/iana.h" diff --git a/third_party/mbedtls/gcm.c b/third_party/mbedtls/gcm.c index 243ac6cd3..c186a26a5 100644 --- a/third_party/mbedtls/gcm.c +++ b/third_party/mbedtls/gcm.c @@ -16,7 +16,7 @@ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/mbedtls/gcm.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/likely.h" #include "libc/log/log.h" #include "libc/nexgen32e/x86feature.h" @@ -36,7 +36,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * NIST SP800-38D compliant GCM implementation * diff --git a/third_party/mbedtls/gcm.h b/third_party/mbedtls/gcm.h index 5dea954ee..e48a94dd7 100644 --- a/third_party/mbedtls/gcm.h +++ b/third_party/mbedtls/gcm.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/cipher.h" #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_GCM_ENCRYPT 1 #define MBEDTLS_GCM_DECRYPT 0 diff --git a/third_party/mbedtls/hkdf.c b/third_party/mbedtls/hkdf.c index f568ae1e5..5cf55d804 100644 --- a/third_party/mbedtls/hkdf.c +++ b/third_party/mbedtls/hkdf.c @@ -26,7 +26,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview HKDF implementation (RFC 5869) diff --git a/third_party/mbedtls/hkdf.h b/third_party/mbedtls/hkdf.h index be3c75f47..af6929036 100644 --- a/third_party/mbedtls/hkdf.h +++ b/third_party/mbedtls/hkdf.h @@ -2,10 +2,8 @@ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_HKDF_H_ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/md.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_HKDF_BAD_INPUT_DATA -0x5F80 /*< Bad input parameters to function. */ /* clang-format on */ @@ -20,5 +18,4 @@ int mbedtls_hkdf_expand(const mbedtls_md_info_t *, const unsigned char *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_HKDF_H_ */ diff --git a/third_party/mbedtls/hmac_drbg.c b/third_party/mbedtls/hmac_drbg.c index 2e2938e0f..9e2178911 100644 --- a/third_party/mbedtls/hmac_drbg.c +++ b/third_party/mbedtls/hmac_drbg.c @@ -28,7 +28,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * HMAC_DRBG implementation (NIST SP 800-90) * diff --git a/third_party/mbedtls/hmac_drbg.h b/third_party/mbedtls/hmac_drbg.h index 1f9f1ce92..0a6df7ae0 100644 --- a/third_party/mbedtls/hmac_drbg.h +++ b/third_party/mbedtls/hmac_drbg.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/md.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG -0x0003 /*< Too many random requested in single call. */ #define MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG -0x0005 /*< Input too large (Entropy + additional). */ diff --git a/third_party/mbedtls/iana.h b/third_party/mbedtls/iana.h index 26af033f2..3af5c844e 100644 --- a/third_party/mbedtls/iana.h +++ b/third_party/mbedtls/iana.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_IANA_H_ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_IANA_H_ #include "third_party/mbedtls/ssl.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool IsCipherSuiteGood(uint16_t); @@ -12,5 +11,4 @@ char *FormatSslClientCiphers(const mbedtls_ssl_context *) __wur; const char *DescribeSslClientHandshakeError(const mbedtls_ssl_context *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_IANA_H_ */ diff --git a/third_party/mbedtls/md.c b/third_party/mbedtls/md.c index 598ccb975..bd85de183 100644 --- a/third_party/mbedtls/md.c +++ b/third_party/mbedtls/md.c @@ -27,7 +27,6 @@ #include "third_party/mbedtls/sha1.h" #include "third_party/mbedtls/sha256.h" #include "third_party/mbedtls/sha512.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ Mbed TLS (Apache 2.0)\\n\ diff --git a/third_party/mbedtls/md.h b/third_party/mbedtls/md.h index 53c69b7a0..33f0984a1 100644 --- a/third_party/mbedtls/md.h +++ b/third_party/mbedtls/md.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_MD_H_ #include "third_party/mbedtls/config.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE -0x5080 /*< The selected feature is not available. */ #define MBEDTLS_ERR_MD_BAD_INPUT_DATA -0x5100 /*< Bad input parameters to function. */ diff --git a/third_party/mbedtls/md5.c b/third_party/mbedtls/md5.c index 21018d3fc..ce87d7111 100644 --- a/third_party/mbedtls/md5.c +++ b/third_party/mbedtls/md5.c @@ -15,12 +15,12 @@ │ See the License for the specific language governing permissions and │ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "third_party/mbedtls/md5.h" +#include "libc/serialize.h" #include "libc/str/str.h" #include "third_party/mbedtls/common.h" #include "third_party/mbedtls/error.h" #include "third_party/mbedtls/md.h" -#include "third_party/mbedtls/md5.h" #include "third_party/mbedtls/platform.h" asm(".ident\t\"\\n\\n\ @@ -28,7 +28,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * RFC 1321 compliant MD5 implementation diff --git a/third_party/mbedtls/md5.h b/third_party/mbedtls/md5.h index b7fbae5c6..431bc7aad 100644 --- a/third_party/mbedtls/md5.h +++ b/third_party/mbedtls/md5.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/platform.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_MD5_HW_ACCEL_FAILED -0x002F /*< MD5 hardware accelerator failed */ diff --git a/third_party/mbedtls/md5t.c b/third_party/mbedtls/md5t.c index 03d61073a..73f24ba1d 100644 --- a/third_party/mbedtls/md5t.c +++ b/third_party/mbedtls/md5t.c @@ -24,7 +24,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* * RFC 1321 test vectors diff --git a/third_party/mbedtls/memory_buffer_alloc.c b/third_party/mbedtls/memory_buffer_alloc.c index 53e4f06b0..b76a17def 100644 --- a/third_party/mbedtls/memory_buffer_alloc.c +++ b/third_party/mbedtls/memory_buffer_alloc.c @@ -25,7 +25,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Buffer-based memory allocator * diff --git a/third_party/mbedtls/memory_buffer_alloc.h b/third_party/mbedtls/memory_buffer_alloc.h index 7b66bef30..50d72aa22 100644 --- a/third_party/mbedtls/memory_buffer_alloc.h +++ b/third_party/mbedtls/memory_buffer_alloc.h @@ -1,7 +1,6 @@ #ifndef MBEDTLS_MEMORY_BUFFER_ALLOC_H #define MBEDTLS_MEMORY_BUFFER_ALLOC_H #include "third_party/mbedtls/config.h" -/* clang-format off */ /** * \name SECTION: Module settings diff --git a/third_party/mbedtls/net_sockets.h b/third_party/mbedtls/net_sockets.h index 3ff0ace3e..639e31bdb 100644 --- a/third_party/mbedtls/net_sockets.h +++ b/third_party/mbedtls/net_sockets.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_NET_SOCKETS_H_ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_NET_SOCKETS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_NET_SOCKET_FAILED -0x0042 /*< Failed to open a socket. */ #define MBEDTLS_ERR_NET_CONNECT_FAILED -0x0044 /*< The connection to the given server / port failed. */ @@ -54,5 +52,4 @@ void mbedtls_net_init( mbedtls_net_context * ); void mbedtls_net_usleep( unsigned long ); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_NET_SOCKETS_H_ */ diff --git a/third_party/mbedtls/nist_kw.c b/third_party/mbedtls/nist_kw.c index 9adbceac7..dd0c4d162 100644 --- a/third_party/mbedtls/nist_kw.c +++ b/third_party/mbedtls/nist_kw.c @@ -28,7 +28,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Implementation of NIST SP 800-38F key wrapping, supporting KW and KWP modes * only diff --git a/third_party/mbedtls/nist_kw.h b/third_party/mbedtls/nist_kw.h index f92e860ba..c3dfc3bd8 100644 --- a/third_party/mbedtls/nist_kw.h +++ b/third_party/mbedtls/nist_kw.h @@ -2,7 +2,6 @@ #define MBEDTLS_NIST_KW_H #include "third_party/mbedtls/cipher.h" #include "third_party/mbedtls/config.h" -/* clang-format off */ #ifdef __cplusplus extern "C" { diff --git a/third_party/mbedtls/oid.c b/third_party/mbedtls/oid.c index 204b40e23..7ee8c7d50 100644 --- a/third_party/mbedtls/oid.c +++ b/third_party/mbedtls/oid.c @@ -27,7 +27,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview Object Identifier (OID) database diff --git a/third_party/mbedtls/oid.h b/third_party/mbedtls/oid.h index f949efe76..55e95d0d8 100644 --- a/third_party/mbedtls/oid.h +++ b/third_party/mbedtls/oid.h @@ -5,7 +5,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/md.h" #include "third_party/mbedtls/pk.h" -/* clang-format off */ #define MBEDTLS_ERR_OID_NOT_FOUND -0x002E /*< OID is not found. */ #define MBEDTLS_ERR_OID_BUF_TOO_SMALL -0x000B /*< output buffer is too small */ diff --git a/third_party/mbedtls/pem.c b/third_party/mbedtls/pem.c index db9f0ab67..db09c3d5b 100644 --- a/third_party/mbedtls/pem.c +++ b/third_party/mbedtls/pem.c @@ -27,7 +27,6 @@ #include "third_party/mbedtls/md5.h" #include "third_party/mbedtls/pem.h" #include "third_party/mbedtls/platform.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ Mbed TLS (Apache 2.0)\\n\ diff --git a/third_party/mbedtls/pem.h b/third_party/mbedtls/pem.h index 583d12799..c78116ea5 100644 --- a/third_party/mbedtls/pem.h +++ b/third_party/mbedtls/pem.h @@ -1,7 +1,6 @@ #ifndef MBEDTLS_PEM_H #define MBEDTLS_PEM_H #include "third_party/mbedtls/config.h" -/* clang-format off */ /** * \name PEM Error codes diff --git a/third_party/mbedtls/pk.c b/third_party/mbedtls/pk.c index 8accd0211..1b59f1096 100644 --- a/third_party/mbedtls/pk.c +++ b/third_party/mbedtls/pk.c @@ -29,7 +29,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview Public Key abstraction layer diff --git a/third_party/mbedtls/pk.h b/third_party/mbedtls/pk.h index 489fa41db..2aea82064 100644 --- a/third_party/mbedtls/pk.h +++ b/third_party/mbedtls/pk.h @@ -6,7 +6,6 @@ #include "third_party/mbedtls/md.h" #include "third_party/mbedtls/rsa.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_PK_ALLOC_FAILED -0x3F80 /*< Memory allocation failed. */ #define MBEDTLS_ERR_PK_TYPE_MISMATCH -0x3F00 /*< Type mismatch, eg attempt to encrypt with an ECDSA key */ diff --git a/third_party/mbedtls/pk_internal.h b/third_party/mbedtls/pk_internal.h index 7729163e9..14e090982 100644 --- a/third_party/mbedtls/pk_internal.h +++ b/third_party/mbedtls/pk_internal.h @@ -2,7 +2,6 @@ #define MBEDTLS_PK_WRAP_H #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/pk.h" -/* clang-format off */ struct mbedtls_pk_info_t { diff --git a/third_party/mbedtls/pk_wrap.c b/third_party/mbedtls/pk_wrap.c index 241d2e1f5..a74e3863d 100644 --- a/third_party/mbedtls/pk_wrap.c +++ b/third_party/mbedtls/pk_wrap.c @@ -31,7 +31,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview Public Key abstraction layer: wrapper functions diff --git a/third_party/mbedtls/pkcs5.c b/third_party/mbedtls/pkcs5.c index 71fa13570..8864fd2b0 100644 --- a/third_party/mbedtls/pkcs5.c +++ b/third_party/mbedtls/pkcs5.c @@ -28,7 +28,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview PKCS#5 functions, e.g. PBKDF2 diff --git a/third_party/mbedtls/pkcs5.h b/third_party/mbedtls/pkcs5.h index 7b41d2313..a1b3037b3 100644 --- a/third_party/mbedtls/pkcs5.h +++ b/third_party/mbedtls/pkcs5.h @@ -4,7 +4,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/md.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA -0x2f80 /*< Bad input parameters to function. */ #define MBEDTLS_ERR_PKCS5_INVALID_FORMAT -0x2f00 /*< Unexpected ASN.1 data. */ diff --git a/third_party/mbedtls/pkparse.c b/third_party/mbedtls/pkparse.c index e01046d3a..7f3feb935 100644 --- a/third_party/mbedtls/pkparse.c +++ b/third_party/mbedtls/pkparse.c @@ -34,7 +34,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Public Key layer for parsing key files and structures * diff --git a/third_party/mbedtls/pkwrite.c b/third_party/mbedtls/pkwrite.c index 0e3d1783e..e441818fc 100644 --- a/third_party/mbedtls/pkwrite.c +++ b/third_party/mbedtls/pkwrite.c @@ -33,7 +33,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Public Key layer for writing key files and structures * diff --git a/third_party/mbedtls/poly1305.c b/third_party/mbedtls/poly1305.c index 06ac0b8f0..cdee5c357 100644 --- a/third_party/mbedtls/poly1305.c +++ b/third_party/mbedtls/poly1305.c @@ -15,12 +15,12 @@ │ See the License for the specific language governing permissions and │ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" +#include "third_party/mbedtls/poly1305.h" +#include "libc/serialize.h" #include "libc/str/str.h" #include "third_party/mbedtls/common.h" #include "third_party/mbedtls/error.h" #include "third_party/mbedtls/platform.h" -#include "third_party/mbedtls/poly1305.h" asm(".ident\t\"\\n\\n\ Mbed TLS (Apache 2.0)\\n\ @@ -28,7 +28,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * \file poly1305.c * diff --git a/third_party/mbedtls/poly1305.h b/third_party/mbedtls/poly1305.h index 7277a695a..42726f644 100644 --- a/third_party/mbedtls/poly1305.h +++ b/third_party/mbedtls/poly1305.h @@ -1,7 +1,6 @@ #ifndef MBEDTLS_POLY1305_H #define MBEDTLS_POLY1305_H #include "third_party/mbedtls/config.h" -/* clang-format off */ #define MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA -0x0057 /*< Invalid input parameter(s). */ diff --git a/third_party/mbedtls/rsa.c b/third_party/mbedtls/rsa.c index c29a18540..440a4623e 100644 --- a/third_party/mbedtls/rsa.c +++ b/third_party/mbedtls/rsa.c @@ -33,7 +33,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview The RSA public-key cryptosystem diff --git a/third_party/mbedtls/rsa.h b/third_party/mbedtls/rsa.h index 9553449a7..7bf49cf99 100644 --- a/third_party/mbedtls/rsa.h +++ b/third_party/mbedtls/rsa.h @@ -3,9 +3,7 @@ #include "third_party/mbedtls/bignum.h" #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/md.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ /* * RSA Error codes @@ -1004,5 +1002,4 @@ void mbedtls_rsa_free( mbedtls_rsa_context *ctx ); int mbedtls_rsa_self_test( int ); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_RSA_H_ */ diff --git a/third_party/mbedtls/rsa_internal.c b/third_party/mbedtls/rsa_internal.c index 396f8f59f..b1ac02e48 100644 --- a/third_party/mbedtls/rsa_internal.c +++ b/third_party/mbedtls/rsa_internal.c @@ -27,7 +27,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Helper functions for the RSA module * diff --git a/third_party/mbedtls/rsa_internal.h b/third_party/mbedtls/rsa_internal.h index 77df82ffb..5a1b9d1a2 100644 --- a/third_party/mbedtls/rsa_internal.h +++ b/third_party/mbedtls/rsa_internal.h @@ -2,7 +2,6 @@ #define MBEDTLS_RSA_INTERNAL_H #include "third_party/mbedtls/bignum.h" #include "third_party/mbedtls/config.h" -/* clang-format off */ #ifdef __cplusplus extern "C" { diff --git a/third_party/mbedtls/san.c b/third_party/mbedtls/san.c index e5530498e..3cc58a76e 100644 --- a/third_party/mbedtls/san.c +++ b/third_party/mbedtls/san.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/mbedtls/san.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/sock/sock.h" #include "libc/sysv/consts/af.h" #include "third_party/mbedtls/asn1.h" diff --git a/third_party/mbedtls/select.h b/third_party/mbedtls/select.h index 28f3f7b86..2cd57a940 100644 --- a/third_party/mbedtls/select.h +++ b/third_party/mbedtls/select.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_SELECT_H_ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_SELECT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ static inline uint64_t Select(uint64_t a, uint64_t b, uint64_t mask) { @@ -8,5 +7,4 @@ static inline uint64_t Select(uint64_t a, uint64_t b, uint64_t mask) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_SELECT_H_ */ diff --git a/third_party/mbedtls/sha1.c b/third_party/mbedtls/sha1.c index 5a18b6dc2..714c4e120 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/intrin/asan.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/macros.internal.h" #include "libc/nexgen32e/sha.h" #include "libc/nexgen32e/x86feature.h" @@ -33,7 +33,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview FIPS-180-1 compliant SHA-1 implementation diff --git a/third_party/mbedtls/sha1.h b/third_party/mbedtls/sha1.h index 693fc3aea..803e06467 100644 --- a/third_party/mbedtls/sha1.h +++ b/third_party/mbedtls/sha1.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/platform.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED is deprecated and should not be used. */ #define MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED -0x0035 /*< SHA-1 hardware accelerator failed */ diff --git a/third_party/mbedtls/sha1t.c b/third_party/mbedtls/sha1t.c index 475b8cc4c..c9d525b85 100644 --- a/third_party/mbedtls/sha1t.c +++ b/third_party/mbedtls/sha1t.c @@ -24,7 +24,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* * FIPS-180-1 test vectors diff --git a/third_party/mbedtls/sha256.c b/third_party/mbedtls/sha256.c index c36efb939..2a8181ecd 100644 --- a/third_party/mbedtls/sha256.c +++ b/third_party/mbedtls/sha256.c @@ -33,7 +33,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview FIPS-180-2 compliant SHA-256 implementation diff --git a/third_party/mbedtls/sha256.h b/third_party/mbedtls/sha256.h index ed64da625..1c00202d4 100644 --- a/third_party/mbedtls/sha256.h +++ b/third_party/mbedtls/sha256.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/platform.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED -0x0037 /*< SHA-256 hardware accelerator failed */ #define MBEDTLS_ERR_SHA256_BAD_INPUT_DATA -0x0074 /*< SHA-256 input data was malformed. */ diff --git a/third_party/mbedtls/sha256t.c b/third_party/mbedtls/sha256t.c index cc66b462c..4d4fdf9b4 100644 --- a/third_party/mbedtls/sha256t.c +++ b/third_party/mbedtls/sha256t.c @@ -24,7 +24,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* * FIPS-180-2 test vectors diff --git a/third_party/mbedtls/sha512.c b/third_party/mbedtls/sha512.c index c47dd8d5a..b99f4f81c 100644 --- a/third_party/mbedtls/sha512.c +++ b/third_party/mbedtls/sha512.c @@ -34,7 +34,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview FIPS-180-2 compliant SHA-384/512 implementation diff --git a/third_party/mbedtls/sha512.h b/third_party/mbedtls/sha512.h index a42485265..a43f1793c 100644 --- a/third_party/mbedtls/sha512.h +++ b/third_party/mbedtls/sha512.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/platform.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_SHA512_HW_ACCEL_FAILED -0x0039 /*< SHA-512 hardware accelerator failed */ #define MBEDTLS_ERR_SHA512_BAD_INPUT_DATA -0x0075 /*< SHA-512 input data was malformed. */ diff --git a/third_party/mbedtls/sha512t.c b/third_party/mbedtls/sha512t.c index 63c95c8f6..fed405e27 100644 --- a/third_party/mbedtls/sha512t.c +++ b/third_party/mbedtls/sha512t.c @@ -25,7 +25,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* * FIPS-180-2 test vectors diff --git a/third_party/mbedtls/ssl.h b/third_party/mbedtls/ssl.h index 3ffa5c4bf..7940e19ff 100644 --- a/third_party/mbedtls/ssl.h +++ b/third_party/mbedtls/ssl.h @@ -10,7 +10,6 @@ #include "third_party/mbedtls/x509_crl.h" #include "third_party/mbedtls/x509_crt.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* * SSL Error codes diff --git a/third_party/mbedtls/ssl_cache.c b/third_party/mbedtls/ssl_cache.c index d856e88f3..62297f8d0 100644 --- a/third_party/mbedtls/ssl_cache.c +++ b/third_party/mbedtls/ssl_cache.c @@ -28,7 +28,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * SSL session cache implementation * diff --git a/third_party/mbedtls/ssl_cache.h b/third_party/mbedtls/ssl_cache.h index aa4e9be50..cab7bdfff 100644 --- a/third_party/mbedtls/ssl_cache.h +++ b/third_party/mbedtls/ssl_cache.h @@ -2,7 +2,6 @@ #define MBEDTLS_SSL_CACHE_H #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/ssl.h" -/* clang-format off */ /** * \name SECTION: Module settings diff --git a/third_party/mbedtls/ssl_ciphersuites.c b/third_party/mbedtls/ssl_ciphersuites.c index 31db8030d..1e1f8a219 100644 --- a/third_party/mbedtls/ssl_ciphersuites.c +++ b/third_party/mbedtls/ssl_ciphersuites.c @@ -31,7 +31,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * CRYPTOGRAPHY 101 diff --git a/third_party/mbedtls/ssl_ciphersuites.h b/third_party/mbedtls/ssl_ciphersuites.h index 853c2e8d6..570e56880 100644 --- a/third_party/mbedtls/ssl_ciphersuites.h +++ b/third_party/mbedtls/ssl_ciphersuites.h @@ -5,7 +5,6 @@ #include "third_party/mbedtls/md.h" #include "third_party/mbedtls/pk.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* * Supported ciphersuites (Official IANA names) diff --git a/third_party/mbedtls/ssl_cli.c b/third_party/mbedtls/ssl_cli.c index 2accb02e4..233bdc64c 100644 --- a/third_party/mbedtls/ssl_cli.c +++ b/third_party/mbedtls/ssl_cli.c @@ -29,7 +29,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * SSLv3/TLSv1 client-side functions * diff --git a/third_party/mbedtls/ssl_cookie.c b/third_party/mbedtls/ssl_cookie.c index 67197c15d..13478b249 100644 --- a/third_party/mbedtls/ssl_cookie.c +++ b/third_party/mbedtls/ssl_cookie.c @@ -27,7 +27,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * DTLS cookie callbacks implementation * diff --git a/third_party/mbedtls/ssl_cookie.h b/third_party/mbedtls/ssl_cookie.h index 2871561d8..6d4ef8ed5 100644 --- a/third_party/mbedtls/ssl_cookie.h +++ b/third_party/mbedtls/ssl_cookie.h @@ -2,7 +2,6 @@ #define MBEDTLS_SSL_COOKIE_H #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/ssl.h" -/* clang-format off */ /** * \name SECTION: Module settings diff --git a/third_party/mbedtls/ssl_internal.h b/third_party/mbedtls/ssl_internal.h index abae88f6f..9118c4730 100644 --- a/third_party/mbedtls/ssl_internal.h +++ b/third_party/mbedtls/ssl_internal.h @@ -8,7 +8,6 @@ #include "third_party/mbedtls/sha512.h" #include "third_party/mbedtls/ssl.h" #include "third_party/zlib/zlib.h" -/* clang-format off */ /* Determine minimum supported version */ #define MBEDTLS_SSL_MIN_MAJOR_VERSION MBEDTLS_SSL_MAJOR_VERSION_3 diff --git a/third_party/mbedtls/ssl_invasive.h b/third_party/mbedtls/ssl_invasive.h index 01bbfbaa2..a3d7e9a9f 100644 --- a/third_party/mbedtls/ssl_invasive.h +++ b/third_party/mbedtls/ssl_invasive.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_SSL_INVASIVE_H_ #include "third_party/mbedtls/common.h" #include "third_party/mbedtls/md.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC) @@ -72,5 +71,4 @@ void mbedtls_ssl_cf_memcpy_offset(unsigned char *dst, #endif /* MBEDTLS_TEST_HOOKS && MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_SSL_INVASIVE_H_ */ diff --git a/third_party/mbedtls/ssl_msg.c b/third_party/mbedtls/ssl_msg.c index c4fd86575..fe02cf192 100644 --- a/third_party/mbedtls/ssl_msg.c +++ b/third_party/mbedtls/ssl_msg.c @@ -34,7 +34,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Generic SSL/TLS messaging layer functions * (record layer + retransmission state machine) diff --git a/third_party/mbedtls/ssl_srv.c b/third_party/mbedtls/ssl_srv.c index e6c6034fe..4d9e844af 100644 --- a/third_party/mbedtls/ssl_srv.c +++ b/third_party/mbedtls/ssl_srv.c @@ -34,7 +34,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * SSLv3/TLSv1 server-side functions * diff --git a/third_party/mbedtls/ssl_ticket.c b/third_party/mbedtls/ssl_ticket.c index d99ba766a..93f8e83e8 100644 --- a/third_party/mbedtls/ssl_ticket.c +++ b/third_party/mbedtls/ssl_ticket.c @@ -28,7 +28,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * TLS server tickets callbacks implementation * diff --git a/third_party/mbedtls/ssl_ticket.h b/third_party/mbedtls/ssl_ticket.h index 2e6cf09bd..6bab7e6d0 100644 --- a/third_party/mbedtls/ssl_ticket.h +++ b/third_party/mbedtls/ssl_ticket.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/cipher.h" #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/ssl.h" -/* clang-format off */ /* * This implementation of the session ticket callbacks includes key diff --git a/third_party/mbedtls/ssl_tls.c b/third_party/mbedtls/ssl_tls.c index 20c615fc6..a775c0b7c 100644 --- a/third_party/mbedtls/ssl_tls.c +++ b/third_party/mbedtls/ssl_tls.c @@ -34,7 +34,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview SSLv3/TLSv1 shared functions diff --git a/third_party/mbedtls/ssl_tls13_keys.c b/third_party/mbedtls/ssl_tls13_keys.c index ecd527dbd..761fcaf1c 100644 --- a/third_party/mbedtls/ssl_tls13_keys.c +++ b/third_party/mbedtls/ssl_tls13_keys.c @@ -26,7 +26,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * TLS 1.3 key schedule * diff --git a/third_party/mbedtls/test/everest_unravaged.c b/third_party/mbedtls/test/everest_unravaged.c index fa5857998..cc4737be1 100644 --- a/third_party/mbedtls/test/everest_unravaged.c +++ b/third_party/mbedtls/test/everest_unravaged.c @@ -1,10 +1,10 @@ -#include "libc/intrin/bits.h" #include "libc/limits.h" #include "libc/time/time.h" #include "third_party/mbedtls/asn1.h" #include "third_party/mbedtls/bignum.h" #include "third_party/mbedtls/common.h" #include "third_party/mbedtls/error.h" +#include "libc/serialize.h" #include "third_party/mbedtls/platform.h" asm(".ident\t\"\\n\\n\ @@ -12,7 +12,6 @@ Everest (Apache 2.0)\\n\ Copyright 2016-2018 INRIA and Microsoft Corporation\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * ECDH with curve-optimized implementation multiplexing * diff --git a/third_party/mbedtls/test/lib.c b/third_party/mbedtls/test/lib.c index 63b70449c..e284a67b4 100644 --- a/third_party/mbedtls/test/lib.c +++ b/third_party/mbedtls/test/lib.c @@ -22,7 +22,6 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" #include "libc/intrin/describebacktrace.internal.h" #include "libc/intrin/safemacros.internal.h" #include "libc/limits.h" @@ -49,6 +48,7 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/endian.h" #include "third_party/mbedtls/error.h" +#include "libc/serialize.h" #include "third_party/mbedtls/platform.h" asm(".ident\t\"\\n\\n\ diff --git a/third_party/mbedtls/test/lib.h b/third_party/mbedtls/test/lib.h index 7c45d48d1..2e97d5719 100644 --- a/third_party/mbedtls/test/lib.h +++ b/third_party/mbedtls/test/lib.h @@ -42,7 +42,6 @@ #error oh no entropy #endif -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define WRITE mbedtls_test_write @@ -249,5 +248,4 @@ int check_test(size_t); char *GetTlsError(long); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MBEDTLS_TEST_LIB_H_ */ diff --git a/third_party/mbedtls/test/test_suite_aes.cbc.c b/third_party/mbedtls/test/test_suite_aes.cbc.c index 495687c4f..c9a13c6be 100644 --- a/third_party/mbedtls/test/test_suite_aes.cbc.c +++ b/third_party/mbedtls/test/test_suite_aes.cbc.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_aes.cfb.c b/third_party/mbedtls/test/test_suite_aes.cfb.c index ddb652486..23c4eb2dd 100644 --- a/third_party/mbedtls/test/test_suite_aes.cfb.c +++ b/third_party/mbedtls/test/test_suite_aes.cfb.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_aes.ecb.c b/third_party/mbedtls/test/test_suite_aes.ecb.c index 169ff45cb..7f657b56d 100644 --- a/third_party/mbedtls/test/test_suite_aes.ecb.c +++ b/third_party/mbedtls/test/test_suite_aes.ecb.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_aes.ofb.c b/third_party/mbedtls/test/test_suite_aes.ofb.c index dc4f20708..082516047 100644 --- a/third_party/mbedtls/test/test_suite_aes.ofb.c +++ b/third_party/mbedtls/test/test_suite_aes.ofb.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_aes.rest.c b/third_party/mbedtls/test/test_suite_aes.rest.c index efd90b72a..f6ebcc8fb 100644 --- a/third_party/mbedtls/test/test_suite_aes.rest.c +++ b/third_party/mbedtls/test/test_suite_aes.rest.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_aes.xts.c b/third_party/mbedtls/test/test_suite_aes.xts.c index 537e1578a..2aa8864f3 100644 --- a/third_party/mbedtls/test/test_suite_aes.xts.c +++ b/third_party/mbedtls/test/test_suite_aes.xts.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_asn1parse.c b/third_party/mbedtls/test/test_suite_asn1parse.c index 9936fd09d..218bde893 100644 --- a/third_party/mbedtls/test/test_suite_asn1parse.c +++ b/third_party/mbedtls/test/test_suite_asn1parse.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_asn1write.c b/third_party/mbedtls/test/test_suite_asn1write.c index 7f667c97b..1ed0173f3 100644 --- a/third_party/mbedtls/test/test_suite_asn1write.c +++ b/third_party/mbedtls/test/test_suite_asn1write.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_base64.c b/third_party/mbedtls/test/test_suite_base64.c index be329e974..def4e0eeb 100644 --- a/third_party/mbedtls/test/test_suite_base64.c +++ b/third_party/mbedtls/test/test_suite_base64.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_blowfish.c b/third_party/mbedtls/test/test_suite_blowfish.c index 2385acb8d..6980b1520 100644 --- a/third_party/mbedtls/test/test_suite_blowfish.c +++ b/third_party/mbedtls/test/test_suite_blowfish.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_ccm.c b/third_party/mbedtls/test/test_suite_ccm.c index 182fc5147..e5912f368 100644 --- a/third_party/mbedtls/test/test_suite_ccm.c +++ b/third_party/mbedtls/test/test_suite_ccm.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_chacha20.c b/third_party/mbedtls/test/test_suite_chacha20.c index 89ba32f6a..87301a6ad 100644 --- a/third_party/mbedtls/test/test_suite_chacha20.c +++ b/third_party/mbedtls/test/test_suite_chacha20.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_chachapoly.c b/third_party/mbedtls/test/test_suite_chachapoly.c index 34f75b251..ea9e9ae66 100644 --- a/third_party/mbedtls/test/test_suite_chachapoly.c +++ b/third_party/mbedtls/test/test_suite_chachapoly.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.aes.c b/third_party/mbedtls/test/test_suite_cipher.aes.c index 6f9238db9..932f15a27 100644 --- a/third_party/mbedtls/test/test_suite_cipher.aes.c +++ b/third_party/mbedtls/test/test_suite_cipher.aes.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.blowfish.c b/third_party/mbedtls/test/test_suite_cipher.blowfish.c index 7afafd386..948d02d2e 100644 --- a/third_party/mbedtls/test/test_suite_cipher.blowfish.c +++ b/third_party/mbedtls/test/test_suite_cipher.blowfish.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.ccm.c b/third_party/mbedtls/test/test_suite_cipher.ccm.c index 27309309f..72d343f5e 100644 --- a/third_party/mbedtls/test/test_suite_cipher.ccm.c +++ b/third_party/mbedtls/test/test_suite_cipher.ccm.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.chacha20.c b/third_party/mbedtls/test/test_suite_cipher.chacha20.c index 5580363dd..34b887773 100644 --- a/third_party/mbedtls/test/test_suite_cipher.chacha20.c +++ b/third_party/mbedtls/test/test_suite_cipher.chacha20.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.chachapoly.c b/third_party/mbedtls/test/test_suite_cipher.chachapoly.c index f9bb159c4..8be9290ce 100644 --- a/third_party/mbedtls/test/test_suite_cipher.chachapoly.c +++ b/third_party/mbedtls/test/test_suite_cipher.chachapoly.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.des.c b/third_party/mbedtls/test/test_suite_cipher.des.c index 0d7c8a54d..2a770c231 100644 --- a/third_party/mbedtls/test/test_suite_cipher.des.c +++ b/third_party/mbedtls/test/test_suite_cipher.des.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.gcm.c b/third_party/mbedtls/test/test_suite_cipher.gcm.c index 9b7c10693..220069d9c 100644 --- a/third_party/mbedtls/test/test_suite_cipher.gcm.c +++ b/third_party/mbedtls/test/test_suite_cipher.gcm.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.misc.c b/third_party/mbedtls/test/test_suite_cipher.misc.c index 9f4886b59..0f61596f9 100644 --- a/third_party/mbedtls/test/test_suite_cipher.misc.c +++ b/third_party/mbedtls/test/test_suite_cipher.misc.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.nist_kw.c b/third_party/mbedtls/test/test_suite_cipher.nist_kw.c index ee252d527..298f42ec4 100644 --- a/third_party/mbedtls/test/test_suite_cipher.nist_kw.c +++ b/third_party/mbedtls/test/test_suite_cipher.nist_kw.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.null.c b/third_party/mbedtls/test/test_suite_cipher.null.c index cbdb53ae0..702937106 100644 --- a/third_party/mbedtls/test/test_suite_cipher.null.c +++ b/third_party/mbedtls/test/test_suite_cipher.null.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_cipher.padding.c b/third_party/mbedtls/test/test_suite_cipher.padding.c index c8b0c0500..1d4f88ce1 100644 --- a/third_party/mbedtls/test/test_suite_cipher.padding.c +++ b/third_party/mbedtls/test/test_suite_cipher.padding.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_ctr_drbg.c b/third_party/mbedtls/test/test_suite_ctr_drbg.c index 781c2093f..db7f539af 100644 --- a/third_party/mbedtls/test/test_suite_ctr_drbg.c +++ b/third_party/mbedtls/test/test_suite_ctr_drbg.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_des.c b/third_party/mbedtls/test/test_suite_des.c index 3934feaa3..5e3d72e34 100644 --- a/third_party/mbedtls/test/test_suite_des.c +++ b/third_party/mbedtls/test/test_suite_des.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_dhm.c b/third_party/mbedtls/test/test_suite_dhm.c index c9c115658..305de3bed 100644 --- a/third_party/mbedtls/test/test_suite_dhm.c +++ b/third_party/mbedtls/test/test_suite_dhm.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_ecdh.c b/third_party/mbedtls/test/test_suite_ecdh.c index 4cf56407f..86379969e 100644 --- a/third_party/mbedtls/test/test_suite_ecdh.c +++ b/third_party/mbedtls/test/test_suite_ecdh.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_ecdsa.c b/third_party/mbedtls/test/test_suite_ecdsa.c index 6ce69c309..61dbee439 100644 --- a/third_party/mbedtls/test/test_suite_ecdsa.c +++ b/third_party/mbedtls/test/test_suite_ecdsa.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_ecp.c b/third_party/mbedtls/test/test_suite_ecp.c index be6f77306..9dfef680c 100644 --- a/third_party/mbedtls/test/test_suite_ecp.c +++ b/third_party/mbedtls/test/test_suite_ecp.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_entropy.c b/third_party/mbedtls/test/test_suite_entropy.c index 0500cef7d..aafa410e0 100644 --- a/third_party/mbedtls/test/test_suite_entropy.c +++ b/third_party/mbedtls/test/test_suite_entropy.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_error.c b/third_party/mbedtls/test/test_suite_error.c index 332e00be7..0fea94799 100644 --- a/third_party/mbedtls/test/test_suite_error.c +++ b/third_party/mbedtls/test/test_suite_error.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_gcm.aes128_de.c b/third_party/mbedtls/test/test_suite_gcm.aes128_de.c index c2390dd8b..621528357 100644 --- a/third_party/mbedtls/test/test_suite_gcm.aes128_de.c +++ b/third_party/mbedtls/test/test_suite_gcm.aes128_de.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_gcm.aes128_en.c b/third_party/mbedtls/test/test_suite_gcm.aes128_en.c index f70e455d7..e05958d1e 100644 --- a/third_party/mbedtls/test/test_suite_gcm.aes128_en.c +++ b/third_party/mbedtls/test/test_suite_gcm.aes128_en.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_gcm.aes192_de.c b/third_party/mbedtls/test/test_suite_gcm.aes192_de.c index dbb41d1e2..0b9837f87 100644 --- a/third_party/mbedtls/test/test_suite_gcm.aes192_de.c +++ b/third_party/mbedtls/test/test_suite_gcm.aes192_de.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_gcm.aes192_en.c b/third_party/mbedtls/test/test_suite_gcm.aes192_en.c index 2f5cc161d..b0b596f73 100644 --- a/third_party/mbedtls/test/test_suite_gcm.aes192_en.c +++ b/third_party/mbedtls/test/test_suite_gcm.aes192_en.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_gcm.aes256_de.c b/third_party/mbedtls/test/test_suite_gcm.aes256_de.c index 16bccd2cd..d1790dea4 100644 --- a/third_party/mbedtls/test/test_suite_gcm.aes256_de.c +++ b/third_party/mbedtls/test/test_suite_gcm.aes256_de.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_gcm.aes256_en.c b/third_party/mbedtls/test/test_suite_gcm.aes256_en.c index ee50870fc..471c297d0 100644 --- a/third_party/mbedtls/test/test_suite_gcm.aes256_en.c +++ b/third_party/mbedtls/test/test_suite_gcm.aes256_en.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_gcm.misc.c b/third_party/mbedtls/test/test_suite_gcm.misc.c index c3b09ea25..71048e46b 100644 --- a/third_party/mbedtls/test/test_suite_gcm.misc.c +++ b/third_party/mbedtls/test/test_suite_gcm.misc.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_hkdf.c b/third_party/mbedtls/test/test_suite_hkdf.c index 30adf53b6..0f9c627b7 100644 --- a/third_party/mbedtls/test/test_suite_hkdf.c +++ b/third_party/mbedtls/test/test_suite_hkdf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_hmac_drbg.misc.c b/third_party/mbedtls/test/test_suite_hmac_drbg.misc.c index c9dd11b32..559aca4d8 100644 --- a/third_party/mbedtls/test/test_suite_hmac_drbg.misc.c +++ b/third_party/mbedtls/test/test_suite_hmac_drbg.misc.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_hmac_drbg.no_reseed.c b/third_party/mbedtls/test/test_suite_hmac_drbg.no_reseed.c index 71130a54c..38362ce38 100644 --- a/third_party/mbedtls/test/test_suite_hmac_drbg.no_reseed.c +++ b/third_party/mbedtls/test/test_suite_hmac_drbg.no_reseed.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_hmac_drbg.nopr.c b/third_party/mbedtls/test/test_suite_hmac_drbg.nopr.c index e620e6a0e..367e95c29 100644 --- a/third_party/mbedtls/test/test_suite_hmac_drbg.nopr.c +++ b/third_party/mbedtls/test/test_suite_hmac_drbg.nopr.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_hmac_drbg.pr.c b/third_party/mbedtls/test/test_suite_hmac_drbg.pr.c index fe25337fa..76ecb4f30 100644 --- a/third_party/mbedtls/test/test_suite_hmac_drbg.pr.c +++ b/third_party/mbedtls/test/test_suite_hmac_drbg.pr.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_md.c b/third_party/mbedtls/test/test_suite_md.c index a87e00700..73c81986d 100644 --- a/third_party/mbedtls/test/test_suite_md.c +++ b/third_party/mbedtls/test/test_suite_md.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_mdx.c b/third_party/mbedtls/test/test_suite_mdx.c index 5acd89122..111fa46cb 100644 --- a/third_party/mbedtls/test/test_suite_mdx.c +++ b/third_party/mbedtls/test/test_suite_mdx.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_memory_buffer_alloc.c b/third_party/mbedtls/test/test_suite_memory_buffer_alloc.c index c0fe9268c..46f97e67f 100644 --- a/third_party/mbedtls/test/test_suite_memory_buffer_alloc.c +++ b/third_party/mbedtls/test/test_suite_memory_buffer_alloc.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_mpi.c b/third_party/mbedtls/test/test_suite_mpi.c index a9e4b6e95..8a3d96922 100644 --- a/third_party/mbedtls/test/test_suite_mpi.c +++ b/third_party/mbedtls/test/test_suite_mpi.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_net.c b/third_party/mbedtls/test/test_suite_net.c index 40d15af79..e96c5a36c 100644 --- a/third_party/mbedtls/test/test_suite_net.c +++ b/third_party/mbedtls/test/test_suite_net.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_nist_kw.c b/third_party/mbedtls/test/test_suite_nist_kw.c index e9e7720ca..5d81549b5 100644 --- a/third_party/mbedtls/test/test_suite_nist_kw.c +++ b/third_party/mbedtls/test/test_suite_nist_kw.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_oid.c b/third_party/mbedtls/test/test_suite_oid.c index e83c4ec61..a2460d4e8 100644 --- a/third_party/mbedtls/test/test_suite_oid.c +++ b/third_party/mbedtls/test/test_suite_oid.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_pem.c b/third_party/mbedtls/test/test_suite_pem.c index 5ff019167..61cb5ce64 100644 --- a/third_party/mbedtls/test/test_suite_pem.c +++ b/third_party/mbedtls/test/test_suite_pem.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_pk.c b/third_party/mbedtls/test/test_suite_pk.c index afd95e546..75d64da77 100644 --- a/third_party/mbedtls/test/test_suite_pk.c +++ b/third_party/mbedtls/test/test_suite_pk.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_pkcs1_v15.c b/third_party/mbedtls/test/test_suite_pkcs1_v15.c index b1b4b2d47..9c28709a1 100644 --- a/third_party/mbedtls/test/test_suite_pkcs1_v15.c +++ b/third_party/mbedtls/test/test_suite_pkcs1_v15.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_pkcs1_v21.c b/third_party/mbedtls/test/test_suite_pkcs1_v21.c index 96a5438cc..3111ea7c0 100644 --- a/third_party/mbedtls/test/test_suite_pkcs1_v21.c +++ b/third_party/mbedtls/test/test_suite_pkcs1_v21.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_pkcs5.c b/third_party/mbedtls/test/test_suite_pkcs5.c index f2aa85905..638783736 100644 --- a/third_party/mbedtls/test/test_suite_pkcs5.c +++ b/third_party/mbedtls/test/test_suite_pkcs5.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_pkparse.c b/third_party/mbedtls/test/test_suite_pkparse.c index 264aa3a99..9816d22d3 100644 --- a/third_party/mbedtls/test/test_suite_pkparse.c +++ b/third_party/mbedtls/test/test_suite_pkparse.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_pkwrite.c b/third_party/mbedtls/test/test_suite_pkwrite.c index 35c1e2281..48e786f1c 100644 --- a/third_party/mbedtls/test/test_suite_pkwrite.c +++ b/third_party/mbedtls/test/test_suite_pkwrite.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_poly1305.c b/third_party/mbedtls/test/test_suite_poly1305.c index 4591e34ad..e6c4e7575 100644 --- a/third_party/mbedtls/test/test_suite_poly1305.c +++ b/third_party/mbedtls/test/test_suite_poly1305.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_random.c b/third_party/mbedtls/test/test_suite_random.c index a43ab0d4c..a260fd250 100644 --- a/third_party/mbedtls/test/test_suite_random.c +++ b/third_party/mbedtls/test/test_suite_random.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_rsa.c b/third_party/mbedtls/test/test_suite_rsa.c index 759903851..2f5054a30 100644 --- a/third_party/mbedtls/test/test_suite_rsa.c +++ b/third_party/mbedtls/test/test_suite_rsa.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_shax.c b/third_party/mbedtls/test/test_suite_shax.c index 5852dc13b..fd71ba2f4 100644 --- a/third_party/mbedtls/test/test_suite_shax.c +++ b/third_party/mbedtls/test/test_suite_shax.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_ssl.c b/third_party/mbedtls/test/test_suite_ssl.c index ec915c82d..fed485c9d 100644 --- a/third_party/mbedtls/test/test_suite_ssl.c +++ b/third_party/mbedtls/test/test_suite_ssl.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_timing.c b/third_party/mbedtls/test/test_suite_timing.c index 6533461e7..a3c45a91b 100644 --- a/third_party/mbedtls/test/test_suite_timing.c +++ b/third_party/mbedtls/test/test_suite_timing.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_version.c b/third_party/mbedtls/test/test_suite_version.c index 41ba15570..40dc22e80 100644 --- a/third_party/mbedtls/test/test_suite_version.c +++ b/third_party/mbedtls/test/test_suite_version.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_x509parse.c b/third_party/mbedtls/test/test_suite_x509parse.c index 2e4a7e2c8..61748d1f5 100644 --- a/third_party/mbedtls/test/test_suite_x509parse.c +++ b/third_party/mbedtls/test/test_suite_x509parse.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/test/test_suite_x509write.c b/third_party/mbedtls/test/test_suite_x509write.c index c90371775..f7f1b10de 100644 --- a/third_party/mbedtls/test/test_suite_x509write.c +++ b/third_party/mbedtls/test/test_suite_x509write.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 diff --git a/third_party/mbedtls/version.h b/third_party/mbedtls/version.h index b9ca65677..7ac7548c7 100644 --- a/third_party/mbedtls/version.h +++ b/third_party/mbedtls/version.h @@ -1,7 +1,6 @@ #ifndef MBEDTLS_VERSION_H #define MBEDTLS_VERSION_H #include "third_party/mbedtls/config.h" -/* clang-format off */ /** * The version number x.y.z is split into three parts. diff --git a/third_party/mbedtls/x509.c b/third_party/mbedtls/x509.c index ff5b99faa..b49ffb41f 100644 --- a/third_party/mbedtls/x509.c +++ b/third_party/mbedtls/x509.c @@ -35,7 +35,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * X.509 common functions for parsing and verification * diff --git a/third_party/mbedtls/x509.h b/third_party/mbedtls/x509.h index d0eb593f5..93b140223 100644 --- a/third_party/mbedtls/x509.h +++ b/third_party/mbedtls/x509.h @@ -5,7 +5,6 @@ #include "third_party/mbedtls/pk.h" #include "third_party/mbedtls/rsa.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE -0x2080 /*< Unavailable feature, e.g. RSA hashing/encryption combination. */ #define MBEDTLS_ERR_X509_UNKNOWN_OID -0x2100 /*< Requested OID is unknown. */ diff --git a/third_party/mbedtls/x509_create.c b/third_party/mbedtls/x509_create.c index 4b1c9c4dc..5ac83a67a 100644 --- a/third_party/mbedtls/x509_create.c +++ b/third_party/mbedtls/x509_create.c @@ -27,7 +27,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * X.509 base functions for creating certificates / CSRs * diff --git a/third_party/mbedtls/x509_crl.c b/third_party/mbedtls/x509_crl.c index 1e4d90639..d8a3cd638 100644 --- a/third_party/mbedtls/x509_crl.c +++ b/third_party/mbedtls/x509_crl.c @@ -27,7 +27,6 @@ Mbed TLS (Apache 2.0)\\n\ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** * @fileoverview X.509 Certidicate Revocation List (CRL) parsing diff --git a/third_party/mbedtls/x509_crl.h b/third_party/mbedtls/x509_crl.h index 15a3a3b79..604a2ae27 100644 --- a/third_party/mbedtls/x509_crl.h +++ b/third_party/mbedtls/x509_crl.h @@ -2,7 +2,6 @@ #define MBEDTLS_X509_CRL_H #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/x509.h" -/* clang-format off */ #ifdef __cplusplus extern "C" { diff --git a/third_party/mbedtls/x509_crt.c b/third_party/mbedtls/x509_crt.c index 62620e998..e54720f21 100644 --- a/third_party/mbedtls/x509_crt.c +++ b/third_party/mbedtls/x509_crt.c @@ -15,10 +15,11 @@ │ See the License for the specific language governing permissions and │ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "third_party/mbedtls/x509_crt.h" #include "libc/calls/calls.h" #include "libc/calls/struct/dirent.h" #include "libc/calls/struct/stat.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/log/log.h" #include "libc/mem/mem.h" @@ -31,8 +32,6 @@ #include "third_party/mbedtls/oid.h" #include "third_party/mbedtls/pem.h" #include "third_party/mbedtls/platform.h" -#include "third_party/mbedtls/x509_crt.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ Mbed TLS (Apache 2.0)\\n\ diff --git a/third_party/mbedtls/x509_crt.h b/third_party/mbedtls/x509_crt.h index 2f6b1672b..44ff58046 100644 --- a/third_party/mbedtls/x509_crt.h +++ b/third_party/mbedtls/x509_crt.h @@ -5,7 +5,6 @@ #include "third_party/mbedtls/x509.h" #include "third_party/mbedtls/x509_crl.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /** * Container for an X.509 certificate. The certificate may be chained. diff --git a/third_party/mbedtls/x509_csr.c b/third_party/mbedtls/x509_csr.c index c4971b84d..5532a4970 100644 --- a/third_party/mbedtls/x509_csr.c +++ b/third_party/mbedtls/x509_csr.c @@ -21,7 +21,6 @@ #include "third_party/mbedtls/pem.h" #include "third_party/mbedtls/platform.h" #include "third_party/mbedtls/x509_csr.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ Mbed TLS (Apache 2.0)\\n\ diff --git a/third_party/mbedtls/x509_csr.h b/third_party/mbedtls/x509_csr.h index 527a78263..e7c070abc 100644 --- a/third_party/mbedtls/x509_csr.h +++ b/third_party/mbedtls/x509_csr.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/config.h" #include "third_party/mbedtls/x509.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /** * Certificate Signing Request (CSR) structure. diff --git a/third_party/mbedtls/x509write_crt.c b/third_party/mbedtls/x509write_crt.c index 7c79bf0b4..5536b9459 100644 --- a/third_party/mbedtls/x509write_crt.c +++ b/third_party/mbedtls/x509write_crt.c @@ -30,7 +30,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * X.509 certificate writing * diff --git a/third_party/mbedtls/x509write_csr.c b/third_party/mbedtls/x509write_csr.c index 5a3dcf2aa..44103257a 100644 --- a/third_party/mbedtls/x509write_csr.c +++ b/third_party/mbedtls/x509write_csr.c @@ -29,7 +29,6 @@ Copyright ARM Limited\\n\ Copyright Mbed TLS Contributors\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * X.509 Certificate Signing Request writing * diff --git a/third_party/musl/crypt.c b/third_party/musl/crypt.c index 570a77d58..559ced6d9 100644 --- a/third_party/musl/crypt.c +++ b/third_party/musl/crypt.c @@ -32,7 +32,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /** * Encrypts password the old fashioned way. diff --git a/third_party/musl/crypt.h b/third_party/musl/crypt.h index 7dae908bb..111c445e8 100644 --- a/third_party/musl/crypt.h +++ b/third_party/musl/crypt.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MUSL_CRYPT_H_ #define COSMOPOLITAN_THIRD_PARTY_MUSL_CRYPT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct crypt_data { @@ -14,5 +13,4 @@ char *crypt(const char *, const char *); char *crypt_r(const char *, const char *, struct crypt_data *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MUSL_CRYPT_H_ */ diff --git a/third_party/musl/crypt.internal.h b/third_party/musl/crypt.internal.h index 29e70a8a3..3834fb015 100644 --- a/third_party/musl/crypt.internal.h +++ b/third_party/musl/crypt.internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MUSL_CRYPT_INTERNAL_H_ #define COSMOPOLITAN_THIRD_PARTY_MUSL_CRYPT_INTERNAL_H_ #include "third_party/musl/crypt.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *__crypt_des(const char *, const char *, char *); @@ -11,5 +10,4 @@ char *__crypt_sha256(const char *, const char *, char *); char *__crypt_sha512(const char *, const char *, char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MUSL_CRYPT_INTERNAL_H_ */ diff --git a/third_party/musl/crypt_blowfish.c b/third_party/musl/crypt_blowfish.c index dc493a506..b8b44430e 100644 --- a/third_party/musl/crypt_blowfish.c +++ b/third_party/musl/crypt_blowfish.c @@ -37,7 +37,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* Modified by Rich Felker in for inclusion in musl libc, based on * Solar Designer's second size-optimized version sent to the musl diff --git a/third_party/musl/crypt_des.c b/third_party/musl/crypt_des.c index 850272ea1..3e3bb0e46 100644 --- a/third_party/musl/crypt_des.c +++ b/third_party/musl/crypt_des.c @@ -36,7 +36,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* * This version has been further modified by Rich Felker, primary author diff --git a/third_party/musl/crypt_des.internal.h b/third_party/musl/crypt_des.internal.h index 304dc0da2..98a49c4cd 100644 --- a/third_party/musl/crypt_des.internal.h +++ b/third_party/musl/crypt_des.internal.h @@ -1,4 +1,3 @@ -// clang-format off #ifndef CRYPT_DES_H #define CRYPT_DES_H diff --git a/third_party/musl/crypt_md5.c b/third_party/musl/crypt_md5.c index 27ca95795..a22dae1cf 100644 --- a/third_party/musl/crypt_md5.c +++ b/third_party/musl/crypt_md5.c @@ -37,7 +37,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* * md5 crypt implementation diff --git a/third_party/musl/crypt_r.c b/third_party/musl/crypt_r.c index b272d0fb8..e6430de63 100644 --- a/third_party/musl/crypt_r.c +++ b/third_party/musl/crypt_r.c @@ -32,7 +32,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /** * Encrypts password the old fashioned way. diff --git a/third_party/musl/crypt_sha256.c b/third_party/musl/crypt_sha256.c index 6e254d270..ccd3141fc 100644 --- a/third_party/musl/crypt_sha256.c +++ b/third_party/musl/crypt_sha256.c @@ -47,7 +47,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* * public domain sha256 crypt implementation diff --git a/third_party/musl/crypt_sha512.c b/third_party/musl/crypt_sha512.c index 6d25ccef8..33654b613 100644 --- a/third_party/musl/crypt_sha512.c +++ b/third_party/musl/crypt_sha512.c @@ -47,7 +47,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* * public domain sha512 crypt implementation diff --git a/third_party/musl/encrypt.c b/third_party/musl/encrypt.c index 827542b98..904a40ebf 100644 --- a/third_party/musl/encrypt.c +++ b/third_party/musl/encrypt.c @@ -46,7 +46,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off static struct expanded_key __encrypt_key; diff --git a/third_party/musl/fnmatch.h b/third_party/musl/fnmatch.h index aab73ce54..c2aac0aa9 100644 --- a/third_party/musl/fnmatch.h +++ b/third_party/musl/fnmatch.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_REGEX_FNMATCH_H_ #define COSMOPOLITAN_THIRD_PARTY_REGEX_FNMATCH_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define FNM_PATHNAME 0x1 @@ -16,5 +15,4 @@ COSMOPOLITAN_C_START_ int fnmatch(const char *, const char *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_REGEX_FNMATCH_H_ */ diff --git a/third_party/musl/glob.h b/third_party/musl/glob.h index 21758f151..d18d25cdd 100644 --- a/third_party/musl/glob.h +++ b/third_party/musl/glob.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MUSL_GLOB_H_ #define COSMOPOLITAN_THIRD_PARTY_MUSL_GLOB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define GLOB_ERR 0x01 @@ -32,5 +31,4 @@ int glob(const char *, int, int (*)(const char *, int), glob_t *); void globfree(glob_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MUSL_GLOB_H_ */ diff --git a/third_party/musl/hsearch.c b/third_party/musl/hsearch.c index 1945fb2ea..bd6af48ca 100644 --- a/third_party/musl/hsearch.c +++ b/third_party/musl/hsearch.c @@ -33,7 +33,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /* open addressing hash table with 2^n table size diff --git a/third_party/musl/insque.c b/third_party/musl/insque.c index 1d91fe3c9..35a16e3db 100644 --- a/third_party/musl/insque.c +++ b/third_party/musl/insque.c @@ -31,7 +31,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off struct node { diff --git a/third_party/musl/lockf.c b/third_party/musl/lockf.c index 80cf45251..8170322e2 100644 --- a/third_party/musl/lockf.c +++ b/third_party/musl/lockf.c @@ -37,7 +37,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off /** * Locks file. diff --git a/third_party/musl/lockf.h b/third_party/musl/lockf.h index 8c29d2123..d906080d9 100644 --- a/third_party/musl/lockf.h +++ b/third_party/musl/lockf.h @@ -6,11 +6,9 @@ #define F_TLOCK 2 #define F_TEST 3 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int lockf(int, int, int64_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MUSL_LOCKF_H_ */ diff --git a/third_party/musl/lsearch.c b/third_party/musl/lsearch.c index f1c1356da..a7ccf9958 100644 --- a/third_party/musl/lsearch.c +++ b/third_party/musl/lsearch.c @@ -33,7 +33,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off void *lsearch(const void *key, void *base, size_t *nelp, size_t width, diff --git a/third_party/musl/mntent.c b/third_party/musl/mntent.c index 271c3c963..04a79631c 100644 --- a/third_party/musl/mntent.c +++ b/third_party/musl/mntent.c @@ -36,7 +36,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off static char *internal_buf; static size_t internal_bufsize; diff --git a/third_party/musl/mntent.h b/third_party/musl/mntent.h index 79f3b5264..6418ba65d 100644 --- a/third_party/musl/mntent.h +++ b/third_party/musl/mntent.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MUSL_MNTENT_H_ #define COSMOPOLITAN_THIRD_PARTY_MUSL_MNTENT_H_ #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define MOUNTED "/etc/mtab" @@ -33,5 +32,4 @@ int addmntent(FILE *, const struct mntent *); char *hasmntopt(const struct mntent *, const char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MUSL_MNTENT_H_ */ diff --git a/third_party/musl/passwd.h b/third_party/musl/passwd.h index 0fffc42bc..3623009ed 100644 --- a/third_party/musl/passwd.h +++ b/third_party/musl/passwd.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_PASSWD_H_ #define COSMOPOLITAN_LIBC_PASSWD_H_ #include "libc/calls/weirdtypes.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct FILE; @@ -46,5 +45,4 @@ int getgrouplist(const char *, gid_t, gid_t *, int *); int initgroups(const char *, gid_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_PASSWD_H_ */ diff --git a/third_party/musl/pwd.c b/third_party/musl/pwd.c index 3964ec2c4..c1db137ac 100644 --- a/third_party/musl/pwd.c +++ b/third_party/musl/pwd.c @@ -43,7 +43,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #ifdef FTRACE // if the default mode debugging tools are enabled, and we're linking diff --git a/third_party/musl/rand48.c b/third_party/musl/rand48.c index 61250d36f..4f7a2ef7f 100644 --- a/third_party/musl/rand48.c +++ b/third_party/musl/rand48.c @@ -32,7 +32,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off static unsigned short __seed48[7] = { 0, 0, 0, 0xe66d, 0xdeec, 0x5, 0xb }; diff --git a/third_party/musl/rand48.h b/third_party/musl/rand48.h index 14799456f..860f50c04 100644 --- a/third_party/musl/rand48.h +++ b/third_party/musl/rand48.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MUSL_RAND48_H_ #define COSMOPOLITAN_THIRD_PARTY_MUSL_RAND48_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ double drand48(void); @@ -14,5 +13,4 @@ unsigned short *seed48(unsigned short[3]); void lcong48(unsigned short[7]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MUSL_RAND48_H_ */ diff --git a/third_party/musl/search.h b/third_party/musl/search.h index c3385243a..52c607385 100644 --- a/third_party/musl/search.h +++ b/third_party/musl/search.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRDPARTY_MUSL_SEARCH_H #define COSMOPOLITAN_THIRDPARTY_MUSL_SEARCH_H -/* clang-format off */ typedef enum { FIND, ENTER } ACTION; typedef enum { preorder, postorder, endorder, leaf } VISIT; diff --git a/third_party/musl/strfmon.c b/third_party/musl/strfmon.c index fdcb98705..0df09d48b 100644 --- a/third_party/musl/strfmon.c +++ b/third_party/musl/strfmon.c @@ -35,7 +35,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off static ssize_t vstrfmon_l(char *s, size_t n, locale_t loc, const char *fmt, va_list ap) { diff --git a/third_party/musl/tdelete.c b/third_party/musl/tdelete.c index 28ae5588b..2d3e6f892 100644 --- a/third_party/musl/tdelete.c +++ b/third_party/musl/tdelete.c @@ -32,7 +32,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off void *tdelete(const void *restrict key, void **restrict rootp, diff --git a/third_party/musl/tdestroy.c b/third_party/musl/tdestroy.c index a23b73ce7..a008af5c0 100644 --- a/third_party/musl/tdestroy.c +++ b/third_party/musl/tdestroy.c @@ -32,7 +32,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off void tdestroy(void *root, void (*freekey)(void *)) { diff --git a/third_party/musl/tempnam.c b/third_party/musl/tempnam.c index c666178e8..971a82458 100644 --- a/third_party/musl/tempnam.c +++ b/third_party/musl/tempnam.c @@ -44,7 +44,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2014 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static char * __randname(char *template) diff --git a/third_party/musl/tempnam.h b/third_party/musl/tempnam.h index 7ff9794b5..f6ebc6bdf 100644 --- a/third_party/musl/tempnam.h +++ b/third_party/musl/tempnam.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_MUSL_TEMPNAM_H_ #define COSMOPOLITAN_THIRD_PARTY_MUSL_TEMPNAM_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *tempnam(const char *, const char *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_MUSL_TEMPNAM_H_ */ diff --git a/third_party/musl/tfind.c b/third_party/musl/tfind.c index 2e064c4b3..e36c95296 100644 --- a/third_party/musl/tfind.c +++ b/third_party/musl/tfind.c @@ -31,7 +31,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off void *tfind(const void *key, void *const *rootp, int(*cmp)(const void *, const void *)) diff --git a/third_party/musl/tsearch.c b/third_party/musl/tsearch.c index fbeb9775c..e11aab663 100644 --- a/third_party/musl/tsearch.c +++ b/third_party/musl/tsearch.c @@ -33,7 +33,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off static inline int height(struct node *n) { return n ? n->h : 0; } diff --git a/third_party/musl/twalk.c b/third_party/musl/twalk.c index 308566109..96513f667 100644 --- a/third_party/musl/twalk.c +++ b/third_party/musl/twalk.c @@ -31,7 +31,6 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); -// clang-format off static void walk(const struct node *r, void (*action)(const void *, VISIT, int), int d) diff --git a/third_party/nsync/array.internal.h b/third_party/nsync/array.internal.h index 05e5dc18a..31e031733 100755 --- a/third_party/nsync/array.internal.h +++ b/third_party/nsync/array.internal.h @@ -1,6 +1,5 @@ #ifndef NSYNC_ARRAY_H_ #define NSYNC_ARRAY_H_ -/* clang-format off */ /* Return the number of elements in a C array a. A constant expression if a is a constant expression. */ diff --git a/third_party/nsync/atomic.h b/third_party/nsync/atomic.h index 52ac3f8a2..0e7cda432 100644 --- a/third_party/nsync/atomic.h +++ b/third_party/nsync/atomic.h @@ -1,7 +1,6 @@ #ifndef NSYNC_ATOMIC_H_ #define NSYNC_ATOMIC_H_ #include "libc/atomic.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define nsync_atomic_uint32_ atomic_uint @@ -12,5 +11,4 @@ COSMOPOLITAN_C_START_ #define NSYNC_ATOMIC_UINT32_PTR_(p) (p) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_ATOMIC_H_ */ diff --git a/third_party/nsync/atomic.internal.h b/third_party/nsync/atomic.internal.h index eae93f146..64c3c9412 100644 --- a/third_party/nsync/atomic.internal.h +++ b/third_party/nsync/atomic.internal.h @@ -3,7 +3,6 @@ #include "libc/intrin/atomic.h" #include "libc/intrin/cmpxchg.h" #include "third_party/nsync/atomic.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* Atomic operations on nsync_atomic_uint32_ quantities @@ -118,5 +117,4 @@ static inline int atm_cas_seqcst_u32_(nsync_atomic_uint32_ *p, uint32_t o, memory_order_release)) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_ATOMIC_INTERNAL_H_ */ diff --git a/third_party/nsync/common.c b/third_party/nsync/common.c index 0255fc1a3..d26dbb7dd 100644 --- a/third_party/nsync/common.c +++ b/third_party/nsync/common.c @@ -39,7 +39,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* This package provides a mutex nsync_mu and a Mesa-style condition * variable nsync_cv. */ diff --git a/third_party/nsync/common.internal.h b/third_party/nsync/common.internal.h index d3dcf33f5..90205e102 100644 --- a/third_party/nsync/common.internal.h +++ b/third_party/nsync/common.internal.h @@ -10,7 +10,6 @@ #include "third_party/nsync/note.h" #include "third_party/nsync/time.h" #include "third_party/nsync/wait_s.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #ifdef MODE_DBG @@ -278,5 +277,4 @@ int nsync_sem_wait_with_cancel_(waiter *w, nsync_time abs_deadline, nsync_note cancel_note); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_COMMON_H_ */ diff --git a/third_party/nsync/counter.h b/third_party/nsync/counter.h index 6441f9a39..227fa4333 100644 --- a/third_party/nsync/counter.h +++ b/third_party/nsync/counter.h @@ -2,7 +2,6 @@ #define NSYNC_COUNTER_H_ #include "third_party/nsync/atomic.h" #include "third_party/nsync/time.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* An nsync_counter represents an unsigned integer that can count up and down, @@ -37,5 +36,4 @@ uint32_t nsync_counter_value(nsync_counter c); uint32_t nsync_counter_wait(nsync_counter c, nsync_time abs_deadline); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_COUNTER_H_ */ diff --git a/third_party/nsync/cv.h b/third_party/nsync/cv.h index c3646e3d5..4209a7909 100644 --- a/third_party/nsync/cv.h +++ b/third_party/nsync/cv.h @@ -3,7 +3,6 @@ #include "libc/intrin/dll.h" #include "third_party/nsync/mu.h" #include "third_party/nsync/time.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define NSYNC_CV_INIT \ @@ -157,5 +156,4 @@ int nsync_cv_wait_with_deadline_generic(nsync_cv *cv, void *mu, struct nsync_note_s_ *cancel_note); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_CV_H_ */ diff --git a/third_party/nsync/debug.h b/third_party/nsync/debug.h index 44d59618f..2cf117104 100644 --- a/third_party/nsync/debug.h +++ b/third_party/nsync/debug.h @@ -2,7 +2,6 @@ #define NSYNC_DEBUG_H_ #include "third_party/nsync/cv.h" #include "third_party/nsync/mu.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* Debugging operations for mutexes and condition variables. @@ -35,5 +34,4 @@ char *nsync_mu_debugger(nsync_mu *mu); char *nsync_cv_debugger(nsync_cv *cv); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_DEBUG_H_ */ diff --git a/third_party/nsync/futex.c b/third_party/nsync/futex.c index 5b420d786..6d8143143 100644 --- a/third_party/nsync/futex.c +++ b/third_party/nsync/futex.c @@ -53,7 +53,6 @@ #include "third_party/nsync/common.internal.h" #include "third_party/nsync/futex.internal.h" #include "third_party/nsync/time.h" -// clang-format off #define FUTEX_WAIT_BITS_ FUTEX_BITSET_MATCH_ANY diff --git a/third_party/nsync/futex.internal.h b/third_party/nsync/futex.internal.h index 9ae2ad9da..1128479c5 100644 --- a/third_party/nsync/futex.internal.h +++ b/third_party/nsync/futex.internal.h @@ -2,12 +2,10 @@ #define NSYNC_FUTEX_INTERNAL_H_ #include "libc/calls/struct/timespec.h" #include "libc/dce.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int nsync_futex_wake_(_Atomic(int) *, int, char); int nsync_futex_wait_(_Atomic(int) *, int, char, const struct timespec *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_FUTEX_INTERNAL_H_ */ diff --git a/third_party/nsync/heap.internal.h b/third_party/nsync/heap.internal.h index 207e309ea..63fd767da 100644 --- a/third_party/nsync/heap.internal.h +++ b/third_party/nsync/heap.internal.h @@ -1,6 +1,5 @@ #ifndef NSYNC_TESTING_HEAP_H_ #define NSYNC_TESTING_HEAP_H_ -/* clang-format off */ /* A heap. Optionally, elements may have storage for the index to allow deletions from diff --git a/third_party/nsync/mem/array.c b/third_party/nsync/mem/array.c index 1d16b5a11..a2b224f3d 100644 --- a/third_party/nsync/mem/array.c +++ b/third_party/nsync/mem/array.c @@ -18,7 +18,6 @@ #include "libc/mem/mem.h" #include "libc/str/str.h" #include "third_party/nsync/array.internal.h" -// clang-format off void a_ensure_ (void *v, int delta, int sz) { typedef A_TYPE (void *) a_void_ptr; diff --git a/third_party/nsync/mem/nsync_counter.c b/third_party/nsync/mem/nsync_counter.c index 68fa3ac07..a2ef77b81 100644 --- a/third_party/nsync/mem/nsync_counter.c +++ b/third_party/nsync/mem/nsync_counter.c @@ -31,7 +31,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* Internal details of nsync_counter. */ struct nsync_counter_s_ { diff --git a/third_party/nsync/mem/nsync_cv.c b/third_party/nsync/mem/nsync_cv.c index 612bd9765..65750090c 100644 --- a/third_party/nsync/mem/nsync_cv.c +++ b/third_party/nsync/mem/nsync_cv.c @@ -35,7 +35,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* Initialize *cv. */ void nsync_cv_init (nsync_cv *cv) { diff --git a/third_party/nsync/mem/nsync_debug.c b/third_party/nsync/mem/nsync_debug.c index e0269196b..bff167e4f 100644 --- a/third_party/nsync/mem/nsync_debug.c +++ b/third_party/nsync/mem/nsync_debug.c @@ -26,7 +26,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* Routines for debugging. */ diff --git a/third_party/nsync/mem/nsync_mu_wait.c b/third_party/nsync/mem/nsync_mu_wait.c index 42382464b..9df775f1f 100644 --- a/third_party/nsync/mem/nsync_mu_wait.c +++ b/third_party/nsync/mem/nsync_mu_wait.c @@ -27,7 +27,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* Attempt to remove waiter *w from *mu's waiter queue. If successful, leave the lock held in mode *l_type, and diff --git a/third_party/nsync/mem/nsync_note.c b/third_party/nsync/mem/nsync_note.c index aa0b9ee0f..89f81a808 100644 --- a/third_party/nsync/mem/nsync_note.c +++ b/third_party/nsync/mem/nsync_note.c @@ -30,7 +30,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* Locking discipline for the nsync_note implementation: diff --git a/third_party/nsync/mem/nsync_once.c b/third_party/nsync/mem/nsync_once.c index 3c0d20ef7..e77d97e2a 100644 --- a/third_party/nsync/mem/nsync_once.c +++ b/third_party/nsync/mem/nsync_once.c @@ -27,7 +27,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* An once_sync_s struct contains a lock, and a condition variable on which threads may wait for an nsync_once to be initialized by another thread. diff --git a/third_party/nsync/mem/nsync_sem_wait.c b/third_party/nsync/mem/nsync_sem_wait.c index 60ad9f3de..25500a417 100644 --- a/third_party/nsync/mem/nsync_sem_wait.c +++ b/third_party/nsync/mem/nsync_sem_wait.c @@ -28,7 +28,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* Wait until one of: w->sem is non-zero----decrement it and return 0. diff --git a/third_party/nsync/mem/nsync_wait.c b/third_party/nsync/mem/nsync_wait.c index 3e87edf19..8202db63b 100644 --- a/third_party/nsync/mem/nsync_wait.c +++ b/third_party/nsync/mem/nsync_wait.c @@ -30,7 +30,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off int nsync_wait_n (void *mu, void (*lock) (void *), void (*unlock) (void *), nsync_time abs_deadline, diff --git a/third_party/nsync/mu.c b/third_party/nsync/mu.c index ce74532a0..838e896fb 100644 --- a/third_party/nsync/mu.c +++ b/third_party/nsync/mu.c @@ -28,7 +28,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* Initialize *mu. */ void nsync_mu_init (nsync_mu *mu) { diff --git a/third_party/nsync/mu.h b/third_party/nsync/mu.h index ed16eb4dd..dab1ed722 100644 --- a/third_party/nsync/mu.h +++ b/third_party/nsync/mu.h @@ -2,7 +2,6 @@ #define NSYNC_MU_H_ #include "libc/intrin/dll.h" #include "third_party/nsync/atomic.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* An nsync_mu is a lock. If initialized to zero, it's valid and unlocked. @@ -99,5 +98,4 @@ void nsync_mu_rassert_held(const nsync_mu *mu); int nsync_mu_is_reader(const nsync_mu *mu); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_MU_H_ */ diff --git a/third_party/nsync/mu_semaphore.c b/third_party/nsync/mu_semaphore.c index b8f8f0074..fae25d21b 100644 --- a/third_party/nsync/mu_semaphore.c +++ b/third_party/nsync/mu_semaphore.c @@ -29,7 +29,6 @@ asm(".ident\t\"\\n\\n\ *NSYNC (Apache 2.0)\\n\ Copyright 2016 Google, Inc.\\n\ https://github.com/google/nsync\""); -// clang-format off /* Initialize *s; the initial value is 0. */ void nsync_mu_semaphore_init (nsync_semaphore *s) { diff --git a/third_party/nsync/mu_semaphore.h b/third_party/nsync/mu_semaphore.h index 60a0db31e..64c7d563d 100644 --- a/third_party/nsync/mu_semaphore.h +++ b/third_party/nsync/mu_semaphore.h @@ -1,7 +1,6 @@ #ifndef NSYNC_SEM_H_ #define NSYNC_SEM_H_ #include "third_party/nsync/time.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct nsync_semaphore_s_ { @@ -24,5 +23,4 @@ errno_t nsync_mu_semaphore_p_with_deadline(nsync_semaphore *s, void nsync_mu_semaphore_v(nsync_semaphore *s); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_SEM_H_ */ diff --git a/third_party/nsync/mu_semaphore.internal.h b/third_party/nsync/mu_semaphore.internal.h index 3a0bed3b4..ce3181fc3 100755 --- a/third_party/nsync/mu_semaphore.internal.h +++ b/third_party/nsync/mu_semaphore.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_NSYNC_MU_SEMAPHORE_INTERNAL_H_ #include "third_party/nsync/mu_semaphore.h" #include "third_party/nsync/time.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void nsync_mu_semaphore_init_futex(nsync_semaphore *); @@ -21,5 +20,4 @@ errno_t nsync_mu_semaphore_p_with_deadline_gcd(nsync_semaphore *, nsync_time); void nsync_mu_semaphore_v_gcd(nsync_semaphore *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_NSYNC_MU_SEMAPHORE_INTERNAL_H_ */ diff --git a/third_party/nsync/mu_semaphore_futex.c b/third_party/nsync/mu_semaphore_futex.c index d5fba7d4e..a52bf2f79 100644 --- a/third_party/nsync/mu_semaphore_futex.c +++ b/third_party/nsync/mu_semaphore_futex.c @@ -23,7 +23,6 @@ #include "third_party/nsync/atomic.internal.h" #include "third_party/nsync/futex.internal.h" #include "third_party/nsync/mu_semaphore.internal.h" -// clang-format off /** * @fileoverview Semaphores w/ Linux Futexes API. diff --git a/third_party/nsync/mu_semaphore_gcd.c b/third_party/nsync/mu_semaphore_gcd.c index 8812ce902..dbb869f93 100644 --- a/third_party/nsync/mu_semaphore_gcd.c +++ b/third_party/nsync/mu_semaphore_gcd.c @@ -31,7 +31,6 @@ #include "third_party/nsync/futex.internal.h" #include "third_party/nsync/mu_semaphore.internal.h" #include "third_party/nsync/time.h" -// clang-format off /** * @fileoverview Semaphores w/ Apple's Grand Central Dispatch API. diff --git a/third_party/nsync/mu_semaphore_sem.c b/third_party/nsync/mu_semaphore_sem.c index 7ed6c3a57..80615bee2 100644 --- a/third_party/nsync/mu_semaphore_sem.c +++ b/third_party/nsync/mu_semaphore_sem.c @@ -32,7 +32,6 @@ #include "libc/thread/thread.h" #include "third_party/nsync/mu_semaphore.h" #include "third_party/nsync/time.h" -// clang-format off /** * @fileoverview Semaphores w/ POSIX Semaphores API. diff --git a/third_party/nsync/mu_wait.h b/third_party/nsync/mu_wait.h index 7a5a3478b..3ee9d9793 100644 --- a/third_party/nsync/mu_wait.h +++ b/third_party/nsync/mu_wait.h @@ -2,7 +2,6 @@ #define NSYNC_MU_WAIT_H_ #include "third_party/nsync/mu.h" #include "third_party/nsync/time.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* nsync_mu_wait() and nsync_mu_wait_with_deadline() can be used instead @@ -114,5 +113,4 @@ int nsync_mu_wait_with_deadline( void nsync_mu_unlock_without_wakeup(nsync_mu *mu); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_MU_WAIT_H_ */ diff --git a/third_party/nsync/note.h b/third_party/nsync/note.h index 213a2d70a..008166aab 100644 --- a/third_party/nsync/note.h +++ b/third_party/nsync/note.h @@ -1,7 +1,6 @@ #ifndef NSYNC_NOTE_H_ #define NSYNC_NOTE_H_ #include "third_party/nsync/time.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* An nsync_note represents a single bit that can transition from 0 to 1 @@ -47,5 +46,4 @@ int nsync_note_wait(nsync_note n, nsync_time abs_deadline); nsync_time nsync_note_expiry(nsync_note n); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_NOTE_H_ */ diff --git a/third_party/nsync/once.h b/third_party/nsync/once.h index 4144df129..5b3a00a82 100644 --- a/third_party/nsync/once.h +++ b/third_party/nsync/once.h @@ -1,7 +1,6 @@ #ifndef NSYNC_ONCE_H_ #define NSYNC_ONCE_H_ #include "third_party/nsync/atomic.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* An nsync_once allows a function to be called exactly once, when first @@ -33,5 +32,4 @@ void nsync_run_once_arg_spin(nsync_once *once, void (*farg)(void *arg), void *arg); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_ONCE_H_ */ diff --git a/third_party/nsync/panic.c b/third_party/nsync/panic.c index cc04be43f..136029de7 100644 --- a/third_party/nsync/panic.c +++ b/third_party/nsync/panic.c @@ -21,7 +21,6 @@ #include "libc/intrin/describebacktrace.internal.h" #include "libc/runtime/runtime.h" #include "third_party/nsync/common.internal.h" -// clang-format off /* Aborts after printing the nul-terminated string s[]. */ void nsync_panic_ (const char *s) { diff --git a/third_party/nsync/races.internal.h b/third_party/nsync/races.internal.h index 84ff665f5..6fe1ec87a 100644 --- a/third_party/nsync/races.internal.h +++ b/third_party/nsync/races.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_NSYNC_RACES_INTERNAL_H_ #define COSMOPOLITAN_THIRD_PARTY_NSYNC_RACES_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* Annotations for race detectors. */ @@ -32,5 +31,4 @@ NSYNC_C_END_ #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_NSYNC_RACES_INTERNAL_H_ */ diff --git a/third_party/nsync/testing/atm_log.c b/third_party/nsync/testing/atm_log.c index f5952c9ed..a36c5a26d 100644 --- a/third_party/nsync/testing/atm_log.c +++ b/third_party/nsync/testing/atm_log.c @@ -18,7 +18,6 @@ #include "libc/mem/mem.h" #include "libc/stdio/stdio.h" #include "libc/thread/thread.h" -// clang-format off #ifndef NSYNC_ATM_LOG #define NSYNC_ATM_LOG 0 diff --git a/third_party/nsync/testing/closure.c b/third_party/nsync/testing/closure.c index 4a6b58098..3247ad093 100644 --- a/third_party/nsync/testing/closure.c +++ b/third_party/nsync/testing/closure.c @@ -16,7 +16,6 @@ │ limitations under the License. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/nsync/testing/closure.h" -// clang-format off void nsync_start_thread_ (void (*f) (void *), void *arg); diff --git a/third_party/nsync/testing/closure.h b/third_party/nsync/testing/closure.h index 96b53a128..b16f29513 100644 --- a/third_party/nsync/testing/closure.h +++ b/third_party/nsync/testing/closure.h @@ -1,6 +1,5 @@ #ifndef NSYNC_TESTING_CLOSURE_H_ #define NSYNC_TESTING_CLOSURE_H_ -/* clang-format off */ #include "libc/mem/mem.h" /* A run-once, self-freeing closure. */ diff --git a/third_party/nsync/testing/counter_test.c b/third_party/nsync/testing/counter_test.c index 4f19384c5..a2cfcd5ad 100644 --- a/third_party/nsync/testing/counter_test.c +++ b/third_party/nsync/testing/counter_test.c @@ -20,7 +20,6 @@ #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/testing.h" #include "third_party/nsync/testing/time_extra.h" -// clang-format off /* Verify the properties of a zero counter. */ static void test_counter_zero (testing t) { diff --git a/third_party/nsync/testing/cv_mu_timeout_stress_test_.c b/third_party/nsync/testing/cv_mu_timeout_stress_test_.c index 9b28a3abd..11e6f746a 100644 --- a/third_party/nsync/testing/cv_mu_timeout_stress_test_.c +++ b/third_party/nsync/testing/cv_mu_timeout_stress_test_.c @@ -23,7 +23,6 @@ #include "third_party/nsync/testing/closure.h" #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/testing.h" -// clang-format off /* A cv_stress_data represents the data used by the threads of the tests below. */ typedef struct cv_stress_data_s { diff --git a/third_party/nsync/testing/cv_test.c b/third_party/nsync/testing/cv_test.c index 6c62d4a99..ca87843dd 100644 --- a/third_party/nsync/testing/cv_test.c +++ b/third_party/nsync/testing/cv_test.c @@ -30,7 +30,6 @@ #include "third_party/nsync/testing/testing.h" #include "third_party/nsync/testing/time_extra.h" #include "third_party/nsync/time.h" -// clang-format off /* --------------------------- */ diff --git a/third_party/nsync/testing/cv_wait_example_test.c b/third_party/nsync/testing/cv_wait_example_test.c index b8537dde7..c4d42db10 100644 --- a/third_party/nsync/testing/cv_wait_example_test.c +++ b/third_party/nsync/testing/cv_wait_example_test.c @@ -25,7 +25,6 @@ #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/testing.h" #include "third_party/nsync/testing/time_extra.h" -// clang-format off /* Example use of CV.wait(): A priority queue of strings whose "remove_with_deadline" operation has a deadline. */ diff --git a/third_party/nsync/testing/dll_test.c b/third_party/nsync/testing/dll_test.c index 94952a46a..e6849f7dc 100644 --- a/third_party/nsync/testing/dll_test.c +++ b/third_party/nsync/testing/dll_test.c @@ -22,7 +22,6 @@ #include "third_party/nsync/array.internal.h" #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/testing.h" -// clang-format off /* This tests internal abstractions. */ diff --git a/third_party/nsync/testing/mu_starvation_test.c b/third_party/nsync/testing/mu_starvation_test.c index 3ee6bebf9..80b5bec0a 100644 --- a/third_party/nsync/testing/mu_starvation_test.c +++ b/third_party/nsync/testing/mu_starvation_test.c @@ -25,7 +25,6 @@ #include "third_party/nsync/testing/testing.h" #include "third_party/nsync/testing/time_extra.h" #include "third_party/nsync/time.h" -// clang-format off /* Test the behaviour of mu in situations where starvation might be expected. */ diff --git a/third_party/nsync/testing/mu_test.c b/third_party/nsync/testing/mu_test.c index c1f1942d1..32964d615 100644 --- a/third_party/nsync/testing/mu_test.c +++ b/third_party/nsync/testing/mu_test.c @@ -25,7 +25,6 @@ #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/testing.h" #include "third_party/nsync/testing/time_extra.h" -// clang-format off /* The state shared between the threads in each of the tests below. */ typedef struct test_data_s { diff --git a/third_party/nsync/testing/mu_wait_example_test.c b/third_party/nsync/testing/mu_wait_example_test.c index f81eeb737..3ed66d2ce 100644 --- a/third_party/nsync/testing/mu_wait_example_test.c +++ b/third_party/nsync/testing/mu_wait_example_test.c @@ -25,7 +25,6 @@ #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/testing.h" #include "third_party/nsync/testing/time_extra.h" -// clang-format off /* Example use of nsync_mu_wait(): A priority queue of strings whose "remove_with_deadline" operation has a deadline. */ diff --git a/third_party/nsync/testing/mu_wait_test.c b/third_party/nsync/testing/mu_wait_test.c index a0703f038..6d5355e88 100644 --- a/third_party/nsync/testing/mu_wait_test.c +++ b/third_party/nsync/testing/mu_wait_test.c @@ -25,7 +25,6 @@ #include "third_party/nsync/testing/testing.h" #include "third_party/nsync/testing/time_extra.h" #include "third_party/nsync/time.h" -// clang-format off /* --------------------------- */ diff --git a/third_party/nsync/testing/note_test.c b/third_party/nsync/testing/note_test.c index 750bcab8f..83d63b6d9 100644 --- a/third_party/nsync/testing/note_test.c +++ b/third_party/nsync/testing/note_test.c @@ -21,7 +21,6 @@ #include "third_party/nsync/testing/testing.h" #include "third_party/nsync/testing/time_extra.h" #include "third_party/nsync/time.h" -// clang-format off /* Verify the properties of a prenotified note. */ static void test_note_prenotified (testing t) { diff --git a/third_party/nsync/testing/once_test.c b/third_party/nsync/testing/once_test.c index f1fcf1afd..6dbda92cb 100644 --- a/third_party/nsync/testing/once_test.c +++ b/third_party/nsync/testing/once_test.c @@ -23,7 +23,6 @@ #include "third_party/nsync/testing/closure.h" #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/testing.h" -// clang-format off /* This tests nsync_once */ diff --git a/third_party/nsync/testing/pingpong_test.c b/third_party/nsync/testing/pingpong_test.c index f5f8efa32..83026be82 100644 --- a/third_party/nsync/testing/pingpong_test.c +++ b/third_party/nsync/testing/pingpong_test.c @@ -27,7 +27,6 @@ #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/testing.h" #include "third_party/nsync/waiter.h" -// clang-format off /* The benchmarks in this file use various mechanisms to ping-pong back and forth between two threads as they count i from diff --git a/third_party/nsync/testing/smprintf.c b/third_party/nsync/testing/smprintf.c index c6c29c81e..bc9aa3b51 100644 --- a/third_party/nsync/testing/smprintf.c +++ b/third_party/nsync/testing/smprintf.c @@ -19,7 +19,6 @@ #include "libc/mem/mem.h" #include "libc/stdio/stdio.h" #include "libc/str/str.h" -// clang-format off char *smprintf (const char *fmt, ...) { int m = strlen (fmt) * 2 + 1; diff --git a/third_party/nsync/testing/start_thread.c b/third_party/nsync/testing/start_thread.c index ad0a15237..e5566d615 100644 --- a/third_party/nsync/testing/start_thread.c +++ b/third_party/nsync/testing/start_thread.c @@ -17,7 +17,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/mem/mem.h" #include "libc/thread/thread.h" -// clang-format off struct thd_args { void (*f) (void *); diff --git a/third_party/nsync/testing/testing.c b/third_party/nsync/testing/testing.c index 1a4456c75..5d5865f47 100644 --- a/third_party/nsync/testing/testing.c +++ b/third_party/nsync/testing/testing.c @@ -33,7 +33,6 @@ #include "third_party/nsync/testing/closure.h" #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/time_extra.h" -// clang-format off struct testing_base_s { int flags; /* flags from testing_new(); r/o after init */ diff --git a/third_party/nsync/testing/testing.h b/third_party/nsync/testing/testing.h index 4e85698bd..023642293 100644 --- a/third_party/nsync/testing/testing.h +++ b/third_party/nsync/testing/testing.h @@ -1,6 +1,5 @@ #ifndef NSYNC_TESTING_TESTING_H_ #define NSYNC_TESTING_TESTING_H_ -/* clang-format off */ typedef struct testing_base_s *testing_base; typedef const struct testing_base_s *const_testing_base; diff --git a/third_party/nsync/testing/time_extra.c b/third_party/nsync/testing/time_extra.c index f778b6064..3eeacfc88 100644 --- a/third_party/nsync/testing/time_extra.c +++ b/third_party/nsync/testing/time_extra.c @@ -20,7 +20,6 @@ #include "third_party/nsync/testing/smprintf.h" #include "third_party/nsync/testing/time_extra.h" #include "third_party/nsync/time.h" -// clang-format off char *nsync_time_str (nsync_time t, int decimals) { static const struct { diff --git a/third_party/nsync/testing/wait_test.c b/third_party/nsync/testing/wait_test.c index 720725dc0..1e42ab83e 100644 --- a/third_party/nsync/testing/wait_test.c +++ b/third_party/nsync/testing/wait_test.c @@ -25,7 +25,6 @@ #include "third_party/nsync/testing/time_extra.h" #include "third_party/nsync/time.h" #include "third_party/nsync/waiter.h" -// clang-format off static void decrement_at (nsync_counter c, nsync_time abs_deadline, nsync_counter done) { nsync_time_sleep_until (abs_deadline); diff --git a/third_party/nsync/time.h b/third_party/nsync/time.h index 4fb28f9f8..badd254cd 100644 --- a/third_party/nsync/time.h +++ b/third_party/nsync/time.h @@ -1,7 +1,6 @@ #ifndef NSYNC_TIME_H_ #define NSYNC_TIME_H_ #include "libc/calls/struct/timespec.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define NSYNC_TIME_SEC(t) ((t).tv_sec) @@ -56,5 +55,4 @@ typedef struct timespec nsync_time; #define nsync_time_s_ns(s, ns) ((nsync_time){(int64_t)(s), (unsigned)(ns)}) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_TIME_H_ */ diff --git a/third_party/nsync/wait_s.internal.h b/third_party/nsync/wait_s.internal.h index 166aa0d85..3d1d1de88 100644 --- a/third_party/nsync/wait_s.internal.h +++ b/third_party/nsync/wait_s.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_LIBC_THREAD_WAIT_INTERNAL_H_ #include "libc/intrin/dll.h" #include "third_party/nsync/atomic.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* Implementations of "struct nsync_waitable_s" must provide functions @@ -24,5 +23,4 @@ struct nsync_waiter_s { void nsync_waiter_destroy(void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_THREAD_WAIT_INTERNAL_H_ */ diff --git a/third_party/nsync/waiter.h b/third_party/nsync/waiter.h index 057591f13..b1eeba29f 100644 --- a/third_party/nsync/waiter.h +++ b/third_party/nsync/waiter.h @@ -1,7 +1,6 @@ #ifndef NSYNC_WAITER_H_ #define NSYNC_WAITER_H_ #include "third_party/nsync/time.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* nsync_wait_n() allows the client to wait on multiple objects @@ -134,5 +133,4 @@ extern const struct nsync_waitable_funcs_s nsync_counter_waitable_funcs; extern const struct nsync_waitable_funcs_s nsync_cv_waitable_funcs; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* NSYNC_WAITER_H_ */ diff --git a/third_party/nsync/yield.c b/third_party/nsync/yield.c index 2eac400b2..6b7a266e6 100644 --- a/third_party/nsync/yield.c +++ b/third_party/nsync/yield.c @@ -20,7 +20,6 @@ #include "libc/intrin/strace.internal.h" #include "libc/thread/thread.h" #include "third_party/nsync/common.internal.h" -// clang-format off void nsync_yield_ (void) { pthread_yield (); diff --git a/third_party/puff/puff.c b/third_party/puff/puff.c index 2aac09ad7..7c388c747 100644 --- a/third_party/puff/puff.c +++ b/third_party/puff/puff.c @@ -24,7 +24,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/puff/puff.h" #include "libc/runtime/runtime.h" -// clang-format off asm(".ident\t\"\\n\\n\ puff (zlib License)\\n\ diff --git a/third_party/puff/puff.h b/third_party/puff/puff.h index fd00f6f4b..19e364de7 100644 --- a/third_party/puff/puff.h +++ b/third_party/puff/puff.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_ZLIB_PUFF_H_ #define COSMOPOLITAN_THIRD_PARTY_ZLIB_PUFF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #ifndef NIL @@ -11,5 +10,4 @@ int _puff(unsigned char *dest, unsigned long *destlen, const unsigned char *source, unsigned long *sourcelen); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_PUFF_H_ */ diff --git a/third_party/python/Include/Python-ast.h b/third_party/python/Include/Python-ast.h index 2e0c936f3..c31668b9e 100644 --- a/third_party/python/Include/Python-ast.h +++ b/third_party/python/Include/Python-ast.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_INCLUDE_PYTHON_AST_H_ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_INCLUDE_PYTHON_AST_H_ #include "third_party/python/Include/asdl.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ /* File automatically generated by Parser/asdl_c.py. */ typedef struct _mod *mod_ty; @@ -641,5 +639,4 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode); int PyAST_Check(PyObject* obj); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_INCLUDE_PYTHON_AST_H_ */ diff --git a/third_party/python/Include/Python.h b/third_party/python/Include/Python.h index d1a7c6fb9..a6b08dfbe 100644 --- a/third_party/python/Include/Python.h +++ b/third_party/python/Include/Python.h @@ -1,6 +1,5 @@ #ifndef Py_PYTHON_H #define Py_PYTHON_H -/* clang-format off */ /* * PYTHON DIAMOND DEPENDENCY HEADER diff --git a/third_party/python/Include/accu.h b/third_party/python/Include/accu.h index a22a38ca2..836e8dded 100644 --- a/third_party/python/Include/accu.h +++ b/third_party/python/Include/accu.h @@ -3,7 +3,6 @@ #define Py_ACCU_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #undef small /* defined by some Windows headers */ diff --git a/third_party/python/Include/asdl.h b/third_party/python/Include/asdl.h index 261fc676f..f10c7be71 100644 --- a/third_party/python/Include/asdl.h +++ b/third_party/python/Include/asdl.h @@ -2,7 +2,6 @@ #define Py_ASDL_H #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyarena.h" -/* clang-format off */ typedef PyObject * identifier; typedef PyObject * string; diff --git a/third_party/python/Include/ast.h b/third_party/python/Include/ast.h index fcef91cf9..b60bc1206 100644 --- a/third_party/python/Include/ast.h +++ b/third_party/python/Include/ast.h @@ -4,7 +4,6 @@ #include "third_party/python/Include/node.h" #include "third_party/python/Include/pythonrun.h" COSMOPOLITAN_C_START_ -/* clang-format off */ extern int foo; int PyAST_Validate(mod_ty); diff --git a/third_party/python/Include/bitset.h b/third_party/python/Include/bitset.h index 14367dbcf..78bb70c07 100644 --- a/third_party/python/Include/bitset.h +++ b/third_party/python/Include/bitset.h @@ -2,7 +2,6 @@ #define Py_BITSET_H #include "third_party/python/Include/pgenheaders.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define BYTE char diff --git a/third_party/python/Include/bltinmodule.h b/third_party/python/Include/bltinmodule.h index e5b47e8dd..e367bd20b 100644 --- a/third_party/python/Include/bltinmodule.h +++ b/third_party/python/Include/bltinmodule.h @@ -2,7 +2,6 @@ #define Py_BLTINMODULE_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ extern PyTypeObject PyFilter_Type; extern PyTypeObject PyMap_Type; diff --git a/third_party/python/Include/boolobject.h b/third_party/python/Include/boolobject.h index bce718f83..fe6689169 100644 --- a/third_party/python/Include/boolobject.h +++ b/third_party/python/Include/boolobject.h @@ -2,7 +2,6 @@ #define Py_BOOLOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ extern PyTypeObject PyBool_Type; diff --git a/third_party/python/Include/bytearrayobject.h b/third_party/python/Include/bytearrayobject.h index 8fda41061..f656525ce 100644 --- a/third_party/python/Include/bytearrayobject.h +++ b/third_party/python/Include/bytearrayobject.h @@ -3,7 +3,6 @@ #include "libc/assert.h" #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Type PyByteArrayObject represents a mutable array of bytes. * The Python API is that of a sequence; diff --git a/third_party/python/Include/bytes_methods.h b/third_party/python/Include/bytes_methods.h index b4fb4ca4e..84f137def 100644 --- a/third_party/python/Include/bytes_methods.h +++ b/third_party/python/Include/bytes_methods.h @@ -3,7 +3,6 @@ #define Py_BYTES_CTYPE_H #include "third_party/python/Include/object.h" #include "third_party/python/Include/pymacro.h" -/* clang-format off */ /* * The internal implementation behind PyBytes (bytes) and PyByteArray (bytearray) diff --git a/third_party/python/Include/bytesobject.h b/third_party/python/Include/bytesobject.h index d3890df4d..0262560d4 100644 --- a/third_party/python/Include/bytesobject.h +++ b/third_party/python/Include/bytesobject.h @@ -2,7 +2,6 @@ #define Py_BYTESOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Type PyBytesObject represents a character string. An extra zero byte is diff --git a/third_party/python/Include/cellobject.h b/third_party/python/Include/cellobject.h index d7bc810a9..ad0260b11 100644 --- a/third_party/python/Include/cellobject.h +++ b/third_party/python/Include/cellobject.h @@ -3,7 +3,6 @@ #define Py_CELLOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef struct { PyObject_HEAD diff --git a/third_party/python/Include/ceval.h b/third_party/python/Include/ceval.h index bb3ae0872..7da63bcdb 100644 --- a/third_party/python/Include/ceval.h +++ b/third_party/python/Include/ceval.h @@ -8,7 +8,6 @@ #include "third_party/python/Include/pystate.h" #include "third_party/python/Include/pythonrun.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Interface to random parts in ceval.c */ diff --git a/third_party/python/Include/classobject.h b/third_party/python/Include/classobject.h index 5844011c5..5a6e68370 100644 --- a/third_party/python/Include/classobject.h +++ b/third_party/python/Include/classobject.h @@ -3,7 +3,6 @@ #define Py_CLASSOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef struct { PyObject_HEAD diff --git a/third_party/python/Include/codecs.h b/third_party/python/Include/codecs.h index 41ef6e1b9..fcb8eb1e8 100644 --- a/third_party/python/Include/codecs.h +++ b/third_party/python/Include/codecs.h @@ -2,7 +2,6 @@ #define Py_CODECREGISTRY_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* ------------------------------------------------------------------------ diff --git a/third_party/python/Include/compile.h b/third_party/python/Include/compile.h index 845b3bcf6..b5fb22aeb 100644 --- a/third_party/python/Include/compile.h +++ b/third_party/python/Include/compile.h @@ -10,7 +10,6 @@ COSMOPOLITAN_C_START_ #define Py_eval_input 258 #ifndef Py_LIMITED_API -/* clang-format off */ /* Public interface */ struct _node; /* Declare the existence of this type */ diff --git a/third_party/python/Include/complexobject.h b/third_party/python/Include/complexobject.h index 8cca115c0..9fd3c7ce5 100644 --- a/third_party/python/Include/complexobject.h +++ b/third_party/python/Include/complexobject.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/unicodeobject.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef Py_LIMITED_API typedef struct { diff --git a/third_party/python/Include/datetime.h b/third_party/python/Include/datetime.h index 58bcc73dc..8a4b0c166 100644 --- a/third_party/python/Include/datetime.h +++ b/third_party/python/Include/datetime.h @@ -3,7 +3,6 @@ #define DATETIME_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #pragma GCC diagnostic ignored "-Wunused-variable" /* Fields are packed into successive bytes, each viewed as unsigned and diff --git a/third_party/python/Include/descrobject.h b/third_party/python/Include/descrobject.h index eaa6f989f..a81d81ef1 100644 --- a/third_party/python/Include/descrobject.h +++ b/third_party/python/Include/descrobject.h @@ -4,7 +4,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyport.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef PyObject *(*getter)(PyObject *, void *); typedef int (*setter)(PyObject *, PyObject *, void *); diff --git a/third_party/python/Include/dictobject.h b/third_party/python/Include/dictobject.h index 0a4968d98..b6149e01a 100644 --- a/third_party/python/Include/dictobject.h +++ b/third_party/python/Include/dictobject.h @@ -2,7 +2,6 @@ #define Py_DICTOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Dictionary object type -- mapping from hashable object to object */ diff --git a/third_party/python/Include/dtoa.h b/third_party/python/Include/dtoa.h index 0315d4f91..6c10f6118 100644 --- a/third_party/python/Include/dtoa.h +++ b/third_party/python/Include/dtoa.h @@ -1,7 +1,6 @@ #ifndef Py_LIMITED_API #ifndef PY_NO_SHORT_FLOAT_REPR COSMOPOLITAN_C_START_ -/* clang-format off */ double _Py_dg_strtod(const char *str, char **ptr); char * _Py_dg_dtoa(double d, int mode, int ndigits, diff --git a/third_party/python/Include/dynamic_annotations.h b/third_party/python/Include/dynamic_annotations.h index 4d3b55fe2..18d429c6f 100644 --- a/third_party/python/Include/dynamic_annotations.h +++ b/third_party/python/Include/dynamic_annotations.h @@ -4,7 +4,6 @@ #define DYNAMIC_ANNOTATIONS_ENABLED 0 #endif #if DYNAMIC_ANNOTATIONS_ENABLED != 0 -/* clang-format off */ /* Copyright (c) 2008-2009, Google Inc. * All rights reserved. diff --git a/third_party/python/Include/enumobject.h b/third_party/python/Include/enumobject.h index dc1c8cebf..1d8b8869e 100644 --- a/third_party/python/Include/enumobject.h +++ b/third_party/python/Include/enumobject.h @@ -2,7 +2,6 @@ #define Py_ENUMOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ extern PyTypeObject PyEnum_Type; extern PyTypeObject PyReversed_Type; diff --git a/third_party/python/Include/errcode.h b/third_party/python/Include/errcode.h index 4894688a6..b88c32f6d 100644 --- a/third_party/python/Include/errcode.h +++ b/third_party/python/Include/errcode.h @@ -1,7 +1,6 @@ #ifndef Py_ERRCODE_H #define Py_ERRCODE_H COSMOPOLITAN_C_START_ -/* clang-format off */ /* Error codes passed around between file input, tokenizer, parser and diff --git a/third_party/python/Include/eval.h b/third_party/python/Include/eval.h index 2e3ce8e6d..3b7a684ff 100644 --- a/third_party/python/Include/eval.h +++ b/third_party/python/Include/eval.h @@ -2,7 +2,6 @@ #define Py_EVAL_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ PyObject * PyEval_EvalCode(PyObject *, PyObject *, PyObject *); diff --git a/third_party/python/Include/ezprint.h b/third_party/python/Include/ezprint.h index ca8b3e841..ed6acd015 100644 --- a/third_party/python/Include/ezprint.h +++ b/third_party/python/Include/ezprint.h @@ -6,7 +6,6 @@ #include "third_party/python/Include/bytesobject.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/unicodeobject.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ static void EzPrint(PyObject *x, const char *s) { @@ -34,5 +33,4 @@ static void EzPrint(PyObject *x, const char *s) { #define EZPRINT(x) EzPrint(x, #x) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_INCLUDE_EZPRINT_H_ */ diff --git a/third_party/python/Include/fileobject.h b/third_party/python/Include/fileobject.h index 36e0e0f72..ebacd43e6 100644 --- a/third_party/python/Include/fileobject.h +++ b/third_party/python/Include/fileobject.h @@ -2,7 +2,6 @@ #define Py_FILEOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define PY_STDIOTEXTMODE "b" diff --git a/third_party/python/Include/fileutils.h b/third_party/python/Include/fileutils.h index 9c93a58e3..a8e1768ef 100644 --- a/third_party/python/Include/fileutils.h +++ b/third_party/python/Include/fileutils.h @@ -3,7 +3,6 @@ #include "libc/calls/struct/stat.h" #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 wchar_t * Py_DecodeLocale( diff --git a/third_party/python/Include/floatobject.h b/third_party/python/Include/floatobject.h index 3513dd50d..c37e65527 100644 --- a/third_party/python/Include/floatobject.h +++ b/third_party/python/Include/floatobject.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/unicodeobject.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef Py_LIMITED_API typedef struct { diff --git a/third_party/python/Include/frameobject.h b/third_party/python/Include/frameobject.h index bd0a76712..20917d041 100644 --- a/third_party/python/Include/frameobject.h +++ b/third_party/python/Include/frameobject.h @@ -5,7 +5,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pystate.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef struct { int b_type; /* what kind of block this is */ diff --git a/third_party/python/Include/funcobject.h b/third_party/python/Include/funcobject.h index 007f7b1d4..733b7eb26 100644 --- a/third_party/python/Include/funcobject.h +++ b/third_party/python/Include/funcobject.h @@ -3,7 +3,6 @@ #define Py_FUNCOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Function objects and code objects should not be confused with each other: * diff --git a/third_party/python/Include/genobject.h b/third_party/python/Include/genobject.h index f261e8fdb..29873c588 100644 --- a/third_party/python/Include/genobject.h +++ b/third_party/python/Include/genobject.h @@ -3,7 +3,6 @@ #define Py_GENOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ struct _frame; /* Avoid including frameobject.h */ diff --git a/third_party/python/Include/graminit.h b/third_party/python/Include/graminit.h index 5afef6977..e9b4a9385 100644 --- a/third_party/python/Include/graminit.h +++ b/third_party/python/Include/graminit.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Generated by Parser/pgen */ #define single_input 256 diff --git a/third_party/python/Include/grammar.h b/third_party/python/Include/grammar.h index 784cd7da7..19c0f9d5b 100644 --- a/third_party/python/Include/grammar.h +++ b/third_party/python/Include/grammar.h @@ -3,7 +3,6 @@ #include "libc/stdio/stdio.h" #include "third_party/python/Include/bitset.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* A label of an arc */ typedef struct { diff --git a/third_party/python/Include/import.h b/third_party/python/Include/import.h index a2509e1a5..c9a763d48 100644 --- a/third_party/python/Include/import.h +++ b/third_party/python/Include/import.h @@ -2,7 +2,6 @@ #define Py_IMPORT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef Py_LIMITED_API void _PyImportZip_Init(void); diff --git a/third_party/python/Include/intrcheck.h b/third_party/python/Include/intrcheck.h index 92b444b8a..74a8b5db7 100644 --- a/third_party/python/Include/intrcheck.h +++ b/third_party/python/Include/intrcheck.h @@ -1,7 +1,6 @@ #ifndef Py_INTRCHECK_H #define Py_INTRCHECK_H COSMOPOLITAN_C_START_ -/* clang-format off */ int PyOS_InterruptOccurred(void); void PyOS_InitInterrupts(void); diff --git a/third_party/python/Include/iterobject.h b/third_party/python/Include/iterobject.h index 4e131765d..f8d511f11 100644 --- a/third_party/python/Include/iterobject.h +++ b/third_party/python/Include/iterobject.h @@ -2,7 +2,6 @@ #define Py_ITEROBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ extern PyTypeObject PySeqIter_Type; extern PyTypeObject PyCallIter_Type; diff --git a/third_party/python/Include/listobject.h b/third_party/python/Include/listobject.h index f3fad575a..d3aef35db 100644 --- a/third_party/python/Include/listobject.h +++ b/third_party/python/Include/listobject.h @@ -2,7 +2,6 @@ #define Py_LISTOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* List object interface diff --git a/third_party/python/Include/longintrepr.h b/third_party/python/Include/longintrepr.h index ffffa04d6..0570e46f8 100644 --- a/third_party/python/Include/longintrepr.h +++ b/third_party/python/Include/longintrepr.h @@ -5,7 +5,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyport.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* This is published for the benefit of "friends" marshal.c and _decimal.c. */ diff --git a/third_party/python/Include/longobject.h b/third_party/python/Include/longobject.h index c72fb2262..2f4f28ed2 100644 --- a/third_party/python/Include/longobject.h +++ b/third_party/python/Include/longobject.h @@ -4,7 +4,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/unicodeobject.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Long (arbitrary precision) integer object interface */ diff --git a/third_party/python/Include/marshal.h b/third_party/python/Include/marshal.h index 3ca0ecd3c..66eb7fe14 100644 --- a/third_party/python/Include/marshal.h +++ b/third_party/python/Include/marshal.h @@ -2,7 +2,6 @@ #define Py_MARSHAL_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define Py_MARSHAL_VERSION 4 diff --git a/third_party/python/Include/memoryobject.h b/third_party/python/Include/memoryobject.h index b01316e52..09baf0089 100644 --- a/third_party/python/Include/memoryobject.h +++ b/third_party/python/Include/memoryobject.h @@ -2,7 +2,6 @@ #define Py_MEMORYOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef Py_LIMITED_API extern PyTypeObject _PyManagedBuffer_Type; diff --git a/third_party/python/Include/metagrammar.h b/third_party/python/Include/metagrammar.h index b36b5ef16..3234863d6 100644 --- a/third_party/python/Include/metagrammar.h +++ b/third_party/python/Include/metagrammar.h @@ -1,7 +1,6 @@ #ifndef Py_METAGRAMMAR_H #define Py_METAGRAMMAR_H COSMOPOLITAN_C_START_ -/* clang-format off */ #define MSTART 256 #define RULE 257 diff --git a/third_party/python/Include/methodobject.h b/third_party/python/Include/methodobject.h index 7ed2ff033..c41f8d9b6 100644 --- a/third_party/python/Include/methodobject.h +++ b/third_party/python/Include/methodobject.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyport.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* This is about the type 'builtin_function_or_method', not Python methods in user-defined classes. See classobject.h diff --git a/third_party/python/Include/modsupport.h b/third_party/python/Include/modsupport.h index a34d17b91..f61a25c05 100644 --- a/third_party/python/Include/modsupport.h +++ b/third_party/python/Include/modsupport.h @@ -5,7 +5,6 @@ #include "third_party/python/Include/object.h" #pragma GCC diagnostic ignored "-Wredundant-decls" COSMOPOLITAN_C_START_ -/* clang-format off */ /* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier to mean Py_ssize_t */ diff --git a/third_party/python/Include/moduleobject.h b/third_party/python/Include/moduleobject.h index 2ed00d6e6..19d2e1eb6 100644 --- a/third_party/python/Include/moduleobject.h +++ b/third_party/python/Include/moduleobject.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/methodobject.h" #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ extern PyTypeObject PyModule_Type; diff --git a/third_party/python/Include/namespaceobject.h b/third_party/python/Include/namespaceobject.h index 634694bc1..4ff237fc9 100644 --- a/third_party/python/Include/namespaceobject.h +++ b/third_party/python/Include/namespaceobject.h @@ -2,7 +2,6 @@ #define NAMESPACEOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef Py_LIMITED_API extern PyTypeObject _PyNamespace_Type; diff --git a/third_party/python/Include/node.h b/third_party/python/Include/node.h index 19a10f801..f15879726 100644 --- a/third_party/python/Include/node.h +++ b/third_party/python/Include/node.h @@ -2,7 +2,6 @@ #define Py_NODE_H #include "third_party/python/Include/pyport.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef struct _node { short n_type; diff --git a/third_party/python/Include/object.h b/third_party/python/Include/object.h index 15b0f1a9b..735720358 100644 --- a/third_party/python/Include/object.h +++ b/third_party/python/Include/object.h @@ -4,7 +4,6 @@ #include "third_party/python/Include/op.h" #include "third_party/python/Include/pyport.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Object and type object interface */ diff --git a/third_party/python/Include/objimpl.h b/third_party/python/Include/objimpl.h index ff84738d7..adb0cbed9 100644 --- a/third_party/python/Include/objimpl.h +++ b/third_party/python/Include/objimpl.h @@ -7,7 +7,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/tupleobject.h" COSMOPOLITAN_C_START_ -/* clang-format off */ void * PyObject_Malloc(size_t); #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 diff --git a/third_party/python/Include/odictobject.h b/third_party/python/Include/odictobject.h index af70326e0..e37084e9e 100644 --- a/third_party/python/Include/odictobject.h +++ b/third_party/python/Include/odictobject.h @@ -2,7 +2,6 @@ #define Py_ODICTOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* OrderedDict */ /* This API is optional and mostly redundant. */ diff --git a/third_party/python/Include/opcode.h b/third_party/python/Include/opcode.h index 9f37c1714..2c66919da 100644 --- a/third_party/python/Include/opcode.h +++ b/third_party/python/Include/opcode.h @@ -2,7 +2,6 @@ #define Py_OPCODE_H #include "third_party/python/Include/op.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Auto-generated by Tools/scripts/generate_opcode_h.py */ /* Instruction opcodes for compiled code */ diff --git a/third_party/python/Include/osmodule.h b/third_party/python/Include/osmodule.h index 73226fed9..4bf551ae2 100644 --- a/third_party/python/Include/osmodule.h +++ b/third_party/python/Include/osmodule.h @@ -2,7 +2,6 @@ #define Py_OSMODULE_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000 PyObject * PyOS_FSPath(PyObject *path); diff --git a/third_party/python/Include/parsetok.h b/third_party/python/Include/parsetok.h index 30b1e844e..447c7fc29 100644 --- a/third_party/python/Include/parsetok.h +++ b/third_party/python/Include/parsetok.h @@ -5,7 +5,6 @@ #include "third_party/python/Include/node.h" #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef struct { int error; diff --git a/third_party/python/Include/patchlevel.h b/third_party/python/Include/patchlevel.h index 2311758aa..5af2de3bc 100644 --- a/third_party/python/Include/patchlevel.h +++ b/third_party/python/Include/patchlevel.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Python version identification scheme. diff --git a/third_party/python/Include/pgen.h b/third_party/python/Include/pgen.h index 288de3a11..4fd696d41 100644 --- a/third_party/python/Include/pgen.h +++ b/third_party/python/Include/pgen.h @@ -2,7 +2,6 @@ #define Py_PGEN_H #include "third_party/python/Include/grammar.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Parser generator interface */ diff --git a/third_party/python/Include/pgenheaders.h b/third_party/python/Include/pgenheaders.h index 8fbf2ef77..d83a7e5ff 100644 --- a/third_party/python/Include/pgenheaders.h +++ b/third_party/python/Include/pgenheaders.h @@ -2,7 +2,6 @@ #define Py_PGENHEADERS_H #include "third_party/python/Include/pyport.h" COSMOPOLITAN_C_START_ -/* clang-format off */ void PySys_WriteStdout(const char *format, ...) Py_GCC_ATTRIBUTE((format(printf, 1, 2))); diff --git a/third_party/python/Include/py_curses.h b/third_party/python/Include/py_curses.h index 57b2dc351..a0dac02d2 100644 --- a/third_party/python/Include/py_curses.h +++ b/third_party/python/Include/py_curses.h @@ -1,7 +1,6 @@ #ifndef Py_CURSES_H #define Py_CURSES_H #include "third_party/python/Include/object.h" -/* clang-format off */ #if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS) /* The following definition is necessary for ncurses 5.7; without it, diff --git a/third_party/python/Include/pyarena.h b/third_party/python/Include/pyarena.h index f02410fa8..169654d7f 100644 --- a/third_party/python/Include/pyarena.h +++ b/third_party/python/Include/pyarena.h @@ -3,7 +3,6 @@ #define Py_PYARENA_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef struct _arena PyArena; diff --git a/third_party/python/Include/pyatomic.h b/third_party/python/Include/pyatomic.h index fb24cdbce..b1b49d9de 100644 --- a/third_party/python/Include/pyatomic.h +++ b/third_party/python/Include/pyatomic.h @@ -3,7 +3,6 @@ #include "libc/assert.h" #include "third_party/python/Include/dynamic_annotations.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ /* This is modeled after the atomics interface from C1x, according to * the draft at diff --git a/third_party/python/Include/pycapsule.h b/third_party/python/Include/pycapsule.h index c6e40dfd1..d725784ef 100644 --- a/third_party/python/Include/pycapsule.h +++ b/third_party/python/Include/pycapsule.h @@ -2,7 +2,6 @@ #define Py_CAPSULE_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Capsule objects let you wrap a C "void *" pointer in a Python object. They're a way of passing data through the Python interpreter diff --git a/third_party/python/Include/pydebug.h b/third_party/python/Include/pydebug.h index e0d86a712..f127c7d9b 100644 --- a/third_party/python/Include/pydebug.h +++ b/third_party/python/Include/pydebug.h @@ -2,7 +2,6 @@ #ifndef Py_PYDEBUG_H #define Py_PYDEBUG_H COSMOPOLITAN_C_START_ -/* clang-format off */ #include "libc/runtime/runtime.h" /* These global variable are defined in pylifecycle.c */ diff --git a/third_party/python/Include/pyerrors.h b/third_party/python/Include/pyerrors.h index fff039e3b..bf2c8c3df 100644 --- a/third_party/python/Include/pyerrors.h +++ b/third_party/python/Include/pyerrors.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/unicodeobject.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef Py_LIMITED_API /* PyException_HEAD defines the initial segment of every exception class. */ diff --git a/third_party/python/Include/pyexpat.h b/third_party/python/Include/pyexpat.h index bf05bf873..16e0fdfb3 100644 --- a/third_party/python/Include/pyexpat.h +++ b/third_party/python/Include/pyexpat.h @@ -2,9 +2,7 @@ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_INCLUDE_PYEXPAT_H_ #include "third_party/python/Modules/expat/expat.h" #include "third_party/python/Modules/expat/expat_external.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1" #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" @@ -58,5 +56,4 @@ struct PyExpat_CAPI COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_INCLUDE_PYEXPAT_H_ */ diff --git a/third_party/python/Include/pyfpe.h b/third_party/python/Include/pyfpe.h index 6bd2dbfe9..91396f3c6 100644 --- a/third_party/python/Include/pyfpe.h +++ b/third_party/python/Include/pyfpe.h @@ -1,7 +1,6 @@ #ifndef Py_PYFPE_H #define Py_PYFPE_H COSMOPOLITAN_C_START_ -/* clang-format off */ #ifdef WANT_SIGFPE_HANDLER extern jmp_buf PyFPE_jbuf; extern int PyFPE_counter; diff --git a/third_party/python/Include/pygetopt.h b/third_party/python/Include/pygetopt.h index c16734056..fffdab11c 100644 --- a/third_party/python/Include/pygetopt.h +++ b/third_party/python/Include/pygetopt.h @@ -1,7 +1,6 @@ #ifndef Py_PYGETOPT_H #define Py_PYGETOPT_H COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef Py_LIMITED_API extern int _PyOS_opterr; diff --git a/third_party/python/Include/pyhash.h b/third_party/python/Include/pyhash.h index 058d66551..37dc95987 100644 --- a/third_party/python/Include/pyhash.h +++ b/third_party/python/Include/pyhash.h @@ -2,7 +2,6 @@ #define Py_HASH_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Helpers for hash functions */ #ifndef Py_LIMITED_API diff --git a/third_party/python/Include/pylifecycle.h b/third_party/python/Include/pylifecycle.h index 56de0e771..e12e5da56 100644 --- a/third_party/python/Include/pylifecycle.h +++ b/third_party/python/Include/pylifecycle.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pystate.h" COSMOPOLITAN_C_START_ -/* clang-format off */ void Py_SetProgramName(wchar_t *); wchar_t * Py_GetProgramName(void); diff --git a/third_party/python/Include/pymacro.h b/third_party/python/Include/pymacro.h index d61135db4..2a839abf8 100644 --- a/third_party/python/Include/pymacro.h +++ b/third_party/python/Include/pymacro.h @@ -1,6 +1,5 @@ #ifndef Py_PYMACRO_H #define Py_PYMACRO_H -/* clang-format off */ /* Minimum value between x and y */ #define Py_MIN(x, y) (((x) > (y)) ? (y) : (x)) diff --git a/third_party/python/Include/pymath.h b/third_party/python/Include/pymath.h index 88b9aaa1a..91625521e 100644 --- a/third_party/python/Include/pymath.h +++ b/third_party/python/Include/pymath.h @@ -2,7 +2,6 @@ #define Py_PYMATH_H #include "libc/math.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ /************************************************************************** Symbols and macros to supply platform-independent interfaces to mathematical diff --git a/third_party/python/Include/pymem.h b/third_party/python/Include/pymem.h index 4bd581657..4745522ac 100644 --- a/third_party/python/Include/pymem.h +++ b/third_party/python/Include/pymem.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyport.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Debug-mode build with pymalloc implies PYMALLOC_DEBUG. * PYMALLOC_DEBUG is in error if pymalloc is not in use. diff --git a/third_party/python/Include/pyport.h b/third_party/python/Include/pyport.h index 7db929870..2e1fbd9f2 100644 --- a/third_party/python/Include/pyport.h +++ b/third_party/python/Include/pyport.h @@ -3,7 +3,6 @@ #include "libc/limits.h" #include "third_party/python/Include/pymath.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ #define HAVE_LONG_LONG 1 #define PY_LONG_LONG long long diff --git a/third_party/python/Include/pystate.h b/third_party/python/Include/pystate.h index 422635172..f05865953 100644 --- a/third_party/python/Include/pystate.h +++ b/third_party/python/Include/pystate.h @@ -4,7 +4,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyatomic.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* This limitation is for performance and simplicity. If needed it can be removed (with effort). */ diff --git a/third_party/python/Include/pystrcmp.h b/third_party/python/Include/pystrcmp.h index 275b3bca0..72747fb05 100644 --- a/third_party/python/Include/pystrcmp.h +++ b/third_party/python/Include/pystrcmp.h @@ -2,7 +2,6 @@ #define Py_STRCMP_H #include "third_party/python/Include/pyport.h" COSMOPOLITAN_C_START_ -/* clang-format off */ int PyOS_mystrnicmp(const char *, const char *, Py_ssize_t); int PyOS_mystricmp(const char *, const char *); diff --git a/third_party/python/Include/pystrhex.h b/third_party/python/Include/pystrhex.h index 4da0d6a39..a7760de9e 100644 --- a/third_party/python/Include/pystrhex.h +++ b/third_party/python/Include/pystrhex.h @@ -2,7 +2,6 @@ #define Py_STRHEX_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef Py_LIMITED_API /* Returns a str() containing the hex representation of argbuf. */ diff --git a/third_party/python/Include/pystrtod.h b/third_party/python/Include/pystrtod.h index 43d55a137..a60270f9e 100644 --- a/third_party/python/Include/pystrtod.h +++ b/third_party/python/Include/pystrtod.h @@ -2,7 +2,6 @@ #define Py_STRTOD_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ double PyOS_string_to_double(const char *str, char **endptr, diff --git a/third_party/python/Include/pythonrun.h b/third_party/python/Include/pythonrun.h index 6e1c5fc00..17e0b13e8 100644 --- a/third_party/python/Include/pythonrun.h +++ b/third_party/python/Include/pythonrun.h @@ -5,7 +5,6 @@ #include "third_party/python/Include/pyarena.h" #include "third_party/python/Include/pystate.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \ CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \ diff --git a/third_party/python/Include/pythread.h b/third_party/python/Include/pythread.h index be42b75fc..ace1e8c95 100644 --- a/third_party/python/Include/pythread.h +++ b/third_party/python/Include/pythread.h @@ -2,7 +2,6 @@ #define Py_PYTHREAD_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef void *PyThread_type_lock; typedef void *PyThread_type_sema; diff --git a/third_party/python/Include/rangeobject.h b/third_party/python/Include/rangeobject.h index 6c219267a..55ef6cf00 100644 --- a/third_party/python/Include/rangeobject.h +++ b/third_party/python/Include/rangeobject.h @@ -2,7 +2,6 @@ #define Py_RANGEOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* A range object represents an integer range. This is an immutable object; diff --git a/third_party/python/Include/setobject.h b/third_party/python/Include/setobject.h index 895680e8c..387d79861 100644 --- a/third_party/python/Include/setobject.h +++ b/third_party/python/Include/setobject.h @@ -2,7 +2,6 @@ #define Py_SETOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef Py_LIMITED_API diff --git a/third_party/python/Include/sliceobject.h b/third_party/python/Include/sliceobject.h index f1c222b38..67ddc61a9 100644 --- a/third_party/python/Include/sliceobject.h +++ b/third_party/python/Include/sliceobject.h @@ -2,7 +2,6 @@ #define Py_SLICEOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* The unique ellipsis object "..." */ diff --git a/third_party/python/Include/structmember.h b/third_party/python/Include/structmember.h index 4fe7e0f07..9d4278ee1 100644 --- a/third_party/python/Include/structmember.h +++ b/third_party/python/Include/structmember.h @@ -2,7 +2,6 @@ #define Py_STRUCTMEMBER_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Interface to map C struct members to Python object attributes */ diff --git a/third_party/python/Include/structseq.h b/third_party/python/Include/structseq.h index c53fde951..a7b19ef7b 100644 --- a/third_party/python/Include/structseq.h +++ b/third_party/python/Include/structseq.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/tupleobject.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef struct PyStructSequence_Field { char *name; diff --git a/third_party/python/Include/symtable.h b/third_party/python/Include/symtable.h index d97cc2a2c..327cbd5f8 100644 --- a/third_party/python/Include/symtable.h +++ b/third_party/python/Include/symtable.h @@ -5,7 +5,6 @@ #include "third_party/python/Include/compile.h" #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock } _Py_block_ty; diff --git a/third_party/python/Include/sysmodule.h b/third_party/python/Include/sysmodule.h index e4f620d01..2787088a5 100644 --- a/third_party/python/Include/sysmodule.h +++ b/third_party/python/Include/sysmodule.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyport.h" COSMOPOLITAN_C_START_ -/* clang-format off */ PyObject * PySys_GetObject(const char *); int PySys_SetObject(const char *, PyObject *); diff --git a/third_party/python/Include/token.h b/third_party/python/Include/token.h index b66401a8b..fe73ac59b 100644 --- a/third_party/python/Include/token.h +++ b/third_party/python/Include/token.h @@ -2,7 +2,6 @@ #ifndef Py_TOKEN_H #define Py_TOKEN_H COSMOPOLITAN_C_START_ -/* clang-format off */ #undef TILDE /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */ diff --git a/third_party/python/Include/traceback.h b/third_party/python/Include/traceback.h index dc8a7c79d..a100c8618 100644 --- a/third_party/python/Include/traceback.h +++ b/third_party/python/Include/traceback.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pystate.h" COSMOPOLITAN_C_START_ -/* clang-format off */ struct _frame; diff --git a/third_party/python/Include/tupleobject.h b/third_party/python/Include/tupleobject.h index 6f07f70fa..e52364174 100644 --- a/third_party/python/Include/tupleobject.h +++ b/third_party/python/Include/tupleobject.h @@ -2,7 +2,6 @@ #define Py_TUPLEOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Another generally useful object type is a tuple of object pointers. diff --git a/third_party/python/Include/typeslots.h b/third_party/python/Include/typeslots.h index 8276e3086..0ce6a377d 100644 --- a/third_party/python/Include/typeslots.h +++ b/third_party/python/Include/typeslots.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* Do not renumber the file; these numbers are part of the stable ABI. */ /* Disabled, see #10181 */ #undef Py_bf_getbuffer diff --git a/third_party/python/Include/ucnhash.h b/third_party/python/Include/ucnhash.h index 24933f1f6..a397bbe58 100644 --- a/third_party/python/Include/ucnhash.h +++ b/third_party/python/Include/ucnhash.h @@ -4,7 +4,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/unicodeobject.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* revised ucnhash CAPI interface (exported through a "wrapper") */ diff --git a/third_party/python/Include/unicodeobject.h b/third_party/python/Include/unicodeobject.h index e135fe7ee..084c213e8 100644 --- a/third_party/python/Include/unicodeobject.h +++ b/third_party/python/Include/unicodeobject.h @@ -4,7 +4,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/pyconfig.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define Py_USING_UNICODE diff --git a/third_party/python/Include/weakrefobject.h b/third_party/python/Include/weakrefobject.h index a03148eb5..969d1f506 100644 --- a/third_party/python/Include/weakrefobject.h +++ b/third_party/python/Include/weakrefobject.h @@ -2,7 +2,6 @@ #define Py_WEAKREFOBJECT_H #include "third_party/python/Include/object.h" COSMOPOLITAN_C_START_ -/* clang-format off */ typedef struct _PyWeakReference PyWeakReference; diff --git a/third_party/python/Modules/_asynciomodule.c b/third_party/python/Modules/_asynciomodule.c index 581a59ef9..5307d1de8 100644 --- a/third_party/python/Modules/_asynciomodule.c +++ b/third_party/python/Modules/_asynciomodule.c @@ -21,7 +21,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_asyncio"); PYTHON_PROVIDE("_asyncio.Future"); diff --git a/third_party/python/Modules/_bisectmodule.c b/third_party/python/Modules/_bisectmodule.c index 1046ada22..7ed65de14 100644 --- a/third_party/python/Modules/_bisectmodule.c +++ b/third_party/python/Modules/_bisectmodule.c @@ -13,7 +13,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_bisect"); PYTHON_PROVIDE("_bisect.bisect"); diff --git a/third_party/python/Modules/_bz2module.c b/third_party/python/Modules/_bz2module.c index b18245448..e097ebc16 100644 --- a/third_party/python/Modules/_bz2module.c +++ b/third_party/python/Modules/_bz2module.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/pythread.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_bz2"); PYTHON_PROVIDE("_bz2.BZ2Compressor"); diff --git a/third_party/python/Modules/_codecsmodule.c b/third_party/python/Modules/_codecsmodule.c index 6c5d8e1a4..9e55637d4 100644 --- a/third_party/python/Modules/_codecsmodule.c +++ b/third_party/python/Modules/_codecsmodule.c @@ -16,7 +16,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_codecs"); PYTHON_PROVIDE("_codecs._forget_codec"); diff --git a/third_party/python/Modules/_collectionsmodule.c b/third_party/python/Modules/_collectionsmodule.c index 609160c73..4e8b9c4c6 100644 --- a/third_party/python/Modules/_collectionsmodule.c +++ b/third_party/python/Modules/_collectionsmodule.c @@ -15,7 +15,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_collections"); PYTHON_PROVIDE("_collections.OrderedDict"); diff --git a/third_party/python/Modules/_cryptmodule.c b/third_party/python/Modules/_cryptmodule.c index 64ac776f8..3155892b9 100644 --- a/third_party/python/Modules/_cryptmodule.c +++ b/third_party/python/Modules/_cryptmodule.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_crypt"); PYTHON_PROVIDE("_crypt.crypt"); diff --git a/third_party/python/Modules/_csv.c b/third_party/python/Modules/_csv.c index c23893000..6a5e2d000 100644 --- a/third_party/python/Modules/_csv.c +++ b/third_party/python/Modules/_csv.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_csv"); PYTHON_PROVIDE("_csv.Dialect"); diff --git a/third_party/python/Modules/_datetimemodule.c b/third_party/python/Modules/_datetimemodule.c index d449af4d4..c9874d175 100644 --- a/third_party/python/Modules/_datetimemodule.c +++ b/third_party/python/Modules/_datetimemodule.c @@ -25,7 +25,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_datetime"); PYTHON_PROVIDE("_datetime.MAXYEAR"); diff --git a/third_party/python/Modules/_dbmmodule.c b/third_party/python/Modules/_dbmmodule.c index d967eea59..cae1ee2bc 100644 --- a/third_party/python/Modules/_dbmmodule.c +++ b/third_party/python/Modules/_dbmmodule.c @@ -1,6 +1,5 @@ #define PY_SSIZE_T_CLEAN #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_dbm"); diff --git a/third_party/python/Modules/_decimal/_decimal.c b/third_party/python/Modules/_decimal/_decimal.c index 2a6e182b2..5ccf61952 100644 --- a/third_party/python/Modules/_decimal/_decimal.c +++ b/third_party/python/Modules/_decimal/_decimal.c @@ -47,7 +47,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/_decimal/docstrings.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ PYTHON_PROVIDE("_decimal"); PYTHON_PROVIDE("_decimal.BasicContext"); diff --git a/third_party/python/Modules/_decimal/docstrings.h b/third_party/python/Modules/_decimal/docstrings.h index ace5902c0..7d242c765 100644 --- a/third_party/python/Modules/_decimal/docstrings.h +++ b/third_party/python/Modules/_decimal/docstrings.h @@ -1,6 +1,5 @@ #ifndef DOCSTRINGS_H #define DOCSTRINGS_H -/* clang-format off */ #include "third_party/python/Include/pymacro.h" diff --git a/third_party/python/Modules/_decimal/libmpdec/basearith.c b/third_party/python/Modules/_decimal/libmpdec/basearith.c index e2122d19e..5e84bb051 100644 --- a/third_party/python/Modules/_decimal/libmpdec/basearith.c +++ b/third_party/python/Modules/_decimal/libmpdec/basearith.c @@ -31,7 +31,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/constants.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/typearith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/basearith.h b/third_party/python/Modules/_decimal/libmpdec/basearith.h index 8cdc506e6..b155af615 100644 --- a/third_party/python/Modules/_decimal/libmpdec/basearith.h +++ b/third_party/python/Modules/_decimal/libmpdec/basearith.h @@ -2,7 +2,6 @@ #define BASEARITH_H #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/typearith.h" -/* clang-format off */ /* Internal header file: all symbols have local scope in the DSO */ diff --git a/third_party/python/Modules/_decimal/libmpdec/bits.h b/third_party/python/Modules/_decimal/libmpdec/bits.h index 0c309f91d..a0732ca9d 100644 --- a/third_party/python/Modules/_decimal/libmpdec/bits.h +++ b/third_party/python/Modules/_decimal/libmpdec/bits.h @@ -1,7 +1,6 @@ #ifndef BITS_H #define BITS_H #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ /* * Check if 𝑛 is a power of 2. diff --git a/third_party/python/Modules/_decimal/libmpdec/constants.c b/third_party/python/Modules/_decimal/libmpdec/constants.c index 8cf4f3d77..530776c51 100644 --- a/third_party/python/Modules/_decimal/libmpdec/constants.c +++ b/third_party/python/Modules/_decimal/libmpdec/constants.c @@ -29,7 +29,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Modules/_decimal/libmpdec/constants.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/constants.h b/third_party/python/Modules/_decimal/libmpdec/constants.h index ae5c0ee32..559098a02 100644 --- a/third_party/python/Modules/_decimal/libmpdec/constants.h +++ b/third_party/python/Modules/_decimal/libmpdec/constants.h @@ -1,7 +1,6 @@ #ifndef CONSTANTS_H #define CONSTANTS_H #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ #define MULMOD(a, b) x64_mulmod(a, b, umod) #define MULMOD2C(a0, a1, w) x64_mulmod2c(a0, a1, w, umod) diff --git a/third_party/python/Modules/_decimal/libmpdec/context.c b/third_party/python/Modules/_decimal/libmpdec/context.c index cc5f59bc5..2e83c8326 100644 --- a/third_party/python/Modules/_decimal/libmpdec/context.c +++ b/third_party/python/Modules/_decimal/libmpdec/context.c @@ -30,7 +30,6 @@ #include "libc/calls/calls.h" #include "libc/sysv/consts/sig.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/convolute.c b/third_party/python/Modules/_decimal/libmpdec/convolute.c index 077165b79..e7588ced3 100644 --- a/third_party/python/Modules/_decimal/libmpdec/convolute.c +++ b/third_party/python/Modules/_decimal/libmpdec/convolute.c @@ -36,7 +36,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/numbertheory.h" #include "third_party/python/Modules/_decimal/libmpdec/sixstep.h" #include "third_party/python/Modules/_decimal/libmpdec/umodarith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/crt.c b/third_party/python/Modules/_decimal/libmpdec/crt.c index 9562d60d7..770dbaaea 100644 --- a/third_party/python/Modules/_decimal/libmpdec/crt.c +++ b/third_party/python/Modules/_decimal/libmpdec/crt.c @@ -31,7 +31,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/numbertheory.h" #include "third_party/python/Modules/_decimal/libmpdec/umodarith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/crt.h b/third_party/python/Modules/_decimal/libmpdec/crt.h index 124421673..3e90c54dd 100644 --- a/third_party/python/Modules/_decimal/libmpdec/crt.h +++ b/third_party/python/Modules/_decimal/libmpdec/crt.h @@ -1,7 +1,6 @@ #ifndef CRT_H #define CRT_H #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ /* Internal header file: all symbols have local scope in the DSO */ diff --git a/third_party/python/Modules/_decimal/libmpdec/difradix2.c b/third_party/python/Modules/_decimal/libmpdec/difradix2.c index 1815a0454..bd3a6dc53 100644 --- a/third_party/python/Modules/_decimal/libmpdec/difradix2.c +++ b/third_party/python/Modules/_decimal/libmpdec/difradix2.c @@ -32,7 +32,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/numbertheory.h" #include "third_party/python/Modules/_decimal/libmpdec/umodarith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/fnt.c b/third_party/python/Modules/_decimal/libmpdec/fnt.c index 4024e2b5d..18559cd4d 100644 --- a/third_party/python/Modules/_decimal/libmpdec/fnt.c +++ b/third_party/python/Modules/_decimal/libmpdec/fnt.c @@ -33,7 +33,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/fnt.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/numbertheory.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/fourstep.c b/third_party/python/Modules/_decimal/libmpdec/fourstep.c index 994f89c08..c01cf3779 100644 --- a/third_party/python/Modules/_decimal/libmpdec/fourstep.c +++ b/third_party/python/Modules/_decimal/libmpdec/fourstep.c @@ -33,7 +33,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/sixstep.h" #include "third_party/python/Modules/_decimal/libmpdec/transpose.h" #include "third_party/python/Modules/_decimal/libmpdec/umodarith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/io.c b/third_party/python/Modules/_decimal/libmpdec/io.c index ee1e5d8e1..4a94ad7a7 100644 --- a/third_party/python/Modules/_decimal/libmpdec/io.c +++ b/third_party/python/Modules/_decimal/libmpdec/io.c @@ -35,7 +35,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/io.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/typearith.h" -/* clang-format off */ #if __GNUC__ >= 11 #pragma GCC diagnostic ignored "-Wmisleading-indentation" diff --git a/third_party/python/Modules/_decimal/libmpdec/io.h b/third_party/python/Modules/_decimal/libmpdec/io.h index 77c1af9c4..b4377a5cc 100644 --- a/third_party/python/Modules/_decimal/libmpdec/io.h +++ b/third_party/python/Modules/_decimal/libmpdec/io.h @@ -1,7 +1,6 @@ #ifndef IO_H #define IO_H #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ #if SIZE_MAX == MPD_SIZE_MAX #define mpd_strtossize _mpd_strtossize diff --git a/third_party/python/Modules/_decimal/libmpdec/memory.c b/third_party/python/Modules/_decimal/libmpdec/memory.c index 6675bcdaa..ece32d828 100644 --- a/third_party/python/Modules/_decimal/libmpdec/memory.c +++ b/third_party/python/Modules/_decimal/libmpdec/memory.c @@ -31,7 +31,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/mpalloc.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/typearith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/mpdecimal.c b/third_party/python/Modules/_decimal/libmpdec/mpdecimal.c index da65ef7a7..5bab6af12 100644 --- a/third_party/python/Modules/_decimal/libmpdec/mpdecimal.c +++ b/third_party/python/Modules/_decimal/libmpdec/mpdecimal.c @@ -36,7 +36,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/mpalloc.h" #include "third_party/python/Modules/_decimal/libmpdec/typearith.h" #include "third_party/python/Modules/_decimal/libmpdec/umodarith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/mpdecimal.h b/third_party/python/Modules/_decimal/libmpdec/mpdecimal.h index f363e28c7..4f2d6f3b2 100644 --- a/third_party/python/Modules/_decimal/libmpdec/mpdecimal.h +++ b/third_party/python/Modules/_decimal/libmpdec/mpdecimal.h @@ -7,7 +7,6 @@ #include "libc/stdio/stdio.h" #include "third_party/python/pyconfig.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MPD_VERSION "2.4.2" #define MPD_MAJOR_VERSION 2 diff --git a/third_party/python/Modules/_decimal/libmpdec/numbertheory.c b/third_party/python/Modules/_decimal/libmpdec/numbertheory.c index af3bb5d46..96de4b682 100644 --- a/third_party/python/Modules/_decimal/libmpdec/numbertheory.c +++ b/third_party/python/Modules/_decimal/libmpdec/numbertheory.c @@ -31,7 +31,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/numbertheory.h" #include "third_party/python/Modules/_decimal/libmpdec/umodarith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/sixstep.c b/third_party/python/Modules/_decimal/libmpdec/sixstep.c index eee8ec3ab..408a03496 100644 --- a/third_party/python/Modules/_decimal/libmpdec/sixstep.c +++ b/third_party/python/Modules/_decimal/libmpdec/sixstep.c @@ -34,7 +34,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/sixstep.h" #include "third_party/python/Modules/_decimal/libmpdec/transpose.h" #include "third_party/python/Modules/_decimal/libmpdec/umodarith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/sixstep.h b/third_party/python/Modules/_decimal/libmpdec/sixstep.h index 59b6782ef..ff29c1720 100644 --- a/third_party/python/Modules/_decimal/libmpdec/sixstep.h +++ b/third_party/python/Modules/_decimal/libmpdec/sixstep.h @@ -1,7 +1,6 @@ #ifndef SIX_STEP_H #define SIX_STEP_H #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ /* Internal header file: all symbols have local scope in the DSO */ diff --git a/third_party/python/Modules/_decimal/libmpdec/transpose.c b/third_party/python/Modules/_decimal/libmpdec/transpose.c index 8aa8af9cd..0541772dc 100644 --- a/third_party/python/Modules/_decimal/libmpdec/transpose.c +++ b/third_party/python/Modules/_decimal/libmpdec/transpose.c @@ -34,7 +34,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/constants.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/typearith.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ libmpdec (BSD-2)\\n\ diff --git a/third_party/python/Modules/_decimal/libmpdec/transpose.h b/third_party/python/Modules/_decimal/libmpdec/transpose.h index 750500f4a..58c35ed07 100644 --- a/third_party/python/Modules/_decimal/libmpdec/transpose.h +++ b/third_party/python/Modules/_decimal/libmpdec/transpose.h @@ -1,7 +1,6 @@ #ifndef TRANSPOSE_H #define TRANSPOSE_H #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ /* Internal header file: all symbols have local scope in the DSO */ diff --git a/third_party/python/Modules/_decimal/libmpdec/typearith.h b/third_party/python/Modules/_decimal/libmpdec/typearith.h index a1fcc64a8..c0c0a5fcc 100644 --- a/third_party/python/Modules/_decimal/libmpdec/typearith.h +++ b/third_party/python/Modules/_decimal/libmpdec/typearith.h @@ -2,7 +2,6 @@ #define TYPEARITH_H #include "libc/assert.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" -/* clang-format off */ #if defined(__GNUC__) && defined(__x86_64__) && !defined(__STRICT_ANSI__) diff --git a/third_party/python/Modules/_decimal/libmpdec/umodarith.h b/third_party/python/Modules/_decimal/libmpdec/umodarith.h index 5f55c90fe..1393cef77 100644 --- a/third_party/python/Modules/_decimal/libmpdec/umodarith.h +++ b/third_party/python/Modules/_decimal/libmpdec/umodarith.h @@ -3,7 +3,6 @@ #include "third_party/python/Modules/_decimal/libmpdec/constants.h" #include "third_party/python/Modules/_decimal/libmpdec/mpdecimal.h" #include "third_party/python/Modules/_decimal/libmpdec/typearith.h" -/* clang-format off */ /* Bignum: Low level routines for unsigned modular arithmetic. These are used in the fast convolution functions for very large coefficients. */ diff --git a/third_party/python/Modules/_elementtree.c b/third_party/python/Modules/_elementtree.c index ad8dd14c0..25f6a1f7b 100644 --- a/third_party/python/Modules/_elementtree.c +++ b/third_party/python/Modules/_elementtree.c @@ -25,7 +25,6 @@ #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/expat/expat.h" -/* clang-format off */ PYTHON_PROVIDE("_elementtree"); PYTHON_PROVIDE("_elementtree.Element"); diff --git a/third_party/python/Modules/_functoolsmodule.c b/third_party/python/Modules/_functoolsmodule.c index 052d4374f..76e20c013 100644 --- a/third_party/python/Modules/_functoolsmodule.c +++ b/third_party/python/Modules/_functoolsmodule.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_functools"); PYTHON_PROVIDE("_functools._lru_cache_wrapper"); diff --git a/third_party/python/Modules/_gdbmmodule.c b/third_party/python/Modules/_gdbmmodule.c index bc7aa4028..6d62b7378 100644 --- a/third_party/python/Modules/_gdbmmodule.c +++ b/third_party/python/Modules/_gdbmmodule.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_gdbm"); diff --git a/third_party/python/Modules/_hashmbedtls.c b/third_party/python/Modules/_hashmbedtls.c index c30a67eab..d9d8f15b3 100644 --- a/third_party/python/Modules/_hashmbedtls.c +++ b/third_party/python/Modules/_hashmbedtls.c @@ -33,7 +33,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/hashlib.h" -/* clang-format off */ PYTHON_PROVIDE("_hashlib"); PYTHON_PROVIDE("_hashlib.HASH"); diff --git a/third_party/python/Modules/_heapqmodule.c b/third_party/python/Modules/_heapqmodule.c index 044eaaf2a..3ea32e916 100644 --- a/third_party/python/Modules/_heapqmodule.c +++ b/third_party/python/Modules/_heapqmodule.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_heapq"); PYTHON_PROVIDE("_heapq._heapify_max"); diff --git a/third_party/python/Modules/_io/_iomodule.c b/third_party/python/Modules/_io/_iomodule.c index ffc234305..e6af51773 100644 --- a/third_party/python/Modules/_io/_iomodule.c +++ b/third_party/python/Modules/_io/_iomodule.c @@ -21,7 +21,6 @@ #include "third_party/python/Include/weakrefobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/_io/_iomodule.h" -/* clang-format off */ PYTHON_PROVIDE("_io"); PYTHON_PROVIDE("_io.BlockingIOError"); diff --git a/third_party/python/Modules/_io/_iomodule.h b/third_party/python/Modules/_io/_iomodule.h index 802a07b00..fbe40ed90 100644 --- a/third_party/python/Modules/_io/_iomodule.h +++ b/third_party/python/Modules/_io/_iomodule.h @@ -3,9 +3,7 @@ #include "libc/calls/weirdtypes.h" #include "third_party/python/Include/moduleobject.h" #include "third_party/python/Include/object.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ /* ABCs */ extern PyTypeObject PyIOBase_Type; @@ -193,5 +191,4 @@ extern PyObject *_PyIO_zero; extern PyTypeObject _PyBytesIOBuffer_Type; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES__IO__IOMODULE_H_ */ diff --git a/third_party/python/Modules/_io/bufferedio.c b/third_party/python/Modules/_io/bufferedio.c index c357dfd91..8a9faa7af 100644 --- a/third_party/python/Modules/_io/bufferedio.c +++ b/third_party/python/Modules/_io/bufferedio.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/pythread.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Modules/_io/_iomodule.h" -/* clang-format off */ /* An implementation of Buffered I/O as defined by PEP 3116 - "New I/O" diff --git a/third_party/python/Modules/_io/bytesio.c b/third_party/python/Modules/_io/bytesio.c index 15345effa..a4cf112b4 100644 --- a/third_party/python/Modules/_io/bytesio.c +++ b/third_party/python/Modules/_io/bytesio.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Modules/_io/_iomodule.h" -/* clang-format off */ /*[clinic input] module _io diff --git a/third_party/python/Modules/_io/clinic/_iomodule.inc b/third_party/python/Modules/_io/clinic/_iomodule.inc index ac0fc9558..2db59110a 100644 --- a/third_party/python/Modules/_io/clinic/_iomodule.inc +++ b/third_party/python/Modules/_io/clinic/_iomodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/_io/clinic/bufferedio.inc b/third_party/python/Modules/_io/clinic/bufferedio.inc index 4af7fe87a..901705c89 100644 --- a/third_party/python/Modules/_io/clinic/bufferedio.inc +++ b/third_party/python/Modules/_io/clinic/bufferedio.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/_io/clinic/bytesio.inc b/third_party/python/Modules/_io/clinic/bytesio.inc index 97e302a29..2f4829ccb 100644 --- a/third_party/python/Modules/_io/clinic/bytesio.inc +++ b/third_party/python/Modules/_io/clinic/bytesio.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/_io/clinic/fileio.inc b/third_party/python/Modules/_io/clinic/fileio.inc index 23c2ccf38..e9b09c361 100644 --- a/third_party/python/Modules/_io/clinic/fileio.inc +++ b/third_party/python/Modules/_io/clinic/fileio.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/_io/clinic/iobase.inc b/third_party/python/Modules/_io/clinic/iobase.inc index c175bc9f0..a89d7b899 100644 --- a/third_party/python/Modules/_io/clinic/iobase.inc +++ b/third_party/python/Modules/_io/clinic/iobase.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/_io/clinic/stringio.inc b/third_party/python/Modules/_io/clinic/stringio.inc index 59da33c10..81c705dd2 100644 --- a/third_party/python/Modules/_io/clinic/stringio.inc +++ b/third_party/python/Modules/_io/clinic/stringio.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/_io/clinic/textio.inc b/third_party/python/Modules/_io/clinic/textio.inc index 0bec38da9..b8ed77c67 100644 --- a/third_party/python/Modules/_io/clinic/textio.inc +++ b/third_party/python/Modules/_io/clinic/textio.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/_io/clinic/winconsoleio.inc b/third_party/python/Modules/_io/clinic/winconsoleio.inc index 3f9502675..c2117c908 100644 --- a/third_party/python/Modules/_io/clinic/winconsoleio.inc +++ b/third_party/python/Modules/_io/clinic/winconsoleio.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/_io/fileio.c b/third_party/python/Modules/_io/fileio.c index 741dc5770..ad1f2760f 100644 --- a/third_party/python/Modules/_io/fileio.c +++ b/third_party/python/Modules/_io/fileio.c @@ -24,7 +24,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/warnings.h" #include "third_party/python/Modules/_io/_iomodule.h" -/* clang-format off */ /* * Author: Daniel Stutzbach diff --git a/third_party/python/Modules/_io/iobase.c b/third_party/python/Modules/_io/iobase.c index 84d90ee28..7eb612aca 100644 --- a/third_party/python/Modules/_io/iobase.c +++ b/third_party/python/Modules/_io/iobase.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Modules/_io/_iomodule.h" -/* clang-format off */ /* An implementation of the I/O abstract base classes hierarchy diff --git a/third_party/python/Modules/_io/stringio.c b/third_party/python/Modules/_io/stringio.c index a0b7701eb..7bc01c2ba 100644 --- a/third_party/python/Modules/_io/stringio.c +++ b/third_party/python/Modules/_io/stringio.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Modules/_io/_iomodule.h" -/* clang-format off */ /* Implementation note: the buffer is always at least one character longer than the enclosed string, for proper functioning of _PyIO_find_line_ending. diff --git a/third_party/python/Modules/_io/textio.c b/third_party/python/Modules/_io/textio.c index 469bd38f4..aaab610f8 100644 --- a/third_party/python/Modules/_io/textio.c +++ b/third_party/python/Modules/_io/textio.c @@ -21,7 +21,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Modules/_io/_iomodule.h" -/* clang-format off */ /* An implementation of Text I/O as defined by PEP 3116 - "New I/O" diff --git a/third_party/python/Modules/_io/winconsoleio.c b/third_party/python/Modules/_io/winconsoleio.c index 6e08d18ce..89b34785d 100644 --- a/third_party/python/Modules/_io/winconsoleio.c +++ b/third_party/python/Modules/_io/winconsoleio.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #define PY_SSIZE_T_CLEAN #include "third_party/python/Modules/_io/_iomodule.h" -/* clang-format off */ /* An implementation of Windows console I/O diff --git a/third_party/python/Modules/_json.c b/third_party/python/Modules/_json.c index a02674cb2..d248dadca 100644 --- a/third_party/python/Modules/_json.c +++ b/third_party/python/Modules/_json.c @@ -24,7 +24,6 @@ #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_json"); PYTHON_PROVIDE("_json.encode_basestring"); diff --git a/third_party/python/Modules/_localemodule.c b/third_party/python/Modules/_localemodule.c index bf221877f..6b511bca2 100644 --- a/third_party/python/Modules/_localemodule.c +++ b/third_party/python/Modules/_localemodule.c @@ -20,7 +20,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_locale"); PYTHON_PROVIDE("_locale.CHAR_MAX"); diff --git a/third_party/python/Modules/_lsprof.c b/third_party/python/Modules/_lsprof.c index fb06b8fcf..8e4742fce 100644 --- a/third_party/python/Modules/_lsprof.c +++ b/third_party/python/Modules/_lsprof.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/rotatingtree.h" -/* clang-format off */ PYTHON_PROVIDE("_lsprof"); PYTHON_PROVIDE("_lsprof.Profiler"); diff --git a/third_party/python/Modules/_lzmamodule.c b/third_party/python/Modules/_lzmamodule.c index bb802d6c9..61a915fa3 100644 --- a/third_party/python/Modules/_lzmamodule.c +++ b/third_party/python/Modules/_lzmamodule.c @@ -7,7 +7,6 @@ #define PY_SSIZE_T_CLEAN #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_lzma"); PYTHON_PROVIDE("_lzma.CHECK_CRC32"); diff --git a/third_party/python/Modules/_math.c b/third_party/python/Modules/_math.c index cd99bbe08..27d8dc53f 100644 --- a/third_party/python/Modules/_math.c +++ b/third_party/python/Modules/_math.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/pymath.h" #include "third_party/python/Modules/_math.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ /* Definitions of some C99 math library functions, for those platforms that don't implement these functions already. */ diff --git a/third_party/python/Modules/_math.h b/third_party/python/Modules/_math.h index ea70d54f1..c8505611f 100644 --- a/third_party/python/Modules/_math.h +++ b/third_party/python/Modules/_math.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES__MATH_H_ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES__MATH_H_ #include "third_party/python/pyconfig.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ double _Py_acosh(double); @@ -47,5 +46,4 @@ double _Py_log1p(double); #define m_log1p _Py_log1p COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES__MATH_H_ */ diff --git a/third_party/python/Modules/_multiprocessing/multiprocessing.c b/third_party/python/Modules/_multiprocessing/multiprocessing.c index 80684de66..7e24baa20 100644 --- a/third_party/python/Modules/_multiprocessing/multiprocessing.c +++ b/third_party/python/Modules/_multiprocessing/multiprocessing.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Modules/_multiprocessing/multiprocessing.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_multiprocessing"); PYTHON_PROVIDE("_multiprocessing.flags"); diff --git a/third_party/python/Modules/_multiprocessing/multiprocessing.h b/third_party/python/Modules/_multiprocessing/multiprocessing.h index 5dfedf208..fc644a7b5 100644 --- a/third_party/python/Modules/_multiprocessing/multiprocessing.h +++ b/third_party/python/Modules/_multiprocessing/multiprocessing.h @@ -5,7 +5,6 @@ #include "third_party/python/Include/Python.h" #include "third_party/python/Include/pythread.h" #include "third_party/python/Include/structmember.h" -/* clang-format off */ /* * Platform includes and definitions diff --git a/third_party/python/Modules/_multiprocessing/semaphore.c b/third_party/python/Modules/_multiprocessing/semaphore.c index 3c3d29a2f..e86cb01e3 100644 --- a/third_party/python/Modules/_multiprocessing/semaphore.c +++ b/third_party/python/Modules/_multiprocessing/semaphore.c @@ -7,7 +7,6 @@ #include "libc/thread/semaphore.h" #include "libc/sysv/consts/o.h" #include "third_party/python/Modules/_multiprocessing/multiprocessing.h" -/* clang-format off */ /* * A type which wraps a semaphore diff --git a/third_party/python/Modules/_opcode.c b/third_party/python/Modules/_opcode.c index 6cd56bbc1..6f775bdc5 100644 --- a/third_party/python/Modules/_opcode.c +++ b/third_party/python/Modules/_opcode.c @@ -13,7 +13,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_opcode"); PYTHON_PROVIDE("_opcode.stack_effect"); diff --git a/third_party/python/Modules/_operator.c b/third_party/python/Modules/_operator.c index 24c70be98..20eebb4d4 100644 --- a/third_party/python/Modules/_operator.c +++ b/third_party/python/Modules/_operator.c @@ -15,7 +15,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_operator"); PYTHON_PROVIDE("_operator.__doc__"); diff --git a/third_party/python/Modules/_pickle.c b/third_party/python/Modules/_pickle.c index 930701c33..e4b976734 100644 --- a/third_party/python/Modules/_pickle.c +++ b/third_party/python/Modules/_pickle.c @@ -31,7 +31,6 @@ #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/yoink.h" #include "third_party/quickjs/internal.h" -/* clang-format off */ PYTHON_PROVIDE("_pickle"); PYTHON_PROVIDE("_pickle.PickleError"); diff --git a/third_party/python/Modules/_posixsubprocess.c b/third_party/python/Modules/_posixsubprocess.c index dcab56044..8752cc9b3 100644 --- a/third_party/python/Modules/_posixsubprocess.c +++ b/third_party/python/Modules/_posixsubprocess.c @@ -27,7 +27,6 @@ #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("_posixsubprocess"); PYTHON_PROVIDE("_posixsubprocess.fork_exec"); diff --git a/third_party/python/Modules/_randommodule.c b/third_party/python/Modules/_randommodule.c index 77d0d9d46..5a95175d5 100644 --- a/third_party/python/Modules/_randommodule.c +++ b/third_party/python/Modules/_randommodule.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/intrin/bits.h" #include "libc/nexgen32e/x86feature.h" #include "libc/runtime/runtime.h" #include "libc/stdio/rand.h" @@ -22,7 +21,6 @@ #include "third_party/python/Include/pytime.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_random"); PYTHON_PROVIDE("_random.Random"); diff --git a/third_party/python/Modules/_sqlite/cache.c b/third_party/python/Modules/_sqlite/cache.c index 7e2cb7539..f91f9f7e6 100644 --- a/third_party/python/Modules/_sqlite/cache.c +++ b/third_party/python/Modules/_sqlite/cache.c @@ -29,7 +29,6 @@ asm(".ident\t\"\\n\\n\ pysqlite (zlib license)\\n\ Copyright (C) 2005-2010 Gerhard Häring \""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* only used internally */ pysqlite_Node* pysqlite_new_node(PyObject* key, PyObject* data) diff --git a/third_party/python/Modules/_sqlite/cache.h b/third_party/python/Modules/_sqlite/cache.h index ca0cbe312..a88cfdb5e 100644 --- a/third_party/python/Modules/_sqlite/cache.h +++ b/third_party/python/Modules/_sqlite/cache.h @@ -1,7 +1,6 @@ #ifndef PYSQLITE_CACHE_H #define PYSQLITE_CACHE_H #include "third_party/python/Include/Python.h" -/* clang-format off */ /* The LRU cache is implemented as a combination of a doubly-linked with a * dictionary. The list items are of type 'Node' and the dictionary has the diff --git a/third_party/python/Modules/_sqlite/connection.c b/third_party/python/Modules/_sqlite/connection.c index bc6cde57f..73b70dd0f 100644 --- a/third_party/python/Modules/_sqlite/connection.c +++ b/third_party/python/Modules/_sqlite/connection.c @@ -40,7 +40,6 @@ asm(".ident\t\"\\n\\n\ pysqlite (zlib license)\\n\ Copyright (C) 2005-2010 Gerhard Häring \""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #define ACTION_FINALIZE 1 #define ACTION_RESET 2 diff --git a/third_party/python/Modules/_sqlite/connection.h b/third_party/python/Modules/_sqlite/connection.h index a1d59a5a8..3111956c3 100644 --- a/third_party/python/Modules/_sqlite/connection.h +++ b/third_party/python/Modules/_sqlite/connection.h @@ -6,7 +6,6 @@ #include "third_party/python/Modules/_sqlite/cache.h" #include "third_party/python/Modules/_sqlite/module.h" #include "third_party/sqlite3/sqlite3.h" -/* clang-format off */ typedef struct { diff --git a/third_party/python/Modules/_sqlite/cursor.c b/third_party/python/Modules/_sqlite/cursor.c index 9d65dba69..fa9111ef1 100644 --- a/third_party/python/Modules/_sqlite/cursor.c +++ b/third_party/python/Modules/_sqlite/cursor.c @@ -31,7 +31,6 @@ asm(".ident\t\"\\n\\n\ pysqlite (zlib license)\\n\ Copyright (C) 2005-2010 Gerhard Häring \""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ PyObject* pysqlite_cursor_iternext(pysqlite_Cursor* self); diff --git a/third_party/python/Modules/_sqlite/cursor.h b/third_party/python/Modules/_sqlite/cursor.h index e8e7dcba2..81d0863ab 100644 --- a/third_party/python/Modules/_sqlite/cursor.h +++ b/third_party/python/Modules/_sqlite/cursor.h @@ -1,7 +1,6 @@ #ifndef PYSQLITE_CURSOR_H #define PYSQLITE_CURSOR_H #include "third_party/python/Include/Python.h" -/* clang-format off */ #include "third_party/python/Modules/_sqlite/statement.h" #include "third_party/python/Modules/_sqlite/connection.h" diff --git a/third_party/python/Modules/_sqlite/microprotocols.c b/third_party/python/Modules/_sqlite/microprotocols.c index 53d5fed34..d23aed7b6 100644 --- a/third_party/python/Modules/_sqlite/microprotocols.c +++ b/third_party/python/Modules/_sqlite/microprotocols.c @@ -31,7 +31,6 @@ asm(".ident\t\"\\n\\n\ pysqlite (zlib license)\\n\ Copyright (C) 2005-2010 Gerhard Häring \""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /** the adapters registry **/ diff --git a/third_party/python/Modules/_sqlite/microprotocols.h b/third_party/python/Modules/_sqlite/microprotocols.h index bdb608f68..e6e1c991d 100644 --- a/third_party/python/Modules/_sqlite/microprotocols.h +++ b/third_party/python/Modules/_sqlite/microprotocols.h @@ -2,7 +2,6 @@ #define PSYCOPG_MICROPROTOCOLS_H 1 #include "third_party/python/Include/Python.h" #include "third_party/python/Modules/_sqlite/cursor.h" -/* clang-format off */ /** adapters registry **/ diff --git a/third_party/python/Modules/_sqlite/module.c b/third_party/python/Modules/_sqlite/module.c index 392931eeb..ac489975a 100644 --- a/third_party/python/Modules/_sqlite/module.c +++ b/third_party/python/Modules/_sqlite/module.c @@ -38,7 +38,6 @@ asm(".ident\t\"\\n\\n\ pysqlite (zlib license)\\n\ Copyright (C) 2005-2010 Gerhard Häring \""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* #if SQLITE_VERSION_NUMBER >= 3003003 */ /* #define HAVE_SHARED_CACHE */ diff --git a/third_party/python/Modules/_sqlite/module.h b/third_party/python/Modules/_sqlite/module.h index b1c24f60f..c0d568394 100644 --- a/third_party/python/Modules/_sqlite/module.h +++ b/third_party/python/Modules/_sqlite/module.h @@ -1,7 +1,6 @@ #ifndef PYSQLITE_MODULE_H #define PYSQLITE_MODULE_H #include "third_party/python/Include/Python.h" -/* clang-format off */ #define PYSQLITE_VERSION "2.6.0" diff --git a/third_party/python/Modules/_sqlite/prepare_protocol.c b/third_party/python/Modules/_sqlite/prepare_protocol.c index c476687ee..c791f31a5 100644 --- a/third_party/python/Modules/_sqlite/prepare_protocol.c +++ b/third_party/python/Modules/_sqlite/prepare_protocol.c @@ -29,7 +29,6 @@ asm(".ident\t\"\\n\\n\ pysqlite (zlib license)\\n\ Copyright (C) 2005-2010 Gerhard Häring \""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ int pysqlite_prepare_protocol_init(pysqlite_PrepareProtocol* self, PyObject* args, PyObject* kwargs) { diff --git a/third_party/python/Modules/_sqlite/prepare_protocol.h b/third_party/python/Modules/_sqlite/prepare_protocol.h index 2ea640625..f4d7b87e7 100644 --- a/third_party/python/Modules/_sqlite/prepare_protocol.h +++ b/third_party/python/Modules/_sqlite/prepare_protocol.h @@ -1,7 +1,6 @@ #ifndef PYSQLITE_PREPARE_PROTOCOL_H #define PYSQLITE_PREPARE_PROTOCOL_H #include "third_party/python/Include/Python.h" -/* clang-format off */ typedef struct { diff --git a/third_party/python/Modules/_sqlite/row.c b/third_party/python/Modules/_sqlite/row.c index 34dd2c20c..c72ff1326 100644 --- a/third_party/python/Modules/_sqlite/row.c +++ b/third_party/python/Modules/_sqlite/row.c @@ -30,7 +30,6 @@ asm(".ident\t\"\\n\\n\ pysqlite (zlib license)\\n\ Copyright (C) 2005-2010 Gerhard Häring \""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ void pysqlite_row_dealloc(pysqlite_Row* self) { diff --git a/third_party/python/Modules/_sqlite/row.h b/third_party/python/Modules/_sqlite/row.h index 95f08859a..9e5e85c7b 100644 --- a/third_party/python/Modules/_sqlite/row.h +++ b/third_party/python/Modules/_sqlite/row.h @@ -1,7 +1,6 @@ #ifndef PYSQLITE_ROW_H #define PYSQLITE_ROW_H #include "third_party/python/Include/Python.h" -/* clang-format off */ typedef struct _Row { diff --git a/third_party/python/Modules/_sqlite/statement.c b/third_party/python/Modules/_sqlite/statement.c index 3ae741672..b96df2545 100644 --- a/third_party/python/Modules/_sqlite/statement.c +++ b/third_party/python/Modules/_sqlite/statement.c @@ -34,7 +34,6 @@ asm(".ident\t\"\\n\\n\ pysqlite (zlib license)\\n\ Copyright (C) 2005-2010 Gerhard Häring \""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* prototypes */ static int pysqlite_check_remaining_sql(const char* tail); diff --git a/third_party/python/Modules/_sqlite/statement.h b/third_party/python/Modules/_sqlite/statement.h index dc6adf82e..2e96eb648 100644 --- a/third_party/python/Modules/_sqlite/statement.h +++ b/third_party/python/Modules/_sqlite/statement.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/Python.h" #include "third_party/python/Modules/_sqlite/connection.h" #include "third_party/sqlite3/sqlite3.h" -/* clang-format off */ #define PYSQLITE_TOO_MUCH_SQL (-100) #define PYSQLITE_SQL_WRONG_TYPE (-101) diff --git a/third_party/python/Modules/_sqlite/util.c b/third_party/python/Modules/_sqlite/util.c index 8b8b44b25..42abb1645 100644 --- a/third_party/python/Modules/_sqlite/util.c +++ b/third_party/python/Modules/_sqlite/util.c @@ -30,7 +30,6 @@ asm(".ident\t\"\\n\\n\ pysqlite (zlib license)\\n\ Copyright (C) 2005-2010 Gerhard Häring \""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection) { diff --git a/third_party/python/Modules/_sqlite/util.h b/third_party/python/Modules/_sqlite/util.h index e301fb68c..ef8c26f6f 100644 --- a/third_party/python/Modules/_sqlite/util.h +++ b/third_party/python/Modules/_sqlite/util.h @@ -1,6 +1,5 @@ #ifndef PYSQLITE_UTIL_H #define PYSQLITE_UTIL_H -/* clang-format off */ #include "third_party/python/Include/Python.h" #include "third_party/python/Include/pythread.h" #include "third_party/python/Modules/_sqlite/connection.h" diff --git a/third_party/python/Modules/_sre.c b/third_party/python/Modules/_sre.c index 4fab3b5c7..e4d6c9e7e 100644 --- a/third_party/python/Modules/_sre.c +++ b/third_party/python/Modules/_sre.c @@ -24,7 +24,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/sre.h" #include "third_party/python/Modules/sre_constants.h" -/* clang-format off */ PYTHON_PROVIDE("_sre"); PYTHON_PROVIDE("_sre.CODESIZE"); @@ -44,7 +43,6 @@ asm(".ident\t\"\\n\\n\ SRE 2.2.2 (Python license)\\n\ Copyright 1997-2002 Secret Labs AB\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* * Secret Labs' Regular Expression Engine diff --git a/third_party/python/Modules/_stat.c b/third_party/python/Modules/_stat.c index 11b10b135..9c6d4d62f 100644 --- a/third_party/python/Modules/_stat.c +++ b/third_party/python/Modules/_stat.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_stat"); PYTHON_PROVIDE("_stat.SF_APPEND"); diff --git a/third_party/python/Modules/_struct.c b/third_party/python/Modules/_struct.c index f5723128c..eb2fd8eeb 100644 --- a/third_party/python/Modules/_struct.c +++ b/third_party/python/Modules/_struct.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_struct"); PYTHON_PROVIDE("_struct.Struct"); diff --git a/third_party/python/Modules/_testbuffer.c b/third_party/python/Modules/_testbuffer.c index 9e8f84013..b6e629fcf 100644 --- a/third_party/python/Modules/_testbuffer.c +++ b/third_party/python/Modules/_testbuffer.c @@ -20,7 +20,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/sliceobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_testbuffer"); PYTHON_PROVIDE("_testbuffer.ND_FORTRAN"); diff --git a/third_party/python/Modules/_testcapimodule.c b/third_party/python/Modules/_testcapimodule.c index f1ae03586..90ba3d55d 100644 --- a/third_party/python/Modules/_testcapimodule.c +++ b/third_party/python/Modules/_testcapimodule.c @@ -44,7 +44,6 @@ #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("_testcapi"); PYTHON_PROVIDE("_testcapi.CHAR_MAX"); diff --git a/third_party/python/Modules/_testmultiphase.c b/third_party/python/Modules/_testmultiphase.c index 874d2f79e..6026d209d 100644 --- a/third_party/python/Modules/_testmultiphase.c +++ b/third_party/python/Modules/_testmultiphase.c @@ -14,7 +14,6 @@ #include "third_party/python/Include/pystate.h" #include "third_party/python/Include/typeslots.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_testmultiphase"); PYTHON_PROVIDE("_testmultiphase.Example"); diff --git a/third_party/python/Modules/_threadmodule.c b/third_party/python/Modules/_threadmodule.c index e2d7bee6f..a3dca1d1b 100644 --- a/third_party/python/Modules/_threadmodule.c +++ b/third_party/python/Modules/_threadmodule.c @@ -89,7 +89,6 @@ #include "third_party/python/Include/weakrefobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("_thread"); PYTHON_PROVIDE("_thread.LockType"); diff --git a/third_party/python/Modules/_tracemalloc.c b/third_party/python/Modules/_tracemalloc.c index e3023b83b..64c6db731 100644 --- a/third_party/python/Modules/_tracemalloc.c +++ b/third_party/python/Modules/_tracemalloc.c @@ -29,7 +29,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/hashtable.h" -/* clang-format off */ PYTHON_PROVIDE("_tracemalloc"); PYTHON_PROVIDE("_tracemalloc._get_object_traceback"); diff --git a/third_party/python/Modules/_weakref.c b/third_party/python/Modules/_weakref.c index b355ac53a..6d8d3cb15 100644 --- a/third_party/python/Modules/_weakref.c +++ b/third_party/python/Modules/_weakref.c @@ -14,7 +14,6 @@ #include "third_party/python/Include/weakrefobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/clinic/_weakref.inc" -/* clang-format off */ PYTHON_PROVIDE("_weakref"); PYTHON_PROVIDE("_weakref.CallableProxyType"); diff --git a/third_party/python/Modules/_winapi.c b/third_party/python/Modules/_winapi.c index 0f3018a94..2194a0681 100644 --- a/third_party/python/Modules/_winapi.c +++ b/third_party/python/Modules/_winapi.c @@ -29,7 +29,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/winreparse.h" -/* clang-format off */ #define kNtIoReparseTagMountPoint 0xA0000003L diff --git a/third_party/python/Modules/arraymodule.c b/third_party/python/Modules/arraymodule.c index 0683d98d5..336a6d36d 100644 --- a/third_party/python/Modules/arraymodule.c +++ b/third_party/python/Modules/arraymodule.c @@ -22,7 +22,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("array"); PYTHON_PROVIDE("array.ArrayType"); diff --git a/third_party/python/Modules/atexitmodule.c b/third_party/python/Modules/atexitmodule.c index b4cf01243..e322a3dd5 100644 --- a/third_party/python/Modules/atexitmodule.c +++ b/third_party/python/Modules/atexitmodule.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/pystate.h" #include "third_party/python/Include/pythonrun.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("atexit"); PYTHON_PROVIDE("atexit._clear"); diff --git a/third_party/python/Modules/audioop.c b/third_party/python/Modules/audioop.c index c8f0fca9b..c650699e2 100644 --- a/third_party/python/Modules/audioop.c +++ b/third_party/python/Modules/audioop.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("audioop"); PYTHON_PROVIDE("audioop.add"); diff --git a/third_party/python/Modules/bextra.h b/third_party/python/Modules/bextra.h index decc57be5..31e46e07c 100644 --- a/third_party/python/Modules/bextra.h +++ b/third_party/python/Modules/bextra.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_BEXTRA_H_ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_BEXTRA_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ unsigned BitFieldExtract(const unsigned *, size_t, char); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_BEXTRA_H_ */ diff --git a/third_party/python/Modules/binascii.c b/third_party/python/Modules/binascii.c index 0060ed127..e9fd1a567 100644 --- a/third_party/python/Modules/binascii.c +++ b/third_party/python/Modules/binascii.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/zlib/zlib.h" -/* clang-format off */ PYTHON_PROVIDE("binascii"); PYTHON_PROVIDE("binascii.Error"); diff --git a/third_party/python/Modules/cjkcodecs/__big5_decmap.c b/third_party/python/Modules/cjkcodecs/__big5_decmap.c index 7d95bfb05..eb054abde 100644 --- a/third_party/python/Modules/cjkcodecs/__big5_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__big5_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __big5_decmap_ptr; static const unsigned char __big5_decmap_rodata[14386] = { diff --git a/third_party/python/Modules/cjkcodecs/__big5_encmap.c b/third_party/python/Modules/cjkcodecs/__big5_encmap.c index 475ac1c2a..8c40a75ee 100644 --- a/third_party/python/Modules/cjkcodecs/__big5_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__big5_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __big5_encmap_ptr; static const unsigned char __big5_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__big5hkscs_bmp_encmap.c b/third_party/python/Modules/cjkcodecs/__big5hkscs_bmp_encmap.c index 4dfa698db..f22e5a2ed 100644 --- a/third_party/python/Modules/cjkcodecs/__big5hkscs_bmp_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__big5hkscs_bmp_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __big5hkscs_bmp_encmap_ptr; static const unsigned char __big5hkscs_bmp_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__big5hkscs_decmap.c b/third_party/python/Modules/cjkcodecs/__big5hkscs_decmap.c index 0b7266531..aca9d4d41 100644 --- a/third_party/python/Modules/cjkcodecs/__big5hkscs_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__big5hkscs_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __big5hkscs_decmap_ptr; static const unsigned char __big5hkscs_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__big5hkscs_nonbmp_encmap.c b/third_party/python/Modules/cjkcodecs/__big5hkscs_nonbmp_encmap.c index b86b97a23..14481dfb3 100644 --- a/third_party/python/Modules/cjkcodecs/__big5hkscs_nonbmp_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__big5hkscs_nonbmp_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __big5hkscs_nonbmp_encmap_ptr; static const unsigned char __big5hkscs_nonbmp_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__cp932ext_decmap.c b/third_party/python/Modules/cjkcodecs/__cp932ext_decmap.c index 5277cf29f..af1fc4cf7 100644 --- a/third_party/python/Modules/cjkcodecs/__cp932ext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__cp932ext_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __cp932ext_decmap_ptr; static const unsigned char __cp932ext_decmap_rodata[872] = { diff --git a/third_party/python/Modules/cjkcodecs/__cp932ext_encmap.c b/third_party/python/Modules/cjkcodecs/__cp932ext_encmap.c index 87fb354c7..42e7de4f9 100644 --- a/third_party/python/Modules/cjkcodecs/__cp932ext_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__cp932ext_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __cp932ext_encmap_ptr; static const unsigned char __cp932ext_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__cp949_encmap.c b/third_party/python/Modules/cjkcodecs/__cp949_encmap.c index 1c5aca0f7..5bec72ec4 100644 --- a/third_party/python/Modules/cjkcodecs/__cp949_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__cp949_encmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __cp949_encmap_ptr; static const unsigned char __cp949_encmap_rodata[29600] = { diff --git a/third_party/python/Modules/cjkcodecs/__cp949ext_decmap.c b/third_party/python/Modules/cjkcodecs/__cp949ext_decmap.c index 9736b3a42..58f956d2e 100644 --- a/third_party/python/Modules/cjkcodecs/__cp949ext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__cp949ext_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __cp949ext_decmap_ptr; static const unsigned char __cp949ext_decmap_rodata[1970] = { diff --git a/third_party/python/Modules/cjkcodecs/__cp950ext_decmap.c b/third_party/python/Modules/cjkcodecs/__cp950ext_decmap.c index 0856106ce..d673c3940 100644 --- a/third_party/python/Modules/cjkcodecs/__cp950ext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__cp950ext_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __cp950ext_decmap_ptr; static const unsigned char __cp950ext_decmap_rodata[92] = { diff --git a/third_party/python/Modules/cjkcodecs/__cp950ext_encmap.c b/third_party/python/Modules/cjkcodecs/__cp950ext_encmap.c index 773464962..83d2ddb87 100644 --- a/third_party/python/Modules/cjkcodecs/__cp950ext_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__cp950ext_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __cp950ext_encmap_ptr; static const unsigned char __cp950ext_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__gb18030ext_decmap.c b/third_party/python/Modules/cjkcodecs/__gb18030ext_decmap.c index d68c33e52..1a6bc2a95 100644 --- a/third_party/python/Modules/cjkcodecs/__gb18030ext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__gb18030ext_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __gb18030ext_decmap_ptr; static const unsigned char __gb18030ext_decmap_rodata[405] = { diff --git a/third_party/python/Modules/cjkcodecs/__gb18030ext_encmap.c b/third_party/python/Modules/cjkcodecs/__gb18030ext_encmap.c index 16fbefe2a..59d54f8d1 100644 --- a/third_party/python/Modules/cjkcodecs/__gb18030ext_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__gb18030ext_encmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __gb18030ext_encmap_ptr; static const unsigned char __gb18030ext_encmap_rodata[400] = { diff --git a/third_party/python/Modules/cjkcodecs/__gb2312_decmap.c b/third_party/python/Modules/cjkcodecs/__gb2312_decmap.c index f1c87b138..a83b7e6e2 100644 --- a/third_party/python/Modules/cjkcodecs/__gb2312_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__gb2312_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __gb2312_decmap_ptr; static const unsigned char __gb2312_decmap_rodata[11651] = { diff --git a/third_party/python/Modules/cjkcodecs/__gbcommon_encmap.c b/third_party/python/Modules/cjkcodecs/__gbcommon_encmap.c index 9340d9b96..a735c0d27 100644 --- a/third_party/python/Modules/cjkcodecs/__gbcommon_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__gbcommon_encmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __gbcommon_encmap_ptr; static const unsigned char __gbcommon_encmap_rodata[26264] = { diff --git a/third_party/python/Modules/cjkcodecs/__gbkext_decmap.c b/third_party/python/Modules/cjkcodecs/__gbkext_decmap.c index 7c5042258..ccbf1cfbf 100644 --- a/third_party/python/Modules/cjkcodecs/__gbkext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__gbkext_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __gbkext_decmap_ptr; static const unsigned char __gbkext_decmap_rodata[3936] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisx0208_decmap.c b/third_party/python/Modules/cjkcodecs/__jisx0208_decmap.c index 7ca761283..543eca47d 100644 --- a/third_party/python/Modules/cjkcodecs/__jisx0208_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisx0208_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __jisx0208_decmap_ptr; static const unsigned char __jisx0208_decmap_rodata[9445] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisx0212_decmap.c b/third_party/python/Modules/cjkcodecs/__jisx0212_decmap.c index 5af83f027..1fbe6d40e 100644 --- a/third_party/python/Modules/cjkcodecs/__jisx0212_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisx0212_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __jisx0212_decmap_ptr; static const unsigned char __jisx0212_decmap_rodata[3327] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisx0213_1_bmp_decmap.c b/third_party/python/Modules/cjkcodecs/__jisx0213_1_bmp_decmap.c index fe62ff18a..79b1b64af 100644 --- a/third_party/python/Modules/cjkcodecs/__jisx0213_1_bmp_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisx0213_1_bmp_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __jisx0213_1_bmp_decmap_ptr; static const unsigned char __jisx0213_1_bmp_decmap_rodata[2205] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisx0213_1_emp_decmap.c b/third_party/python/Modules/cjkcodecs/__jisx0213_1_emp_decmap.c index e880e1777..7a6dd9193 100644 --- a/third_party/python/Modules/cjkcodecs/__jisx0213_1_emp_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisx0213_1_emp_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __jisx0213_1_emp_decmap_ptr; static const unsigned char __jisx0213_1_emp_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisx0213_2_bmp_decmap.c b/third_party/python/Modules/cjkcodecs/__jisx0213_2_bmp_decmap.c index cf94cd71e..c42d55532 100644 --- a/third_party/python/Modules/cjkcodecs/__jisx0213_2_bmp_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisx0213_2_bmp_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __jisx0213_2_bmp_decmap_ptr; static const unsigned char __jisx0213_2_bmp_decmap_rodata[3265] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisx0213_2_emp_decmap.c b/third_party/python/Modules/cjkcodecs/__jisx0213_2_emp_decmap.c index a3fb827c8..bdbef42c1 100644 --- a/third_party/python/Modules/cjkcodecs/__jisx0213_2_emp_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisx0213_2_emp_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __jisx0213_2_emp_decmap_ptr; static const unsigned char __jisx0213_2_emp_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisx0213_bmp_encmap.c b/third_party/python/Modules/cjkcodecs/__jisx0213_bmp_encmap.c index 4476c23eb..e6f2a75f9 100644 --- a/third_party/python/Modules/cjkcodecs/__jisx0213_bmp_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisx0213_bmp_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __jisx0213_bmp_encmap_ptr; static const unsigned char __jisx0213_bmp_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisx0213_emp_encmap.c b/third_party/python/Modules/cjkcodecs/__jisx0213_emp_encmap.c index 484e4c071..e466418f8 100644 --- a/third_party/python/Modules/cjkcodecs/__jisx0213_emp_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisx0213_emp_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __jisx0213_emp_encmap_ptr; static const unsigned char __jisx0213_emp_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisx0213_pair_decmap.c b/third_party/python/Modules/cjkcodecs/__jisx0213_pair_decmap.c index b0e6028c8..1393b38c3 100644 --- a/third_party/python/Modules/cjkcodecs/__jisx0213_pair_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisx0213_pair_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __jisx0213_pair_decmap_ptr; static const unsigned char __jisx0213_pair_decmap_rodata[71] = { diff --git a/third_party/python/Modules/cjkcodecs/__jisxcommon_encmap.c b/third_party/python/Modules/cjkcodecs/__jisxcommon_encmap.c index e0894b05e..91c8d6045 100644 --- a/third_party/python/Modules/cjkcodecs/__jisxcommon_encmap.c +++ b/third_party/python/Modules/cjkcodecs/__jisxcommon_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) __jisxcommon_encmap_ptr; static const unsigned char __jisxcommon_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/__ksx1001_decmap.c b/third_party/python/Modules/cjkcodecs/__ksx1001_decmap.c index 20cfe276a..a123545a2 100644 --- a/third_party/python/Modules/cjkcodecs/__ksx1001_decmap.c +++ b/third_party/python/Modules/cjkcodecs/__ksx1001_decmap.c @@ -1,6 +1,5 @@ #include "libc/x/x.h" #include "third_party/python/Modules/cjkcodecs/xloadzd.h" -/* clang-format off */ static _Atomic(void *) __ksx1001_decmap_ptr; static const unsigned char __ksx1001_decmap_rodata[10685] = { diff --git a/third_party/python/Modules/cjkcodecs/_codecs_cn.c b/third_party/python/Modules/cjkcodecs/_codecs_cn.c index d1e519f41..3da8e9fc2 100644 --- a/third_party/python/Modules/cjkcodecs/_codecs_cn.c +++ b/third_party/python/Modules/cjkcodecs/_codecs_cn.c @@ -7,7 +7,6 @@ #include "third_party/python/Include/import.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/cjkcodecs/cjkcodecs.h" -/* clang-format off */ PYTHON_PROVIDE("_codecs_cn"); PYTHON_PROVIDE("_codecs_cn.__map_gb18030ext"); diff --git a/third_party/python/Modules/cjkcodecs/_codecs_hk.c b/third_party/python/Modules/cjkcodecs/_codecs_hk.c index 7259a5d6a..2134a9998 100644 --- a/third_party/python/Modules/cjkcodecs/_codecs_hk.c +++ b/third_party/python/Modules/cjkcodecs/_codecs_hk.c @@ -9,7 +9,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/cjkcodecs/cjkcodecs.h" #include "third_party/python/Modules/cjkcodecs/somanyencodings.h" -/* clang-format off */ PYTHON_PROVIDE("_codecs_hk"); PYTHON_PROVIDE("_codecs_hk.__map_big5hkscs"); diff --git a/third_party/python/Modules/cjkcodecs/_codecs_iso2022.c b/third_party/python/Modules/cjkcodecs/_codecs_iso2022.c index b629522a3..7eaa92d9d 100644 --- a/third_party/python/Modules/cjkcodecs/_codecs_iso2022.c +++ b/third_party/python/Modules/cjkcodecs/_codecs_iso2022.c @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* * _codecs_iso2022.c: Codecs collection for ISO-2022 encodings. diff --git a/third_party/python/Modules/cjkcodecs/_codecs_jp.c b/third_party/python/Modules/cjkcodecs/_codecs_jp.c index 1d99cfb95..edae72a56 100644 --- a/third_party/python/Modules/cjkcodecs/_codecs_jp.c +++ b/third_party/python/Modules/cjkcodecs/_codecs_jp.c @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* * _codecs_jp.c: Codecs collection for Japanese encodings * diff --git a/third_party/python/Modules/cjkcodecs/_codecs_kr.c b/third_party/python/Modules/cjkcodecs/_codecs_kr.c index 32f095625..19c329222 100644 --- a/third_party/python/Modules/cjkcodecs/_codecs_kr.c +++ b/third_party/python/Modules/cjkcodecs/_codecs_kr.c @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* * _codecs_kr.c: Codecs collection for Korean encodings diff --git a/third_party/python/Modules/cjkcodecs/_codecs_tw.c b/third_party/python/Modules/cjkcodecs/_codecs_tw.c index 827fdc0b1..4685167d2 100644 --- a/third_party/python/Modules/cjkcodecs/_codecs_tw.c +++ b/third_party/python/Modules/cjkcodecs/_codecs_tw.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* * _codecs_tw.c: Codecs collection for Taiwan's encodings * diff --git a/third_party/python/Modules/cjkcodecs/alg_jisx0201.inc b/third_party/python/Modules/cjkcodecs/alg_jisx0201.inc index 74cd12cba..2f37b49c2 100644 --- a/third_party/python/Modules/cjkcodecs/alg_jisx0201.inc +++ b/third_party/python/Modules/cjkcodecs/alg_jisx0201.inc @@ -1,4 +1,3 @@ -/* clang-format off */ #define JISX0201_R_ENCODE(c, assi) \ if ((c) < 0x80 && (c) != 0x5c && (c) != 0x7e) { \ diff --git a/third_party/python/Modules/cjkcodecs/big5_decmap.c b/third_party/python/Modules/cjkcodecs/big5_decmap.c index 53516f968..94ab3b374 100644 --- a/third_party/python/Modules/cjkcodecs/big5_decmap.c +++ b/third_party/python/Modules/cjkcodecs/big5_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) big5_decmap_ptr; static const unsigned char big5_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/big5_encmap.c b/third_party/python/Modules/cjkcodecs/big5_encmap.c index 8a94e6c91..4147f9af4 100644 --- a/third_party/python/Modules/cjkcodecs/big5_encmap.c +++ b/third_party/python/Modules/cjkcodecs/big5_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) big5_encmap_ptr; static const unsigned char big5_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/big5hkscs_bmp_encmap.c b/third_party/python/Modules/cjkcodecs/big5hkscs_bmp_encmap.c index c7a5ec684..d6c6e66f9 100644 --- a/third_party/python/Modules/cjkcodecs/big5hkscs_bmp_encmap.c +++ b/third_party/python/Modules/cjkcodecs/big5hkscs_bmp_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) big5hkscs_bmp_encmap_ptr; static const unsigned char big5hkscs_bmp_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/big5hkscs_decmap.c b/third_party/python/Modules/cjkcodecs/big5hkscs_decmap.c index 22e74834a..1ea4dbc14 100644 --- a/third_party/python/Modules/cjkcodecs/big5hkscs_decmap.c +++ b/third_party/python/Modules/cjkcodecs/big5hkscs_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) big5hkscs_decmap_ptr; static const unsigned char big5hkscs_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/big5hkscs_nonbmp_encmap.c b/third_party/python/Modules/cjkcodecs/big5hkscs_nonbmp_encmap.c index fc799af45..bb4a701b2 100644 --- a/third_party/python/Modules/cjkcodecs/big5hkscs_nonbmp_encmap.c +++ b/third_party/python/Modules/cjkcodecs/big5hkscs_nonbmp_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) big5hkscs_nonbmp_encmap_ptr; static const unsigned char big5hkscs_nonbmp_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/cjkcodecs.h b/third_party/python/Modules/cjkcodecs/cjkcodecs.h index d0a3f6ae3..0d6799da8 100644 --- a/third_party/python/Modules/cjkcodecs/cjkcodecs.h +++ b/third_party/python/Modules/cjkcodecs/cjkcodecs.h @@ -10,7 +10,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Modules/cjkcodecs/multibytecodec.h" #include "third_party/python/Modules/cjkcodecs/somanyencodings.h" -/* clang-format off */ /* a unicode "undefined" code point */ #define UNIINV 0xFFFE diff --git a/third_party/python/Modules/cjkcodecs/clinic/multibytecodec.inc b/third_party/python/Modules/cjkcodecs/clinic/multibytecodec.inc index 16956ad73..d0810adf6 100644 --- a/third_party/python/Modules/cjkcodecs/clinic/multibytecodec.inc +++ b/third_party/python/Modules/cjkcodecs/clinic/multibytecodec.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/cjkcodecs/cp932ext_decmap.c b/third_party/python/Modules/cjkcodecs/cp932ext_decmap.c index 971012862..2481fb325 100644 --- a/third_party/python/Modules/cjkcodecs/cp932ext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/cp932ext_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) cp932ext_decmap_ptr; static const unsigned char cp932ext_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/cp932ext_encmap.c b/third_party/python/Modules/cjkcodecs/cp932ext_encmap.c index 64d081850..cb9dc0b78 100644 --- a/third_party/python/Modules/cjkcodecs/cp932ext_encmap.c +++ b/third_party/python/Modules/cjkcodecs/cp932ext_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) cp932ext_encmap_ptr; static const unsigned char cp932ext_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/cp949_encmap.c b/third_party/python/Modules/cjkcodecs/cp949_encmap.c index 9249d047d..70ff16288 100644 --- a/third_party/python/Modules/cjkcodecs/cp949_encmap.c +++ b/third_party/python/Modules/cjkcodecs/cp949_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) cp949_encmap_ptr; static const unsigned char cp949_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/cp949ext_decmap.c b/third_party/python/Modules/cjkcodecs/cp949ext_decmap.c index a1ed8b655..9cc4b3b90 100644 --- a/third_party/python/Modules/cjkcodecs/cp949ext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/cp949ext_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) cp949ext_decmap_ptr; static const unsigned char cp949ext_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/cp950ext_decmap.c b/third_party/python/Modules/cjkcodecs/cp950ext_decmap.c index d7e2d7902..fc7edf5a7 100644 --- a/third_party/python/Modules/cjkcodecs/cp950ext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/cp950ext_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) cp950ext_decmap_ptr; static const unsigned char cp950ext_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/cp950ext_encmap.c b/third_party/python/Modules/cjkcodecs/cp950ext_encmap.c index 5aaef0de3..112b25e2f 100644 --- a/third_party/python/Modules/cjkcodecs/cp950ext_encmap.c +++ b/third_party/python/Modules/cjkcodecs/cp950ext_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) cp950ext_encmap_ptr; static const unsigned char cp950ext_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/emu_jisx0213_2000.inc b/third_party/python/Modules/cjkcodecs/emu_jisx0213_2000.inc index d57fc9a8f..77466a740 100644 --- a/third_party/python/Modules/cjkcodecs/emu_jisx0213_2000.inc +++ b/third_party/python/Modules/cjkcodecs/emu_jisx0213_2000.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* These routines may be quite inefficient, but it's used only to emulate old * standards. */ diff --git a/third_party/python/Modules/cjkcodecs/gb18030ext_decmap.c b/third_party/python/Modules/cjkcodecs/gb18030ext_decmap.c index eabc6d655..eb66fe348 100644 --- a/third_party/python/Modules/cjkcodecs/gb18030ext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/gb18030ext_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) gb18030ext_decmap_ptr; static const unsigned char gb18030ext_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/gb18030ext_encmap.c b/third_party/python/Modules/cjkcodecs/gb18030ext_encmap.c index f9fa151a0..0a42b4104 100644 --- a/third_party/python/Modules/cjkcodecs/gb18030ext_encmap.c +++ b/third_party/python/Modules/cjkcodecs/gb18030ext_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) gb18030ext_encmap_ptr; static const unsigned char gb18030ext_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/gb2312_decmap.c b/third_party/python/Modules/cjkcodecs/gb2312_decmap.c index 34174241c..b27a647b4 100644 --- a/third_party/python/Modules/cjkcodecs/gb2312_decmap.c +++ b/third_party/python/Modules/cjkcodecs/gb2312_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) gb2312_decmap_ptr; static const unsigned char gb2312_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/gbcommon_encmap.c b/third_party/python/Modules/cjkcodecs/gbcommon_encmap.c index add2899c8..663e32b17 100644 --- a/third_party/python/Modules/cjkcodecs/gbcommon_encmap.c +++ b/third_party/python/Modules/cjkcodecs/gbcommon_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) gbcommon_encmap_ptr; static const unsigned char gbcommon_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/gbkext_decmap.c b/third_party/python/Modules/cjkcodecs/gbkext_decmap.c index 0d9077a44..4a9d70c48 100644 --- a/third_party/python/Modules/cjkcodecs/gbkext_decmap.c +++ b/third_party/python/Modules/cjkcodecs/gbkext_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) gbkext_decmap_ptr; static const unsigned char gbkext_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0208_decmap.c b/third_party/python/Modules/cjkcodecs/jisx0208_decmap.c index 09b057b2c..5154c7285 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0208_decmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0208_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0208_decmap_ptr; static const unsigned char jisx0208_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0212_decmap.c b/third_party/python/Modules/cjkcodecs/jisx0212_decmap.c index 3b58ede99..74354aa4b 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0212_decmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0212_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0212_decmap_ptr; static const unsigned char jisx0212_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0213_1_bmp_decmap.c b/third_party/python/Modules/cjkcodecs/jisx0213_1_bmp_decmap.c index b39a29e61..96d006df5 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0213_1_bmp_decmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0213_1_bmp_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0213_1_bmp_decmap_ptr; static const unsigned char jisx0213_1_bmp_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0213_1_emp_decmap.c b/third_party/python/Modules/cjkcodecs/jisx0213_1_emp_decmap.c index 1c909fcde..cc1f7b619 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0213_1_emp_decmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0213_1_emp_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0213_1_emp_decmap_ptr; static const unsigned char jisx0213_1_emp_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0213_2_bmp_decmap.c b/third_party/python/Modules/cjkcodecs/jisx0213_2_bmp_decmap.c index d60b18e60..af8f1d85f 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0213_2_bmp_decmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0213_2_bmp_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0213_2_bmp_decmap_ptr; static const unsigned char jisx0213_2_bmp_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0213_2_emp_decmap.c b/third_party/python/Modules/cjkcodecs/jisx0213_2_emp_decmap.c index 6afe0a7f0..b07e10e3d 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0213_2_emp_decmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0213_2_emp_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0213_2_emp_decmap_ptr; static const unsigned char jisx0213_2_emp_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0213_bmp_encmap.c b/third_party/python/Modules/cjkcodecs/jisx0213_bmp_encmap.c index d34cf2778..d3a758b56 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0213_bmp_encmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0213_bmp_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0213_bmp_encmap_ptr; static const unsigned char jisx0213_bmp_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0213_emp_encmap.c b/third_party/python/Modules/cjkcodecs/jisx0213_emp_encmap.c index 6550d3154..c67155d93 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0213_emp_encmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0213_emp_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0213_emp_encmap_ptr; static const unsigned char jisx0213_emp_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0213_pair_decmap.c b/third_party/python/Modules/cjkcodecs/jisx0213_pair_decmap.c index a7b2207e6..1cea189c3 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0213_pair_decmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0213_pair_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0213_pair_decmap_ptr; static const unsigned char jisx0213_pair_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisx0213_pair_encmap.c b/third_party/python/Modules/cjkcodecs/jisx0213_pair_encmap.c index 7b83c5578..234ab8091 100644 --- a/third_party/python/Modules/cjkcodecs/jisx0213_pair_encmap.c +++ b/third_party/python/Modules/cjkcodecs/jisx0213_pair_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisx0213_pair_encmap_ptr; static const unsigned char jisx0213_pair_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/jisxcommon_encmap.c b/third_party/python/Modules/cjkcodecs/jisxcommon_encmap.c index 575923f4f..24d03ad00 100644 --- a/third_party/python/Modules/cjkcodecs/jisxcommon_encmap.c +++ b/third_party/python/Modules/cjkcodecs/jisxcommon_encmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) jisxcommon_encmap_ptr; static const unsigned char jisxcommon_encmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/ksx1001_decmap.c b/third_party/python/Modules/cjkcodecs/ksx1001_decmap.c index 028269aab..7f6a7bd72 100644 --- a/third_party/python/Modules/cjkcodecs/ksx1001_decmap.c +++ b/third_party/python/Modules/cjkcodecs/ksx1001_decmap.c @@ -1,5 +1,4 @@ #include "libc/x/x.h" -/* clang-format off */ static _Atomic(void *) ksx1001_decmap_ptr; static const unsigned char ksx1001_decmap_rodata[] = { diff --git a/third_party/python/Modules/cjkcodecs/multibytecodec.c b/third_party/python/Modules/cjkcodecs/multibytecodec.c index 10f1b9867..00b5565a0 100644 --- a/third_party/python/Modules/cjkcodecs/multibytecodec.c +++ b/third_party/python/Modules/cjkcodecs/multibytecodec.c @@ -20,7 +20,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_multibytecodec"); PYTHON_PROVIDE("_multibytecodec.MultibyteIncrementalDecoder"); diff --git a/third_party/python/Modules/cjkcodecs/multibytecodec.h b/third_party/python/Modules/cjkcodecs/multibytecodec.h index dc9d04d25..3846db908 100644 --- a/third_party/python/Modules/cjkcodecs/multibytecodec.h +++ b/third_party/python/Modules/cjkcodecs/multibytecodec.h @@ -2,7 +2,6 @@ #define _PYTHON_MULTIBYTECODEC_H_ #include "third_party/python/Include/unicodeobject.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* * multibytecodec.h: Common Multibyte Codec Implementation diff --git a/third_party/python/Modules/cjkcodecs/somanyencodings.h b/third_party/python/Modules/cjkcodecs/somanyencodings.h index d860f0f79..48694a8f1 100644 --- a/third_party/python/Modules/cjkcodecs/somanyencodings.h +++ b/third_party/python/Modules/cjkcodecs/somanyencodings.h @@ -3,7 +3,6 @@ #define JISX0213_ENCPAIRS 46 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct CjkIndex { @@ -79,5 +78,4 @@ const uint16_t *__ksx1001_decmap(void) pureconst; const uint32_t *__jisx0213_pair_decmap(void) pureconst; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /*COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_SOMANYENCODINGS_H_*/ diff --git a/third_party/python/Modules/cjkcodecs/xloadzd.h b/third_party/python/Modules/cjkcodecs/xloadzd.h index 333382094..a0ccdea4c 100644 --- a/third_party/python/Modules/cjkcodecs/xloadzd.h +++ b/third_party/python/Modules/cjkcodecs/xloadzd.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_XLOADZD_H_ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_XLOADZD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *xloadzd(_Atomic(void *) *, const void *, size_t, size_t, size_t, size_t, uint32_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_XLOADZD_H_ */ diff --git a/third_party/python/Modules/clinic/_asynciomodule.inc b/third_party/python/Modules/clinic/_asynciomodule.inc index 0d5d25f56..7627849bb 100644 --- a/third_party/python/Modules/clinic/_asynciomodule.inc +++ b/third_party/python/Modules/clinic/_asynciomodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_bz2module.inc b/third_party/python/Modules/clinic/_bz2module.inc index 954e7b4b0..4ebdf7f53 100644 --- a/third_party/python/Modules/clinic/_bz2module.inc +++ b/third_party/python/Modules/clinic/_bz2module.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_codecsmodule.inc b/third_party/python/Modules/clinic/_codecsmodule.inc index eeedd6efb..f19d01da6 100644 --- a/third_party/python/Modules/clinic/_codecsmodule.inc +++ b/third_party/python/Modules/clinic/_codecsmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_cryptmodule.inc b/third_party/python/Modules/clinic/_cryptmodule.inc index e150bbe8f..385612525 100644 --- a/third_party/python/Modules/clinic/_cryptmodule.inc +++ b/third_party/python/Modules/clinic/_cryptmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_cursesmodule.inc b/third_party/python/Modules/clinic/_cursesmodule.inc index 1bbf0098e..62ff1c8ae 100644 --- a/third_party/python/Modules/clinic/_cursesmodule.inc +++ b/third_party/python/Modules/clinic/_cursesmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_datetimemodule.inc b/third_party/python/Modules/clinic/_datetimemodule.inc index 95c37c5a4..3887bbadd 100644 --- a/third_party/python/Modules/clinic/_datetimemodule.inc +++ b/third_party/python/Modules/clinic/_datetimemodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_dbmmodule.inc b/third_party/python/Modules/clinic/_dbmmodule.inc index 21fa6e5f9..ed10ce078 100644 --- a/third_party/python/Modules/clinic/_dbmmodule.inc +++ b/third_party/python/Modules/clinic/_dbmmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_elementtree.inc b/third_party/python/Modules/clinic/_elementtree.inc index 2728bcce7..0c4b2e06a 100644 --- a/third_party/python/Modules/clinic/_elementtree.inc +++ b/third_party/python/Modules/clinic/_elementtree.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_gdbmmodule.inc b/third_party/python/Modules/clinic/_gdbmmodule.inc index d9ee3fe99..dbb6a7dca 100644 --- a/third_party/python/Modules/clinic/_gdbmmodule.inc +++ b/third_party/python/Modules/clinic/_gdbmmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_lzmamodule.inc b/third_party/python/Modules/clinic/_lzmamodule.inc index 5b0e7bcc3..a84db5946 100644 --- a/third_party/python/Modules/clinic/_lzmamodule.inc +++ b/third_party/python/Modules/clinic/_lzmamodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_opcode.inc b/third_party/python/Modules/clinic/_opcode.inc index 4ea7811dd..2de8bd77d 100644 --- a/third_party/python/Modules/clinic/_opcode.inc +++ b/third_party/python/Modules/clinic/_opcode.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_pickle.inc b/third_party/python/Modules/clinic/_pickle.inc index a6005a62c..a0de46078 100644 --- a/third_party/python/Modules/clinic/_pickle.inc +++ b/third_party/python/Modules/clinic/_pickle.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_sre.inc b/third_party/python/Modules/clinic/_sre.inc index 3c4033785..48ad63cb1 100644 --- a/third_party/python/Modules/clinic/_sre.inc +++ b/third_party/python/Modules/clinic/_sre.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_ssl.inc b/third_party/python/Modules/clinic/_ssl.inc index d1ebd2ea5..0ea48ce6d 100644 --- a/third_party/python/Modules/clinic/_ssl.inc +++ b/third_party/python/Modules/clinic/_ssl.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_struct.inc b/third_party/python/Modules/clinic/_struct.inc index 0bff626b1..1dfcc9e33 100644 --- a/third_party/python/Modules/clinic/_struct.inc +++ b/third_party/python/Modules/clinic/_struct.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_tkinter.inc b/third_party/python/Modules/clinic/_tkinter.inc index 2638dcca8..c407f17da 100644 --- a/third_party/python/Modules/clinic/_tkinter.inc +++ b/third_party/python/Modules/clinic/_tkinter.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_weakref.inc b/third_party/python/Modules/clinic/_weakref.inc index 5069acf4e..97e2a24ba 100644 --- a/third_party/python/Modules/clinic/_weakref.inc +++ b/third_party/python/Modules/clinic/_weakref.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/_winapi.inc b/third_party/python/Modules/clinic/_winapi.inc index a84c9ae2a..7b0441e1c 100644 --- a/third_party/python/Modules/clinic/_winapi.inc +++ b/third_party/python/Modules/clinic/_winapi.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/arraymodule.inc b/third_party/python/Modules/clinic/arraymodule.inc index c0a733f00..2b611951e 100644 --- a/third_party/python/Modules/clinic/arraymodule.inc +++ b/third_party/python/Modules/clinic/arraymodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/audioop.inc b/third_party/python/Modules/clinic/audioop.inc index ff34bdf3e..2a2811b6f 100644 --- a/third_party/python/Modules/clinic/audioop.inc +++ b/third_party/python/Modules/clinic/audioop.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/binascii.inc b/third_party/python/Modules/clinic/binascii.inc index 1b22a0c20..31f428939 100644 --- a/third_party/python/Modules/clinic/binascii.inc +++ b/third_party/python/Modules/clinic/binascii.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/cmathmodule.inc b/third_party/python/Modules/clinic/cmathmodule.inc index 920e1bfb4..a65c6ef31 100644 --- a/third_party/python/Modules/clinic/cmathmodule.inc +++ b/third_party/python/Modules/clinic/cmathmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/fcntlmodule.inc b/third_party/python/Modules/clinic/fcntlmodule.inc index 2a3e92305..874a129fc 100644 --- a/third_party/python/Modules/clinic/fcntlmodule.inc +++ b/third_party/python/Modules/clinic/fcntlmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/grpmodule.inc b/third_party/python/Modules/clinic/grpmodule.inc index 73d69ef70..0bf323447 100644 --- a/third_party/python/Modules/clinic/grpmodule.inc +++ b/third_party/python/Modules/clinic/grpmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/posixmodule.inc b/third_party/python/Modules/clinic/posixmodule.inc index 3a4670566..81164606f 100644 --- a/third_party/python/Modules/clinic/posixmodule.inc +++ b/third_party/python/Modules/clinic/posixmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/pwdmodule.inc b/third_party/python/Modules/clinic/pwdmodule.inc index 5141179b4..f9e0644f2 100644 --- a/third_party/python/Modules/clinic/pwdmodule.inc +++ b/third_party/python/Modules/clinic/pwdmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/pyexpat.inc b/third_party/python/Modules/clinic/pyexpat.inc index 6763825dc..9b9d6e029 100644 --- a/third_party/python/Modules/clinic/pyexpat.inc +++ b/third_party/python/Modules/clinic/pyexpat.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/signalmodule.inc b/third_party/python/Modules/clinic/signalmodule.inc index 1d6dacb47..993608e57 100644 --- a/third_party/python/Modules/clinic/signalmodule.inc +++ b/third_party/python/Modules/clinic/signalmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/spwdmodule.inc b/third_party/python/Modules/clinic/spwdmodule.inc index 20d4735a3..b2479ff24 100644 --- a/third_party/python/Modules/clinic/spwdmodule.inc +++ b/third_party/python/Modules/clinic/spwdmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/unicodedata.inc b/third_party/python/Modules/clinic/unicodedata.inc index 1e4565395..6b079a85a 100644 --- a/third_party/python/Modules/clinic/unicodedata.inc +++ b/third_party/python/Modules/clinic/unicodedata.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/clinic/zlibmodule.inc b/third_party/python/Modules/clinic/zlibmodule.inc index e72369d6d..f127e78af 100644 --- a/third_party/python/Modules/clinic/zlibmodule.inc +++ b/third_party/python/Modules/clinic/zlibmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Modules/cmathmodule.c b/third_party/python/Modules/cmathmodule.c index 4092bffc6..6a840d2bd 100644 --- a/third_party/python/Modules/cmathmodule.c +++ b/third_party/python/Modules/cmathmodule.c @@ -21,7 +21,6 @@ #include "third_party/python/Include/pyport.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/_math.h" -/* clang-format off */ PYTHON_PROVIDE("cmath"); PYTHON_PROVIDE("cmath.acos"); diff --git a/third_party/python/Modules/config.c b/third_party/python/Modules/config.c index 1751e17be..4a2e6add1 100644 --- a/third_party/python/Modules/config.c +++ b/third_party/python/Modules/config.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/import.h" #include "third_party/python/Include/object.h" -/* clang-format off */ PyObject *PyInit_posix(void); PyObject *PyInit__codecs(void); diff --git a/third_party/python/Modules/errnomodule.c b/third_party/python/Modules/errnomodule.c index cee3013e4..8873fb00a 100644 --- a/third_party/python/Modules/errnomodule.c +++ b/third_party/python/Modules/errnomodule.c @@ -17,7 +17,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("errno"); PYTHON_PROVIDE("errno.E2BIG"); diff --git a/third_party/python/Modules/expat/ascii.inc b/third_party/python/Modules/expat/ascii.inc index 412ab820d..dfa92605d 100644 --- a/third_party/python/Modules/expat/ascii.inc +++ b/third_party/python/Modules/expat/ascii.inc @@ -1,4 +1,3 @@ -/* clang-format off */ #define ASCII_A 0x41 #define ASCII_B 0x42 diff --git a/third_party/python/Modules/expat/asciitab.inc b/third_party/python/Modules/expat/asciitab.inc index a82ae5169..63b1d1b44 100644 --- a/third_party/python/Modules/expat/asciitab.inc +++ b/third_party/python/Modules/expat/asciitab.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/expat_external.h b/third_party/python/Modules/expat/expat_external.h index 349b2198f..5feb5b939 100644 --- a/third_party/python/Modules/expat/expat_external.h +++ b/third_party/python/Modules/expat/expat_external.h @@ -2,7 +2,6 @@ #define Expat_External_INCLUDED 1 #include "third_party/python/Modules/expat/pyexpatns.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #if defined(__GNUC__) \ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)) diff --git a/third_party/python/Modules/expat/iasciitab.inc b/third_party/python/Modules/expat/iasciitab.inc index e1e272e0b..ea97cfcf6 100644 --- a/third_party/python/Modules/expat/iasciitab.inc +++ b/third_party/python/Modules/expat/iasciitab.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/internal.inc b/third_party/python/Modules/expat/internal.inc index f724fc72e..c93a44370 100644 --- a/third_party/python/Modules/expat/internal.inc +++ b/third_party/python/Modules/expat/internal.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* internal.h Note: Use of these macros is based on judgement, not hard rules, diff --git a/third_party/python/Modules/expat/latin1tab.inc b/third_party/python/Modules/expat/latin1tab.inc index 976456539..6f9160413 100644 --- a/third_party/python/Modules/expat/latin1tab.inc +++ b/third_party/python/Modules/expat/latin1tab.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/nametab.inc b/third_party/python/Modules/expat/nametab.inc index 63ecd2e7f..3681df348 100644 --- a/third_party/python/Modules/expat/nametab.inc +++ b/third_party/python/Modules/expat/nametab.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/pyexpatns.h b/third_party/python/Modules/expat/pyexpatns.h index 5d3f4c569..76d0fa227 100644 --- a/third_party/python/Modules/expat/pyexpatns.h +++ b/third_party/python/Modules/expat/pyexpatns.h @@ -1,6 +1,5 @@ #ifndef PYEXPATNS_H #define PYEXPATNS_H -/* clang-format off */ #define XML_DefaultCurrent PyExpat_XML_DefaultCurrent #define XML_ErrorString PyExpat_XML_ErrorString diff --git a/third_party/python/Modules/expat/siphash.inc b/third_party/python/Modules/expat/siphash.inc index 04c64e0d2..b660fffd4 100644 --- a/third_party/python/Modules/expat/siphash.inc +++ b/third_party/python/Modules/expat/siphash.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* ========================================================================== * siphash.h - SipHash-2-4 in a single header file * -------------------------------------------------------------------------- @@ -281,7 +280,6 @@ siphash24(const void *src, size_t len, const struct sipkey *key) { */ static int sip24_valid(void) { - /* clang-format off */ static const unsigned char vectors[64][8] = { { 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, }, { 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, }, diff --git a/third_party/python/Modules/expat/utf8tab.inc b/third_party/python/Modules/expat/utf8tab.inc index 7d8391bf1..a22986acb 100644 --- a/third_party/python/Modules/expat/utf8tab.inc +++ b/third_party/python/Modules/expat/utf8tab.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/xmlparse.c b/third_party/python/Modules/expat/xmlparse.c index 0c4594fba..6bfce3613 100644 --- a/third_party/python/Modules/expat/xmlparse.c +++ b/third_party/python/Modules/expat/xmlparse.c @@ -14,7 +14,6 @@ #include "libc/time/time.h" #include "third_party/python/Modules/expat/expat.h" #include "third_party/python/Modules/expat/expat_config.h" -/* clang-format off */ /* f2d0ab6d1d4422a08cf1cf3bbdfba96b49dea42fb5ff4615e03a2a25c306e769 (2.2.8+) __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/xmlrole.c b/third_party/python/Modules/expat/xmlrole.c index 7b002df9f..6ce8885db 100644 --- a/third_party/python/Modules/expat/xmlrole.c +++ b/third_party/python/Modules/expat/xmlrole.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/xmlrole.h b/third_party/python/Modules/expat/xmlrole.h index 72fd5afcc..a6eae0922 100644 --- a/third_party/python/Modules/expat/xmlrole.h +++ b/third_party/python/Modules/expat/xmlrole.h @@ -2,7 +2,6 @@ #define XmlRole_INCLUDED 1 #include "third_party/python/Modules/expat/xmltok.h" COSMOPOLITAN_C_START_ -/* clang-format off */ enum { XML_ROLE_ERROR = -1, diff --git a/third_party/python/Modules/expat/xmltok.c b/third_party/python/Modules/expat/xmltok.c index d457a65c6..149b12e10 100644 --- a/third_party/python/Modules/expat/xmltok.c +++ b/third_party/python/Modules/expat/xmltok.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/xmltok.h b/third_party/python/Modules/expat/xmltok.h index bea6bb97d..b6ca5e29c 100644 --- a/third_party/python/Modules/expat/xmltok.h +++ b/third_party/python/Modules/expat/xmltok.h @@ -2,7 +2,6 @@ #define XmlTok_INCLUDED 1 #include "third_party/python/Modules/expat/expat_external.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* The following token may be returned by XmlContentTok */ #define XML_TOK_TRAILING_RSQB \ diff --git a/third_party/python/Modules/expat/xmltok_impl.h.inc b/third_party/python/Modules/expat/xmltok_impl.h.inc index d3c11efd0..edfc2e33f 100644 --- a/third_party/python/Modules/expat/xmltok_impl.h.inc +++ b/third_party/python/Modules/expat/xmltok_impl.h.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/xmltok_impl.inc b/third_party/python/Modules/expat/xmltok_impl.inc index f5880a790..cd39bd394 100644 --- a/third_party/python/Modules/expat/xmltok_impl.inc +++ b/third_party/python/Modules/expat/xmltok_impl.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* This file is included! __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/expat/xmltok_ns.inc b/third_party/python/Modules/expat/xmltok_ns.inc index c17e47f1e..2286900f7 100644 --- a/third_party/python/Modules/expat/xmltok_ns.inc +++ b/third_party/python/Modules/expat/xmltok_ns.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* This file is included! __ __ _ ___\ \/ /_ __ __ _| |_ diff --git a/third_party/python/Modules/faulthandler.c b/third_party/python/Modules/faulthandler.c index 427da6f97..0038300ba 100644 --- a/third_party/python/Modules/faulthandler.c +++ b/third_party/python/Modules/faulthandler.c @@ -31,7 +31,6 @@ #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("faulthandler"); PYTHON_PROVIDE("faulthandler._fatal_error"); diff --git a/third_party/python/Modules/fcntlmodule.c b/third_party/python/Modules/fcntlmodule.c index a83c7cf2d..0a094929d 100644 --- a/third_party/python/Modules/fcntlmodule.c +++ b/third_party/python/Modules/fcntlmodule.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("fcntl"); PYTHON_PROVIDE("fcntl.FD_CLOEXEC"); diff --git a/third_party/python/Modules/fpectlmodule.c b/third_party/python/Modules/fpectlmodule.c index afa369be1..095c8bbab 100644 --- a/third_party/python/Modules/fpectlmodule.c +++ b/third_party/python/Modules/fpectlmodule.c @@ -13,7 +13,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pyport.h" -/* clang-format off */ /* --------------------------------------------------------------------- diff --git a/third_party/python/Modules/fpetestmodule.c b/third_party/python/Modules/fpetestmodule.c index 8ba791c4a..a28ee057a 100644 --- a/third_party/python/Modules/fpetestmodule.c +++ b/third_party/python/Modules/fpetestmodule.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pyfpe.h" #include "third_party/python/Include/pythonrun.h" -/* clang-format off */ /* --------------------------------------------------------------------- diff --git a/third_party/python/Modules/fspath.c b/third_party/python/Modules/fspath.c index 4099388c2..3df5122c1 100644 --- a/third_party/python/Modules/fspath.c +++ b/third_party/python/Modules/fspath.c @@ -9,7 +9,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ /* Return the file system path representation of the object. diff --git a/third_party/python/Modules/gcmodule.c b/third_party/python/Modules/gcmodule.c index 904e2613d..4762ddc92 100644 --- a/third_party/python/Modules/gcmodule.c +++ b/third_party/python/Modules/gcmodule.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/weakrefobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("gc"); PYTHON_PROVIDE("gc.DEBUG_COLLECTABLE"); diff --git a/third_party/python/Modules/getbuildinfo.c b/third_party/python/Modules/getbuildinfo.c index 28eb07382..2cfa018ed 100644 --- a/third_party/python/Modules/getbuildinfo.c +++ b/third_party/python/Modules/getbuildinfo.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ #define GITVERSION "3.6" #define GITTAG "3.6" diff --git a/third_party/python/Modules/getpath.c b/third_party/python/Modules/getpath.c index 1d9d23299..2bb80c6ce 100644 --- a/third_party/python/Modules/getpath.c +++ b/third_party/python/Modules/getpath.c @@ -22,7 +22,6 @@ #include "third_party/python/Include/osdefs.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymem.h" -/* clang-format off */ /* Return the initial module search path. */ #pragma GCC diagnostic ignored "-Wunused-function" // search_for_exec_prefix diff --git a/third_party/python/Modules/grpmodule.c b/third_party/python/Modules/grpmodule.c index 954ded73f..c6a94a290 100644 --- a/third_party/python/Modules/grpmodule.c +++ b/third_party/python/Modules/grpmodule.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/posixmodule.h" -/* clang-format off */ #include "third_party/python/Modules/clinic/grpmodule.inc" diff --git a/third_party/python/Modules/hashlib.h b/third_party/python/Modules/hashlib.h index dc1484005..03edc9209 100644 --- a/third_party/python/Modules/hashlib.h +++ b/third_party/python/Modules/hashlib.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_HASHLIB_H_ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_HASHLIB_H_ -/* clang-format off */ /* Common code for use by all hashlib related modules. */ /* diff --git a/third_party/python/Modules/hashtable.c b/third_party/python/Modules/hashtable.c index d556b083c..802289760 100644 --- a/third_party/python/Modules/hashtable.c +++ b/third_party/python/Modules/hashtable.c @@ -7,7 +7,6 @@ #include "third_party/python/Include/pyhash.h" #include "third_party/python/Include/pymem.h" #include "third_party/python/Modules/hashtable.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ cfuhash (bsd-3)\\n\ diff --git a/third_party/python/Modules/hashtable.h b/third_party/python/Modules/hashtable.h index 9e4b433e9..7c0e25c98 100644 --- a/third_party/python/Modules/hashtable.h +++ b/third_party/python/Modules/hashtable.h @@ -3,7 +3,6 @@ #include "libc/assert.h" #include "libc/str/str.h" #include "third_party/python/Include/pyport.h" -/* clang-format off */ #ifndef Py_LIMITED_API /* Single linked list */ diff --git a/third_party/python/Modules/itertoolsmodule.c b/third_party/python/Modules/itertoolsmodule.c index 1be915cd3..8d2e2afbf 100644 --- a/third_party/python/Modules/itertoolsmodule.c +++ b/third_party/python/Modules/itertoolsmodule.c @@ -15,7 +15,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("itertools"); PYTHON_PROVIDE("itertools._grouper"); diff --git a/third_party/python/Modules/main.c b/third_party/python/Modules/main.c index 2ed2a3091..cf8033e85 100644 --- a/third_party/python/Modules/main.c +++ b/third_party/python/Modules/main.c @@ -27,7 +27,6 @@ #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ __static_yoink("PyInit__codecs"); // for pylifecycle.o __static_yoink("PyInit__collections"); // for pylifecycle.o diff --git a/third_party/python/Modules/mathmodule.c b/third_party/python/Modules/mathmodule.c index d3187d017..2f4330cf6 100644 --- a/third_party/python/Modules/mathmodule.c +++ b/third_party/python/Modules/mathmodule.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/_math.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("math"); PYTHON_PROVIDE("math.acos"); diff --git a/third_party/python/Modules/mmapmodule.c b/third_party/python/Modules/mmapmodule.c index 3a4b2a1ad..0cf8dfdfb 100644 --- a/third_party/python/Modules/mmapmodule.c +++ b/third_party/python/Modules/mmapmodule.c @@ -30,7 +30,6 @@ #include "third_party/python/Include/sliceobject.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("mmap"); PYTHON_PROVIDE("mmap.ACCESS_COPY"); diff --git a/third_party/python/Modules/ossaudiodev.c b/third_party/python/Modules/ossaudiodev.c index 4ebfcf355..96ce2312a 100644 --- a/third_party/python/Modules/ossaudiodev.c +++ b/third_party/python/Modules/ossaudiodev.c @@ -8,7 +8,6 @@ #include "libc/sysv/consts/o.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("ossaudiodev"); PYTHON_PROVIDE("ossaudiodev.AFMT_AC3"); diff --git a/third_party/python/Modules/overlapped.c b/third_party/python/Modules/overlapped.c index 2a84f2a6c..f2cc0f65d 100644 --- a/third_party/python/Modules/overlapped.c +++ b/third_party/python/Modules/overlapped.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/structmember.h" -/* clang-format off */ /* * Support for overlapped IO diff --git a/third_party/python/Modules/parsermodule.c b/third_party/python/Modules/parsermodule.c index 0f05ebb5e..44ea9e6dc 100644 --- a/third_party/python/Modules/parsermodule.c +++ b/third_party/python/Modules/parsermodule.c @@ -25,7 +25,6 @@ #include "third_party/python/Include/token.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("parser"); PYTHON_PROVIDE("parser.ParserError"); diff --git a/third_party/python/Modules/posixmodule.c b/third_party/python/Modules/posixmodule.c index 4dca5b36f..051a7c7b9 100644 --- a/third_party/python/Modules/posixmodule.c +++ b/third_party/python/Modules/posixmodule.c @@ -90,7 +90,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/_multiprocessing/multiprocessing.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("posix"); PYTHON_PROVIDE("posix._getfinalpathname"); diff --git a/third_party/python/Modules/pwdmodule.c b/third_party/python/Modules/pwdmodule.c index 2c75a4920..e5e67cb33 100644 --- a/third_party/python/Modules/pwdmodule.c +++ b/third_party/python/Modules/pwdmodule.c @@ -16,7 +16,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/posixmodule.h" -/* clang-format off */ #include "third_party/python/Modules/clinic/pwdmodule.inc" diff --git a/third_party/python/Modules/pyexpat.c b/third_party/python/Modules/pyexpat.c index 85628b5d0..03d929707 100644 --- a/third_party/python/Modules/pyexpat.c +++ b/third_party/python/Modules/pyexpat.c @@ -22,7 +22,6 @@ #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/expat/expat.h" -/* clang-format off */ PYTHON_PROVIDE("pyexpat"); PYTHON_PROVIDE("pyexpat.EXPAT_VERSION"); diff --git a/third_party/python/Modules/resource.c b/third_party/python/Modules/resource.c index a74b0b3cb..d47ff1b29 100644 --- a/third_party/python/Modules/resource.c +++ b/third_party/python/Modules/resource.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/structseq.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("resource"); PYTHON_PROVIDE("resource.RLIMIT_AS"); diff --git a/third_party/python/Modules/rotatingtree.c b/third_party/python/Modules/rotatingtree.c index d66d5ebdf..61f684844 100644 --- a/third_party/python/Modules/rotatingtree.c +++ b/third_party/python/Modules/rotatingtree.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Modules/rotatingtree.h" -/* clang-format off */ #define KEY_LOWER_THAN(key1, key2) ((char*)(key1) < (char*)(key2)) diff --git a/third_party/python/Modules/rotatingtree.h b/third_party/python/Modules/rotatingtree.h index 05d55f4b6..af1634a3f 100644 --- a/third_party/python/Modules/rotatingtree.h +++ b/third_party/python/Modules/rotatingtree.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_ROTATINGTREE_H_ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_ROTATINGTREE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ /* "Rotating trees" (Armin Rigo) * @@ -31,5 +29,4 @@ int RotatingTree_Enum(rotating_node_t *root, rotating_tree_enum_fn enumfn, void *arg); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_ROTATINGTREE_H_ */ diff --git a/third_party/python/Modules/selectmodule.c b/third_party/python/Modules/selectmodule.c index fb19938cf..cc1d96762 100644 --- a/third_party/python/Modules/selectmodule.c +++ b/third_party/python/Modules/selectmodule.c @@ -33,7 +33,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("select"); PYTHON_PROVIDE("select.EPOLLERR"); diff --git a/third_party/python/Modules/signalmodule.c b/third_party/python/Modules/signalmodule.c index 5459e28d8..164588c07 100644 --- a/third_party/python/Modules/signalmodule.c +++ b/third_party/python/Modules/signalmodule.c @@ -33,7 +33,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/posixmodule.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("_signal"); PYTHON_PROVIDE("_signal.ITIMER_PROF"); diff --git a/third_party/python/Modules/socketmodule.c b/third_party/python/Modules/socketmodule.c index e83ab15ef..85afa630e 100644 --- a/third_party/python/Modules/socketmodule.c +++ b/third_party/python/Modules/socketmodule.c @@ -56,7 +56,6 @@ #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("_socket"); PYTHON_PROVIDE("_socket.AF_APPLETALK"); diff --git a/third_party/python/Modules/socketmodule.h b/third_party/python/Modules/socketmodule.h index 429411a0a..c135b85a7 100644 --- a/third_party/python/Modules/socketmodule.h +++ b/third_party/python/Modules/socketmodule.h @@ -5,7 +5,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pytime.h" COSMOPOLITAN_C_START_ -/* clang-format off */ /* Python module and C API name */ #define PySocket_MODULE_NAME "_socket" diff --git a/third_party/python/Modules/spwdmodule.c b/third_party/python/Modules/spwdmodule.c index d9b10b324..011dc1eb2 100644 --- a/third_party/python/Modules/spwdmodule.c +++ b/third_party/python/Modules/spwdmodule.c @@ -10,7 +10,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/clinic/spwdmodule.inc" -/* clang-format off */ PYTHON_PROVIDE("spwd"); PYTHON_PROVIDE("spwd.getspall"); diff --git a/third_party/python/Modules/sre_constants.h b/third_party/python/Modules/sre_constants.h index 29992ef16..18a78e0da 100644 --- a/third_party/python/Modules/sre_constants.h +++ b/third_party/python/Modules/sre_constants.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_SRE_CONSTANTS_H_ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_SRE_CONSTANTS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #define SRE_MAGIC 20140917 #define SRE_OP_FAILURE 0 @@ -82,5 +80,4 @@ COSMOPOLITAN_C_START_ #define SRE_INFO_CHARSET 4 COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_SRE_CONSTANTS_H_ */ diff --git a/third_party/python/Modules/sre_lib.inc b/third_party/python/Modules/sre_lib.inc index 49d13cdb4..d18b01abe 100644 --- a/third_party/python/Modules/sre_lib.inc +++ b/third_party/python/Modules/sre_lib.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* * Secret Labs' Regular Expression Engine diff --git a/third_party/python/Modules/symtablemodule.c b/third_party/python/Modules/symtablemodule.c index 1abb04d6b..d40f50989 100644 --- a/third_party/python/Modules/symtablemodule.c +++ b/third_party/python/Modules/symtablemodule.c @@ -14,7 +14,6 @@ #include "third_party/python/Include/symtable.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_symtable"); PYTHON_PROVIDE("_symtable.CELL"); diff --git a/third_party/python/Modules/syslogmodule.c b/third_party/python/Modules/syslogmodule.c index 64e783c1c..78f921928 100644 --- a/third_party/python/Modules/syslogmodule.c +++ b/third_party/python/Modules/syslogmodule.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("syslog"); PYTHON_PROVIDE("syslog.LOG_ALERT"); diff --git a/third_party/python/Modules/termios.c b/third_party/python/Modules/termios.c index 31baad8ce..c9324a071 100644 --- a/third_party/python/Modules/termios.c +++ b/third_party/python/Modules/termios.c @@ -24,7 +24,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("termios"); PYTHON_PROVIDE("termios.B1000000"); diff --git a/third_party/python/Modules/testcapi_long.inc b/third_party/python/Modules/testcapi_long.inc index 39187b7e2..f791df9ca 100644 --- a/third_party/python/Modules/testcapi_long.inc +++ b/third_party/python/Modules/testcapi_long.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* Poor-man's template. Macros used: TESTNAME name of the test (like test_long_api_inner) diff --git a/third_party/python/Modules/timemodule.c b/third_party/python/Modules/timemodule.c index d02650681..362e09beb 100644 --- a/third_party/python/Modules/timemodule.c +++ b/third_party/python/Modules/timemodule.c @@ -36,7 +36,6 @@ #include "third_party/python/Include/structseq.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("time"); PYTHON_PROVIDE("time.CLOCK_MONOTONIC"); diff --git a/third_party/python/Modules/tkinter.h b/third_party/python/Modules/tkinter.h index 80c27e4cb..cb5a806b0 100644 --- a/third_party/python/Modules/tkinter.h +++ b/third_party/python/Modules/tkinter.h @@ -1,6 +1,5 @@ #ifndef TKINTER_H #define TKINTER_H -/* clang-format off */ /* This header is used to share some macros between _tkinter.c and * tkappinit.c. diff --git a/third_party/python/Modules/tlsmodule.c b/third_party/python/Modules/tlsmodule.c index 81a9fe935..25fe3235a 100644 --- a/third_party/python/Modules/tlsmodule.c +++ b/third_party/python/Modules/tlsmodule.c @@ -37,7 +37,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ /** * @fileoverview Enough TLS support for HttpsClient so far. diff --git a/third_party/python/Modules/tokenbucket.c b/third_party/python/Modules/tokenbucket.c index c56705574..ba120eeeb 100644 --- a/third_party/python/Modules/tokenbucket.c +++ b/third_party/python/Modules/tokenbucket.c @@ -23,7 +23,6 @@ #include "libc/calls/struct/sigaction.h" #include "libc/calls/struct/timespec.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/limits.h" #include "libc/macros.internal.h" #include "libc/runtime/runtime.h" @@ -45,8 +44,8 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" +#include "libc/serialize.h" #include "third_party/python/Include/yoink.h" -// clang-format off PYTHON_PROVIDE("tokenbucket"); PYTHON_PROVIDE("tokenbucket.acquire"); diff --git a/third_party/python/Modules/unicodedata.c b/third_party/python/Modules/unicodedata.c index a380a4f9f..24e8ec8fc 100644 --- a/third_party/python/Modules/unicodedata.c +++ b/third_party/python/Modules/unicodedata.c @@ -21,7 +21,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/bextra.h" #include "third_party/python/Modules/unicodedata_unidata.h" -/* clang-format off */ PYTHON_PROVIDE("unicodedata"); PYTHON_PROVIDE("unicodedata.UCD"); diff --git a/third_party/python/Modules/unicodedata.h b/third_party/python/Modules/unicodedata.h index d425f560b..2f8c99ab5 100644 --- a/third_party/python/Modules/unicodedata.h +++ b/third_party/python/Modules/unicodedata.h @@ -14,9 +14,7 @@ #define _Hanghoul_NCount (_Hanghoul_VCount * _Hanghoul_TCount) #define _Hanghoul_SCount (_Hanghoul_LCount * _Hanghoul_NCount) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ /* * [jart] if it adds 1.2megs to each binary then it should have an api @@ -97,5 +95,4 @@ int _PyUnicode_GetCode(PyObject *, const char *, int, Py_UCS4 *, int); void _PyUnicode_GetDecompRecord(PyObject *, Py_UCS4, int *, int *, int *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_UNICODEDATA_H_ */ diff --git a/third_party/python/Modules/unicodedata_3.2.0.c b/third_party/python/Modules/unicodedata_3.2.0.c index 2ccb0a9b2..49e4df3a5 100644 --- a/third_party/python/Modules/unicodedata_3.2.0.c +++ b/third_party/python/Modules/unicodedata_3.2.0.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const _PyUnicode_ChangeRecord _PyUnicode_ChangeRecords_3_2_0[] = { diff --git a/third_party/python/Modules/unicodedata_aliases.c b/third_party/python/Modules/unicodedata_aliases.c index dca1ccdd8..c962c34b4 100644 --- a/third_party/python/Modules/unicodedata_aliases.c +++ b/third_party/python/Modules/unicodedata_aliases.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const unsigned int _PyUnicode_NameAliases[468] = { diff --git a/third_party/python/Modules/unicodedata_bidirectionalnames.c b/third_party/python/Modules/unicodedata_bidirectionalnames.c index 920d5d173..cc5af8414 100644 --- a/third_party/python/Modules/unicodedata_bidirectionalnames.c +++ b/third_party/python/Modules/unicodedata_bidirectionalnames.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const char _PyUnicode_BidirectionalNames[24][4] = { diff --git a/third_party/python/Modules/unicodedata_categorynames.c b/third_party/python/Modules/unicodedata_categorynames.c index 15e4b4c17..153a77429 100644 --- a/third_party/python/Modules/unicodedata_categorynames.c +++ b/third_party/python/Modules/unicodedata_categorynames.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const char _PyUnicode_CategoryNames[31][3] = { diff --git a/third_party/python/Modules/unicodedata_codehash.c b/third_party/python/Modules/unicodedata_codehash.c index 539251333..2de4c2260 100644 --- a/third_party/python/Modules/unicodedata_codehash.c +++ b/third_party/python/Modules/unicodedata_codehash.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const unsigned int _PyUnicode_CodeHash[40960] = { diff --git a/third_party/python/Modules/unicodedata_comp.c b/third_party/python/Modules/unicodedata_comp.c index 6b84fb70e..9b2c142fe 100644 --- a/third_party/python/Modules/unicodedata_comp.c +++ b/third_party/python/Modules/unicodedata_comp.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ unsigned short _PyUnicode_CompIndex[5938]; diff --git a/third_party/python/Modules/unicodedata_decomp.c b/third_party/python/Modules/unicodedata_decomp.c index a404b11e2..ca8b27add 100644 --- a/third_party/python/Modules/unicodedata_decomp.c +++ b/third_party/python/Modules/unicodedata_decomp.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const unsigned int _PyUnicode_Decomp[8032] = { diff --git a/third_party/python/Modules/unicodedata_decompprefix.c b/third_party/python/Modules/unicodedata_decompprefix.c index 30d11f544..d0ed4104a 100644 --- a/third_party/python/Modules/unicodedata_decompprefix.c +++ b/third_party/python/Modules/unicodedata_decompprefix.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const char *const _PyUnicode_DecompPrefix[17] = { diff --git a/third_party/python/Modules/unicodedata_eastasianwidthnames.c b/third_party/python/Modules/unicodedata_eastasianwidthnames.c index a3786f57e..fea9950a0 100644 --- a/third_party/python/Modules/unicodedata_eastasianwidthnames.c +++ b/third_party/python/Modules/unicodedata_eastasianwidthnames.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const char _PyUnicode_EastAsianWidthNames[6][3] = { diff --git a/third_party/python/Modules/unicodedata_extendedcase.c b/third_party/python/Modules/unicodedata_extendedcase.c index dd42a77d5..a26f75987 100644 --- a/third_party/python/Modules/unicodedata_extendedcase.c +++ b/third_party/python/Modules/unicodedata_extendedcase.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const char16_t _PyUnicode_ExtendedCase[1236] = { diff --git a/third_party/python/Modules/unicodedata_findnfcindex.c b/third_party/python/Modules/unicodedata_findnfcindex.c index 68f1fcdff..28c7ac891 100644 --- a/third_party/python/Modules/unicodedata_findnfcindex.c +++ b/third_party/python/Modules/unicodedata_findnfcindex.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ int _PyUnicode_FindNfcIndex(const _PyUnicode_Reindex *nfc, Py_UCS4 code) diff --git a/third_party/python/Modules/unicodedata_getcode.c b/third_party/python/Modules/unicodedata_getcode.c index 31adedc68..e93752fbd 100644 --- a/third_party/python/Modules/unicodedata_getcode.c +++ b/third_party/python/Modules/unicodedata_getcode.c @@ -11,7 +11,6 @@ #include "third_party/python/Modules/bextra.h" #include "third_party/python/Modules/unicodedata.h" #include "third_party/python/Modules/unicodedata_unidata.h" -/* clang-format off */ /* macros used to determine if the given code point is in the PUA range that * we are using to store aliases and named sequences */ diff --git a/third_party/python/Modules/unicodedata_getdecomprecord.c b/third_party/python/Modules/unicodedata_getdecomprecord.c index 773138006..69c3166f5 100644 --- a/third_party/python/Modules/unicodedata_getdecomprecord.c +++ b/third_party/python/Modules/unicodedata_getdecomprecord.c @@ -4,11 +4,9 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "third_party/python/Modules/bextra.h" #include "third_party/python/Modules/unicodedata.h" #include "third_party/python/Modules/unicodedata_unidata.h" -/* clang-format off */ void _PyUnicode_GetDecompRecord(PyObject *self, diff --git a/third_party/python/Modules/unicodedata_getrecord.c b/third_party/python/Modules/unicodedata_getrecord.c index 44debb915..21f0e9571 100644 --- a/third_party/python/Modules/unicodedata_getrecord.c +++ b/third_party/python/Modules/unicodedata_getrecord.c @@ -7,7 +7,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Modules/unicodedata.h" #include "third_party/python/Modules/unicodedata_unidata.h" -/* clang-format off */ const _PyUnicode_Record * _PyUnicode_GetRecord(Py_UCS4 c) diff --git a/third_party/python/Modules/unicodedata_islinebreak.c b/third_party/python/Modules/unicodedata_islinebreak.c index df9e2a419..988d4364c 100644 --- a/third_party/python/Modules/unicodedata_islinebreak.c +++ b/third_party/python/Modules/unicodedata_islinebreak.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ /* Returns 1 for Unicode characters having the line break diff --git a/third_party/python/Modules/unicodedata_isnormalized.c b/third_party/python/Modules/unicodedata_isnormalized.c index a9c3bdef3..da1eaf897 100644 --- a/third_party/python/Modules/unicodedata_isnormalized.c +++ b/third_party/python/Modules/unicodedata_isnormalized.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /** * Returns 1 if the input is certainly normalized, 0 if it might not be. diff --git a/third_party/python/Modules/unicodedata_isunifiedideograph.c b/third_party/python/Modules/unicodedata_isunifiedideograph.c index 4a0e16c23..4892b2c6e 100644 --- a/third_party/python/Modules/unicodedata_isunifiedideograph.c +++ b/third_party/python/Modules/unicodedata_isunifiedideograph.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* These ranges need to match makeunicodedata.py:cjk_ranges. */ int diff --git a/third_party/python/Modules/unicodedata_iswhitespace.c b/third_party/python/Modules/unicodedata_iswhitespace.c index 9c1fe4f37..017fd8c21 100644 --- a/third_party/python/Modules/unicodedata_iswhitespace.c +++ b/third_party/python/Modules/unicodedata_iswhitespace.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ /* Returns 1 for Unicode characters having the bidirectional diff --git a/third_party/python/Modules/unicodedata_lexicon.c b/third_party/python/Modules/unicodedata_lexicon.c index 99ed2083d..0a769d3f9 100644 --- a/third_party/python/Modules/unicodedata_lexicon.c +++ b/third_party/python/Modules/unicodedata_lexicon.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const unsigned char _PyUnicode_Lexicon[121990] = { diff --git a/third_party/python/Modules/unicodedata_namedsequences.c b/third_party/python/Modules/unicodedata_namedsequences.c index e2398b234..544c769de 100644 --- a/third_party/python/Modules/unicodedata_namedsequences.c +++ b/third_party/python/Modules/unicodedata_namedsequences.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const _PyUnicode_NamedSequence _PyUnicode_NamedSequences[442] = { diff --git a/third_party/python/Modules/unicodedata_nfcfirst.c b/third_party/python/Modules/unicodedata_nfcfirst.c index e0fae9b77..46f288cad 100644 --- a/third_party/python/Modules/unicodedata_nfcfirst.c +++ b/third_party/python/Modules/unicodedata_nfcfirst.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const _PyUnicode_Reindex _PyUnicode_NfcFirst[] = { diff --git a/third_party/python/Modules/unicodedata_nfclast.c b/third_party/python/Modules/unicodedata_nfclast.c index 6ba4dce53..bc9684f21 100644 --- a/third_party/python/Modules/unicodedata_nfclast.c +++ b/third_party/python/Modules/unicodedata_nfclast.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const _PyUnicode_Reindex _PyUnicode_NfcLast[] = { diff --git a/third_party/python/Modules/unicodedata_nfcnfkc.c b/third_party/python/Modules/unicodedata_nfcnfkc.c index ecf158717..e1d3c5575 100644 --- a/third_party/python/Modules/unicodedata_nfcnfkc.c +++ b/third_party/python/Modules/unicodedata_nfcnfkc.c @@ -10,7 +10,6 @@ #include "third_party/python/Modules/bextra.h" #include "third_party/python/Modules/unicodedata.h" #include "third_party/python/Modules/unicodedata_unidata.h" -/* clang-format off */ PyObject * _PyUnicode_NfcNfkc(PyObject *self, PyObject *input, int k) diff --git a/third_party/python/Modules/unicodedata_nfdnfkd.c b/third_party/python/Modules/unicodedata_nfdnfkd.c index 88d7726ff..d5972946a 100644 --- a/third_party/python/Modules/unicodedata_nfdnfkd.c +++ b/third_party/python/Modules/unicodedata_nfdnfkd.c @@ -9,7 +9,6 @@ #include "third_party/python/Modules/bextra.h" #include "third_party/python/Modules/unicodedata.h" #include "third_party/python/Modules/unicodedata_unidata.h" -/* clang-format off */ PyObject * _PyUnicode_NfdNfkd(PyObject *self, PyObject *input, int k) diff --git a/third_party/python/Modules/unicodedata_phrasebook.c b/third_party/python/Modules/unicodedata_phrasebook.c index cdd159870..dfa0630fc 100644 --- a/third_party/python/Modules/unicodedata_phrasebook.c +++ b/third_party/python/Modules/unicodedata_phrasebook.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const unsigned char _PyUnicode_Phrasebook[188803] = { diff --git a/third_party/python/Modules/unicodedata_records.c b/third_party/python/Modules/unicodedata_records.c index 17b4f3956..9c7b8ba51 100644 --- a/third_party/python/Modules/unicodedata_records.c +++ b/third_party/python/Modules/unicodedata_records.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const _PyUnicode_Record _PyUnicode_Records[] = { diff --git a/third_party/python/Modules/unicodedata_tonumeric.c b/third_party/python/Modules/unicodedata_tonumeric.c index a891bc5a0..0ad37b2d3 100644 --- a/third_party/python/Modules/unicodedata_tonumeric.c +++ b/third_party/python/Modules/unicodedata_tonumeric.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ static const double kNumeric[] = { diff --git a/third_party/python/Modules/unicodedata_typerecords.c b/third_party/python/Modules/unicodedata_typerecords.c index 28c066570..afa05895c 100644 --- a/third_party/python/Modules/unicodedata_typerecords.c +++ b/third_party/python/Modules/unicodedata_typerecords.c @@ -1,6 +1,5 @@ #include "libc/nexgen32e/kompressor.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* GENERATED BY third_party/python/Tools/unicode/makeunicodedata.py 3.2 */ const _PyUnicode_TypeRecord _PyUnicode_TypeRecords[503] = { diff --git a/third_party/python/Modules/unicodedata_ucd.c b/third_party/python/Modules/unicodedata_ucd.c index 27d86b059..b7f9d0d16 100644 --- a/third_party/python/Modules/unicodedata_ucd.c +++ b/third_party/python/Modules/unicodedata_ucd.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Modules/unicodedata.h" #include "third_party/python/Modules/unicodedata_unidata.h" -/* clang-format off */ PyTypeObject UCD_Type = { PyVarObject_HEAD_INIT(NULL, 0) diff --git a/third_party/python/Modules/winreparse.h b/third_party/python/Modules/winreparse.h index 2983e192b..e2370962d 100644 --- a/third_party/python/Modules/winreparse.h +++ b/third_party/python/Modules/winreparse.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_WINREPARSE_H_ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_WINREPARSE_H_ #include "libc/nt/struct/reparsedatabuffer.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define _Py_REPARSE_DATA_BUFFER struct NtReparseDataBuffer #define _Py_PREPARSE_DATA_BUFFER struct NtReparseDataBuffer* @@ -10,5 +9,4 @@ offsetof(_Py_REPARSE_DATA_BUFFER, GenericReparseBuffer) #define _Py_MAXIMUM_REPARSE_DATA_BUFFER_SIZE (16 * 1024) -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_WINREPARSE_H_ */ diff --git a/third_party/python/Modules/xxlimited.c b/third_party/python/Modules/xxlimited.c index 35afababf..f1892fda6 100644 --- a/third_party/python/Modules/xxlimited.c +++ b/third_party/python/Modules/xxlimited.c @@ -13,7 +13,6 @@ #include "third_party/python/Include/typeslots.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("xxlimited"); PYTHON_PROVIDE("xxlimited.Null"); diff --git a/third_party/python/Modules/xxmodule.c b/third_party/python/Modules/xxmodule.c index 4946127aa..f0c0cfb6f 100644 --- a/third_party/python/Modules/xxmodule.c +++ b/third_party/python/Modules/xxmodule.c @@ -12,7 +12,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/objimpl.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("xx"); diff --git a/third_party/python/Modules/xxsubtype.c b/third_party/python/Modules/xxsubtype.c index 085a99375..7de258812 100644 --- a/third_party/python/Modules/xxsubtype.c +++ b/third_party/python/Modules/xxsubtype.c @@ -16,7 +16,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("xxsubtype"); PYTHON_PROVIDE("xxsubtype.bench"); diff --git a/third_party/python/Modules/zipimport.c b/third_party/python/Modules/zipimport.c index b29df6edf..620d6e0b0 100644 --- a/third_party/python/Modules/zipimport.c +++ b/third_party/python/Modules/zipimport.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/weirdtypes.h" -#include "libc/intrin/bits.h" #include "libc/sysv/consts/s.h" #include "libc/time/struct/tm.h" #include "libc/time/time.h" @@ -33,8 +32,8 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/unicodeobject.h" +#include "libc/serialize.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("zipimport"); PYTHON_PROVIDE("zipimport.ZipImportError"); diff --git a/third_party/python/Modules/zlibmodule.c b/third_party/python/Modules/zlibmodule.c index 7801e3809..58f3a24a5 100644 --- a/third_party/python/Modules/zlibmodule.c +++ b/third_party/python/Modules/zlibmodule.c @@ -16,7 +16,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" #include "third_party/zlib/zlib.h" -/* clang-format off */ PYTHON_PROVIDE("zlib"); PYTHON_PROVIDE("zlib.DEFLATED"); diff --git a/third_party/python/Objects/abstract.c b/third_party/python/Objects/abstract.c index b6c70aa68..760249cc2 100644 --- a/third_party/python/Objects/abstract.c +++ b/third_party/python/Objects/abstract.c @@ -25,7 +25,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ /* Abstract Object Interface (many thanks to Jim Fulton) */ diff --git a/third_party/python/Objects/accu.c b/third_party/python/Objects/accu.c index e8222eaa1..a46c2d890 100644 --- a/third_party/python/Objects/accu.c +++ b/third_party/python/Objects/accu.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/accu.h" #include "third_party/python/Include/listobject.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ static PyObject * join_list_unicode(PyObject *lst) diff --git a/third_party/python/Objects/boolobject.c b/third_party/python/Objects/boolobject.c index fe11af9f3..afe277522 100644 --- a/third_party/python/Objects/boolobject.c +++ b/third_party/python/Objects/boolobject.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/longintrepr.h" #include "third_party/python/Include/modsupport.h" #include "third_party/python/Include/pymacro.h" -/* clang-format off */ /* Boolean type, a subtype of int */ diff --git a/third_party/python/Objects/bytearrayobject.c b/third_party/python/Objects/bytearrayobject.c index 76eb2b56e..d9e367df5 100644 --- a/third_party/python/Objects/bytearrayobject.c +++ b/third_party/python/Objects/bytearrayobject.c @@ -24,7 +24,6 @@ #include "third_party/python/Include/sliceobject.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ /*[clinic input] class bytearray "PyByteArrayObject *" "&PyByteArray_Type" diff --git a/third_party/python/Objects/bytes_methods.c b/third_party/python/Objects/bytes_methods.c index c76671413..b8572463f 100644 --- a/third_party/python/Objects/bytes_methods.c +++ b/third_party/python/Objects/bytes_methods.c @@ -13,7 +13,6 @@ #include "third_party/python/Include/longobject.h" #include "third_party/python/Include/pyctype.h" #include "third_party/python/Include/pyerrors.h" -/* clang-format off */ PyDoc_STRVAR_shared(_Py_isspace__doc__, "B.isspace() -> bool\n\ diff --git a/third_party/python/Objects/bytesobject.c b/third_party/python/Objects/bytesobject.c index 32a76d996..9eb32fee0 100644 --- a/third_party/python/Objects/bytesobject.c +++ b/third_party/python/Objects/bytesobject.c @@ -27,7 +27,6 @@ #include "third_party/python/Include/pystrtod.h" #include "third_party/python/Include/sliceobject.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ /*[clinic input] class bytes "PyBytesObject *" "&PyBytes_Type" diff --git a/third_party/python/Objects/call.c b/third_party/python/Objects/call.c index 2ff0e4f0b..130d67625 100644 --- a/third_party/python/Objects/call.c +++ b/third_party/python/Objects/call.c @@ -28,7 +28,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ int _PyObject_HasFastCall(PyObject *callable) diff --git a/third_party/python/Objects/capsule.c b/third_party/python/Objects/capsule.c index 13d7c3e46..922e448ea 100644 --- a/third_party/python/Objects/capsule.c +++ b/third_party/python/Objects/capsule.c @@ -10,7 +10,6 @@ #include "third_party/python/Include/pycapsule.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" -/* clang-format off */ /* Wrap void * pointers to be passed between C modules */ diff --git a/third_party/python/Objects/cellobject.c b/third_party/python/Objects/cellobject.c index 30116abae..46389ffcd 100644 --- a/third_party/python/Objects/cellobject.c +++ b/third_party/python/Objects/cellobject.c @@ -9,7 +9,6 @@ #include "third_party/python/Include/descrobject.h" #include "third_party/python/Include/object.h" #include "third_party/python/Include/objimpl.h" -/* clang-format off */ PyObject * PyCell_New(PyObject *obj) diff --git a/third_party/python/Objects/classobject.c b/third_party/python/Objects/classobject.c index 2995d2105..9cd2fbbd7 100644 --- a/third_party/python/Objects/classobject.c +++ b/third_party/python/Objects/classobject.c @@ -16,7 +16,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/structmember.h" -/* clang-format off */ /* Class object implementation (dead now except for methods) */ diff --git a/third_party/python/Objects/clinic/bytearrayobject.inc b/third_party/python/Objects/clinic/bytearrayobject.inc index aef9f9f1d..d45592be5 100644 --- a/third_party/python/Objects/clinic/bytearrayobject.inc +++ b/third_party/python/Objects/clinic/bytearrayobject.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Objects/clinic/bytesobject.inc b/third_party/python/Objects/clinic/bytesobject.inc index 635508b6d..9c358b54e 100644 --- a/third_party/python/Objects/clinic/bytesobject.inc +++ b/third_party/python/Objects/clinic/bytesobject.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Objects/clinic/dictobject.inc b/third_party/python/Objects/clinic/dictobject.inc index de82f352a..09e0dbdd6 100644 --- a/third_party/python/Objects/clinic/dictobject.inc +++ b/third_party/python/Objects/clinic/dictobject.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Objects/clinic/unicodeobject.inc b/third_party/python/Objects/clinic/unicodeobject.inc index 45a46e988..927c97ff0 100644 --- a/third_party/python/Objects/clinic/unicodeobject.inc +++ b/third_party/python/Objects/clinic/unicodeobject.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Objects/codeobject.c b/third_party/python/Objects/codeobject.c index 160a8c9db..393781467 100644 --- a/third_party/python/Objects/codeobject.c +++ b/third_party/python/Objects/codeobject.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ #define NAME_CHARS \ "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz" diff --git a/third_party/python/Objects/complexobject.c b/third_party/python/Objects/complexobject.c index 8077b0847..59f8ea11a 100644 --- a/third_party/python/Objects/complexobject.c +++ b/third_party/python/Objects/complexobject.c @@ -20,7 +20,6 @@ #include "third_party/python/Include/pymath.h" #include "third_party/python/Include/pystrtod.h" #include "third_party/python/Include/structmember.h" -/* clang-format off */ /* Borrows heavily from floatobject.c */ /* Submitted by Jim Hugunin */ diff --git a/third_party/python/Objects/descrobject.c b/third_party/python/Objects/descrobject.c index 2edbb6664..d8856c5c6 100644 --- a/third_party/python/Objects/descrobject.c +++ b/third_party/python/Objects/descrobject.c @@ -17,7 +17,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ /* Descriptors -- a new, flexible way to describe attributes */ diff --git a/third_party/python/Objects/dict-common.h b/third_party/python/Objects/dict-common.h index 6349b1e74..7dab5b51f 100644 --- a/third_party/python/Objects/dict-common.h +++ b/third_party/python/Objects/dict-common.h @@ -2,7 +2,6 @@ #define Py_DICT_COMMON_H #include "third_party/python/Include/dictobject.h" #include "third_party/python/Include/object.h" -/* clang-format off */ typedef struct { /* Cached hash code of me_key. */ diff --git a/third_party/python/Objects/dictobject.c b/third_party/python/Objects/dictobject.c index 1e8b613d6..e2f657d49 100644 --- a/third_party/python/Objects/dictobject.c +++ b/third_party/python/Objects/dictobject.c @@ -20,7 +20,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Objects/dict-common.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ /* Dictionary object implementation using a hash table */ diff --git a/third_party/python/Objects/enumobject.c b/third_party/python/Objects/enumobject.c index f7c4711b4..879cc2532 100644 --- a/third_party/python/Objects/enumobject.c +++ b/third_party/python/Objects/enumobject.c @@ -14,7 +14,6 @@ #include "third_party/python/Include/objimpl.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" -/* clang-format off */ typedef struct { PyObject_HEAD diff --git a/third_party/python/Objects/exceptions.c b/third_party/python/Objects/exceptions.c index e77718199..35c1e522d 100644 --- a/third_party/python/Objects/exceptions.c +++ b/third_party/python/Objects/exceptions.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/tupleobject.h" -/* clang-format off */ /* * New exceptions.c written in Iceland by Richard Jones and Georg Brandl. diff --git a/third_party/python/Objects/fileobject.c b/third_party/python/Objects/fileobject.c index afe196670..34f86cfe3 100644 --- a/third_party/python/Objects/fileobject.c +++ b/third_party/python/Objects/fileobject.c @@ -23,7 +23,6 @@ #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ /* File object implementation (what's left of it -- see io.py) */ diff --git a/third_party/python/Objects/floatobject.c b/third_party/python/Objects/floatobject.c index 8c3f7caf3..9b4f04c09 100644 --- a/third_party/python/Objects/floatobject.c +++ b/third_party/python/Objects/floatobject.c @@ -29,7 +29,6 @@ #include "third_party/python/Include/pystrtod.h" #include "third_party/python/Include/structseq.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ /* XXX There should be overflow checks here, but it's hard to check for any kind of float exception without losing portability. */ diff --git a/third_party/python/Objects/frameobject.c b/third_party/python/Objects/frameobject.c index 452421568..4952ba11c 100644 --- a/third_party/python/Objects/frameobject.c +++ b/third_party/python/Objects/frameobject.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" -/* clang-format off */ #define OFF(x) offsetof(PyFrameObject, x) diff --git a/third_party/python/Objects/fromfd.c b/third_party/python/Objects/fromfd.c index b5e953b6f..91049f7ba 100644 --- a/third_party/python/Objects/fromfd.c +++ b/third_party/python/Objects/fromfd.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/import.h" #include "third_party/python/Include/object.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_YOINK("io"); diff --git a/third_party/python/Objects/funcobject.c b/third_party/python/Objects/funcobject.c index 4694f065f..5fb0c9e4f 100644 --- a/third_party/python/Objects/funcobject.c +++ b/third_party/python/Objects/funcobject.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ PyObject * PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname) diff --git a/third_party/python/Objects/genobject.c b/third_party/python/Objects/genobject.c index 1d5ff086d..f5d67647f 100644 --- a/third_party/python/Objects/genobject.c +++ b/third_party/python/Objects/genobject.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ static PyObject *gen_close(PyGenObject *, PyObject *); static PyObject *async_gen_asend_new(PyAsyncGenObject *, PyObject *); diff --git a/third_party/python/Objects/iterobject.c b/third_party/python/Objects/iterobject.c index 2149f9c2c..14296b981 100644 --- a/third_party/python/Objects/iterobject.c +++ b/third_party/python/Objects/iterobject.c @@ -12,7 +12,6 @@ #include "third_party/python/Include/objimpl.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" -/* clang-format off */ typedef struct { PyObject_HEAD diff --git a/third_party/python/Objects/listobject.c b/third_party/python/Objects/listobject.c index 8ee457727..cb47d4699 100644 --- a/third_party/python/Objects/listobject.c +++ b/third_party/python/Objects/listobject.c @@ -21,7 +21,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/pystate.h" #include "third_party/python/Include/sliceobject.h" -/* clang-format off */ /* Ensure ob_item has room for at least newsize elements, and set * ob_size to newsize. If newsize > ob_size on entry, the content diff --git a/third_party/python/Objects/longobject.c b/third_party/python/Objects/longobject.c index e84469210..183ba2419 100644 --- a/third_party/python/Objects/longobject.c +++ b/third_party/python/Objects/longobject.c @@ -26,7 +26,6 @@ #include "third_party/python/Include/structseq.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ /* Long (arbitrary precision) integer object implementation */ /* XXX The functional organization of this file is terrible */ diff --git a/third_party/python/Objects/memoryobject.c b/third_party/python/Objects/memoryobject.c index 92021a0c5..ca2c0d853 100644 --- a/third_party/python/Objects/memoryobject.c +++ b/third_party/python/Objects/memoryobject.c @@ -22,7 +22,6 @@ #include "third_party/python/Include/pystrhex.h" #include "third_party/python/Include/sliceobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ /****************************************************************************/ /* ManagedBuffer Object */ diff --git a/third_party/python/Objects/methodobject.c b/third_party/python/Objects/methodobject.c index 52c6ea089..7921ba739 100644 --- a/third_party/python/Objects/methodobject.c +++ b/third_party/python/Objects/methodobject.c @@ -15,7 +15,6 @@ #include "third_party/python/Include/objimpl.h" #include "third_party/python/Include/pyhash.h" #include "third_party/python/Include/structmember.h" -/* clang-format off */ /* Free list for method objects to safe malloc/free overhead * The m_self element is used to chain the objects. diff --git a/third_party/python/Objects/moduleobject.c b/third_party/python/Objects/moduleobject.c index 7ee3737c2..1ecc77a90 100644 --- a/third_party/python/Objects/moduleobject.c +++ b/third_party/python/Objects/moduleobject.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ static Py_ssize_t max_module_number; diff --git a/third_party/python/Objects/namespaceobject.c b/third_party/python/Objects/namespaceobject.c index ce94dd166..8a776420b 100644 --- a/third_party/python/Objects/namespaceobject.c +++ b/third_party/python/Objects/namespaceobject.c @@ -17,7 +17,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ typedef struct { PyObject_HEAD diff --git a/third_party/python/Objects/object.c b/third_party/python/Objects/object.c index e89fcf21e..c75cc5f8b 100644 --- a/third_party/python/Objects/object.c +++ b/third_party/python/Objects/object.c @@ -39,7 +39,6 @@ #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/weakrefobject.h" -/* clang-format off */ _Py_IDENTIFIER(Py_Repr); _Py_IDENTIFIER(__bytes__); diff --git a/third_party/python/Objects/obmalloc.c b/third_party/python/Objects/obmalloc.c index a473d65c4..7c00fd03f 100644 --- a/third_party/python/Objects/obmalloc.c +++ b/third_party/python/Objects/obmalloc.c @@ -8,7 +8,6 @@ #include "libc/calls/calls.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" -#include "libc/intrin/bits.h" #include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/map.h" @@ -20,8 +19,8 @@ #include "third_party/python/Include/pylifecycle.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/pymem.h" +#include "libc/serialize.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ /* Python's malloc wrappers (see pymem.h) */ diff --git a/third_party/python/Objects/odictobject.c b/third_party/python/Objects/odictobject.c index d0480e6c5..a2d541abc 100644 --- a/third_party/python/Objects/odictobject.c +++ b/third_party/python/Objects/odictobject.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Objects/dict-common.h" -/* clang-format off */ /* Ordered Dictionary object implementation. diff --git a/third_party/python/Objects/rangeobject.c b/third_party/python/Objects/rangeobject.c index d5e357863..8c873a8b9 100644 --- a/third_party/python/Objects/rangeobject.c +++ b/third_party/python/Objects/rangeobject.c @@ -14,7 +14,6 @@ #include "third_party/python/Include/sliceobject.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ /* Support objects whose length is > PY_SSIZE_T_MAX. diff --git a/third_party/python/Objects/setobject.c b/third_party/python/Objects/setobject.c index 2fc47e39d..5c8f8bf1e 100644 --- a/third_party/python/Objects/setobject.c +++ b/third_party/python/Objects/setobject.c @@ -17,7 +17,6 @@ #include "third_party/python/Include/setobject.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ /* set object implementation diff --git a/third_party/python/Objects/sliceobject.c b/third_party/python/Objects/sliceobject.c index 2801dfb26..6f9763724 100644 --- a/third_party/python/Objects/sliceobject.c +++ b/third_party/python/Objects/sliceobject.c @@ -17,7 +17,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ /* Written by Jim Hugunin and Chris Chase. diff --git a/third_party/python/Objects/stringlib/asciilib.inc b/third_party/python/Objects/stringlib/asciilib.inc index 5757942fe..4aa4a39ba 100644 --- a/third_party/python/Objects/stringlib/asciilib.inc +++ b/third_party/python/Objects/stringlib/asciilib.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* this is sort of a hack. there's at least one place (formatting floats) where some stringlib code takes a different path if it's diff --git a/third_party/python/Objects/stringlib/codecs.inc b/third_party/python/Objects/stringlib/codecs.inc index 06f08ee4c..0cdcc6e73 100644 --- a/third_party/python/Objects/stringlib/codecs.inc +++ b/third_party/python/Objects/stringlib/codecs.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* stringlib: codec implementations */ diff --git a/third_party/python/Objects/stringlib/count.inc b/third_party/python/Objects/stringlib/count.inc index be86f75b2..e8b2003d3 100644 --- a/third_party/python/Objects/stringlib/count.inc +++ b/third_party/python/Objects/stringlib/count.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* stringlib: count implementation */ diff --git a/third_party/python/Objects/stringlib/ctype.inc b/third_party/python/Objects/stringlib/ctype.inc index 09add4ada..a3f1efe1b 100644 --- a/third_party/python/Objects/stringlib/ctype.inc +++ b/third_party/python/Objects/stringlib/ctype.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ #if STRINGLIB_IS_UNICODE # error "ctype.h only compatible with byte-wise strings" diff --git a/third_party/python/Objects/stringlib/eq.inc b/third_party/python/Objects/stringlib/eq.inc index 9b02b36ba..b1b027821 100644 --- a/third_party/python/Objects/stringlib/eq.inc +++ b/third_party/python/Objects/stringlib/eq.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* Fast unicode equal function optimized for dictobject.c and setobject.c */ diff --git a/third_party/python/Objects/stringlib/fastsearch.inc b/third_party/python/Objects/stringlib/fastsearch.inc index 5438823d7..9224bda12 100644 --- a/third_party/python/Objects/stringlib/fastsearch.inc +++ b/third_party/python/Objects/stringlib/fastsearch.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* stringlib: fastsearch implementation */ diff --git a/third_party/python/Objects/stringlib/find.inc b/third_party/python/Objects/stringlib/find.inc index 13cc9f569..cb42ae160 100644 --- a/third_party/python/Objects/stringlib/find.inc +++ b/third_party/python/Objects/stringlib/find.inc @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/modsupport.h" -/* clang-format off */ /* stringlib: find/index implementation */ diff --git a/third_party/python/Objects/stringlib/find_max_char.inc b/third_party/python/Objects/stringlib/find_max_char.inc index 55b70ae30..b99629265 100644 --- a/third_party/python/Objects/stringlib/find_max_char.inc +++ b/third_party/python/Objects/stringlib/find_max_char.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* Finding the optimal width of unicode characters in a buffer */ diff --git a/third_party/python/Objects/stringlib/join.inc b/third_party/python/Objects/stringlib/join.inc index dc51d46ca..a5fd7c259 100644 --- a/third_party/python/Objects/stringlib/join.inc +++ b/third_party/python/Objects/stringlib/join.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* stringlib: bytes joining implementation */ diff --git a/third_party/python/Objects/stringlib/localeutil.inc b/third_party/python/Objects/stringlib/localeutil.inc index 10e091830..e7a03deaf 100644 --- a/third_party/python/Objects/stringlib/localeutil.inc +++ b/third_party/python/Objects/stringlib/localeutil.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* _PyUnicode_InsertThousandsGrouping() helper functions */ diff --git a/third_party/python/Objects/stringlib/partition.inc b/third_party/python/Objects/stringlib/partition.inc index ebfa062f9..332718109 100644 --- a/third_party/python/Objects/stringlib/partition.inc +++ b/third_party/python/Objects/stringlib/partition.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* stringlib: partition implementation */ diff --git a/third_party/python/Objects/stringlib/replace.inc b/third_party/python/Objects/stringlib/replace.inc index e4890e6ee..9865852b0 100644 --- a/third_party/python/Objects/stringlib/replace.inc +++ b/third_party/python/Objects/stringlib/replace.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* stringlib: replace implementation */ diff --git a/third_party/python/Objects/stringlib/split.inc b/third_party/python/Objects/stringlib/split.inc index 44a8f5d73..e2b60db72 100644 --- a/third_party/python/Objects/stringlib/split.inc +++ b/third_party/python/Objects/stringlib/split.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* stringlib: split implementation */ diff --git a/third_party/python/Objects/stringlib/stringdefs.inc b/third_party/python/Objects/stringlib/stringdefs.inc index 685b5a9f8..9b09c262a 100644 --- a/third_party/python/Objects/stringlib/stringdefs.inc +++ b/third_party/python/Objects/stringlib/stringdefs.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ #ifndef STRINGLIB_STRINGDEFS_H #define STRINGLIB_STRINGDEFS_H diff --git a/third_party/python/Objects/stringlib/transmogrify.inc b/third_party/python/Objects/stringlib/transmogrify.inc index f0d2b687d..61160b968 100644 --- a/third_party/python/Objects/stringlib/transmogrify.inc +++ b/third_party/python/Objects/stringlib/transmogrify.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ #if STRINGLIB_IS_UNICODE # error "transmogrify.h only compatible with byte-wise strings" diff --git a/third_party/python/Objects/stringlib/ucs1lib.inc b/third_party/python/Objects/stringlib/ucs1lib.inc index 9c311f307..6819d867a 100644 --- a/third_party/python/Objects/stringlib/ucs1lib.inc +++ b/third_party/python/Objects/stringlib/ucs1lib.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* this is sort of a hack. there's at least one place (formatting floats) where some stringlib code takes a different path if it's diff --git a/third_party/python/Objects/stringlib/ucs2lib.inc b/third_party/python/Objects/stringlib/ucs2lib.inc index d3ca7a479..ff343b349 100644 --- a/third_party/python/Objects/stringlib/ucs2lib.inc +++ b/third_party/python/Objects/stringlib/ucs2lib.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* this is sort of a hack. there's at least one place (formatting floats) where some stringlib code takes a different path if it's diff --git a/third_party/python/Objects/stringlib/ucs4lib.inc b/third_party/python/Objects/stringlib/ucs4lib.inc index 28423cac0..170a38dd8 100644 --- a/third_party/python/Objects/stringlib/ucs4lib.inc +++ b/third_party/python/Objects/stringlib/ucs4lib.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* this is sort of a hack. there's at least one place (formatting floats) where some stringlib code takes a different path if it's diff --git a/third_party/python/Objects/stringlib/unicode_format.inc b/third_party/python/Objects/stringlib/unicode_format.inc index f187cd6eb..81f7fd5a7 100644 --- a/third_party/python/Objects/stringlib/unicode_format.inc +++ b/third_party/python/Objects/stringlib/unicode_format.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* unicode_format.h -- implementation of str.format(). diff --git a/third_party/python/Objects/structseq.c b/third_party/python/Objects/structseq.c index a6691877f..ce1b26170 100644 --- a/third_party/python/Objects/structseq.c +++ b/third_party/python/Objects/structseq.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/modsupport.h" #include "third_party/python/Include/objimpl.h" #include "third_party/python/Include/structmember.h" -/* clang-format off */ /* Implementation helper: a struct that looks like a tuple. See timemodule and posixmodule for example uses. */ diff --git a/third_party/python/Objects/tupleobject.c b/third_party/python/Objects/tupleobject.c index 2ef4b4efa..d7b780cc0 100644 --- a/third_party/python/Objects/tupleobject.c +++ b/third_party/python/Objects/tupleobject.c @@ -17,7 +17,6 @@ #include "third_party/python/Include/pystate.h" #include "third_party/python/Include/sliceobject.h" #include "third_party/python/Include/tupleobject.h" -/* clang-format off */ /* Tuple object implementation */ diff --git a/third_party/python/Objects/typeobject.c b/third_party/python/Objects/typeobject.c index f3231c164..198806784 100644 --- a/third_party/python/Objects/typeobject.c +++ b/third_party/python/Objects/typeobject.c @@ -30,7 +30,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/weakrefobject.h" -/* clang-format off */ static const short slotoffsets[] = { -1, /* invalid slot */ diff --git a/third_party/python/Objects/typeslots.inc b/third_party/python/Objects/typeslots.inc index d4f8b0baa..dc750cc0c 100644 --- a/third_party/python/Objects/typeslots.inc +++ b/third_party/python/Objects/typeslots.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* Generated by typeslots.py */ 0, 0, diff --git a/third_party/python/Objects/unicodectype.c b/third_party/python/Objects/unicodectype.c index 0e10d052e..bd09c1e8d 100644 --- a/third_party/python/Objects/unicodectype.c +++ b/third_party/python/Objects/unicodectype.c @@ -7,7 +7,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Modules/unicodedata.h" #include "third_party/python/Modules/unicodedata_unidata.h" -/* clang-format off */ /* * Unicode character type helpers. diff --git a/third_party/python/Objects/unicodeobject-deadcode.c b/third_party/python/Objects/unicodeobject-deadcode.c index 9d6b662bf..dbd4dc8d4 100644 --- a/third_party/python/Objects/unicodeobject-deadcode.c +++ b/third_party/python/Objects/unicodeobject-deadcode.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ #define _PyUnicode_STATE(op) \ (((PyASCIIObject *)(op))->state) diff --git a/third_party/python/Objects/unicodeobject.c b/third_party/python/Objects/unicodeobject.c index a784133d1..21b669e82 100644 --- a/third_party/python/Objects/unicodeobject.c +++ b/third_party/python/Objects/unicodeobject.c @@ -42,7 +42,6 @@ #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ PYTHON_PROVIDE("_string"); PYTHON_PROVIDE("_string.__doc__"); diff --git a/third_party/python/Objects/weakrefobject.c b/third_party/python/Objects/weakrefobject.c index ce51d7ce1..330053e3e 100644 --- a/third_party/python/Objects/weakrefobject.c +++ b/third_party/python/Objects/weakrefobject.c @@ -12,7 +12,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/weakrefobject.h" #include "third_party/quickjs/quickjs.h" -/* clang-format off */ #define GET_WEAKREFS_LISTPTR(o) \ ((PyWeakReference **) PyObject_GET_WEAKREFS_LISTPTR(o)) diff --git a/third_party/python/PC/clinic/winreg.inc b/third_party/python/PC/clinic/winreg.inc index 7bb1da3e8..09c5a70da 100644 --- a/third_party/python/PC/clinic/winreg.inc +++ b/third_party/python/PC/clinic/winreg.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /*[clinic input] preserve diff --git a/third_party/python/PC/clinic/winsound.inc b/third_party/python/PC/clinic/winsound.inc index b794f4f08..500e476d8 100644 --- a/third_party/python/PC/clinic/winsound.inc +++ b/third_party/python/PC/clinic/winsound.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /*[clinic input] preserve diff --git a/third_party/python/PC/dl_nt.c b/third_party/python/PC/dl_nt.c index 207a01241..4a731be14 100644 --- a/third_party/python/PC/dl_nt.c +++ b/third_party/python/PC/dl_nt.c @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* diff --git a/third_party/python/PC/getpathp.c b/third_party/python/PC/getpathp.c index c1c277a00..c66d2f4a3 100644 --- a/third_party/python/PC/getpathp.c +++ b/third_party/python/PC/getpathp.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "windows.h" -/* clang-format off */ /* Return the initial module search path. */ /* Used by DOS, Windows 3.1, Windows 95/98, Windows NT. */ diff --git a/third_party/python/PC/launcher.c b/third_party/python/PC/launcher.c index bf7a38493..aad25f325 100644 --- a/third_party/python/PC/launcher.c +++ b/third_party/python/PC/launcher.c @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* * Copyright (C) 2011-2013 Vinay Sajip. diff --git a/third_party/python/PC/winreg.c b/third_party/python/PC/winreg.c index 0aa32f944..35d51c1d5 100644 --- a/third_party/python/PC/winreg.c +++ b/third_party/python/PC/winreg.c @@ -42,7 +42,6 @@ #define KEY_EXECUTE kNtKeyExecute #define KEY_ALL_ACCESS kNtKeyAllAccess -/* clang-format off */ /* winreg.c diff --git a/third_party/python/PC/winsound.c b/third_party/python/PC/winsound.c index fbacbf7b8..46c75ffc0 100644 --- a/third_party/python/PC/winsound.c +++ b/third_party/python/PC/winsound.c @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ /* Author: Toby Dickenson * diff --git a/third_party/python/Parser/acceler.c b/third_party/python/Parser/acceler.c index e90c49208..be1ff27f5 100644 --- a/third_party/python/Parser/acceler.c +++ b/third_party/python/Parser/acceler.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pgenheaders.h" #include "third_party/python/Include/token.h" #include "third_party/python/Parser/parser.h" -/* clang-format off */ /* The parser as originally conceived had disappointing performance. This module does some precomputation that speeds up the selection diff --git a/third_party/python/Parser/asdl_c.py b/third_party/python/Parser/asdl_c.py index fe4e8b1a8..6f9f648e7 100644 --- a/third_party/python/Parser/asdl_c.py +++ b/third_party/python/Parser/asdl_c.py @@ -1288,7 +1288,6 @@ def main(srcfile, dump_module=False): #include \"third_party/python/Include/asdl.h\"\n\ #if !(__ASSEMBLER__ + __LINKER__ + 0)\n\ COSMOPOLITAN_C_START_\n\ -/* clang-format off */\n\ /* File automatically generated by %s. */\n\ \n\ " % argv0) @@ -1323,7 +1322,6 @@ COSMOPOLITAN_C_END_\n\ #include "third_party/python/Include/pythonrun.h"\n\ #include "third_party/python/Include/tupleobject.h"\n\ #include "third_party/python/Include/yoink.h"\n\ -/* clang-format off */\n\ \n\ PYTHON_PROVIDE("_ast");\n\ \n\ diff --git a/third_party/python/Parser/bitset.c b/third_party/python/Parser/bitset.c index 57d65c16c..4c17bebb0 100644 --- a/third_party/python/Parser/bitset.c +++ b/third_party/python/Parser/bitset.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/bitset.h" #include "third_party/python/Include/objimpl.h" -/* clang-format off */ bitset newbitset(int nbits) diff --git a/third_party/python/Parser/firstsets.c b/third_party/python/Parser/firstsets.c index 477a3f011..84498f0ec 100644 --- a/third_party/python/Parser/firstsets.c +++ b/third_party/python/Parser/firstsets.c @@ -9,7 +9,6 @@ #include "third_party/python/Include/objimpl.h" #include "third_party/python/Include/pgenheaders.h" #include "third_party/python/Include/token.h" -/* clang-format off */ extern int Py_DebugFlag; diff --git a/third_party/python/Parser/grammar.c b/third_party/python/Parser/grammar.c index 17ba0b650..f739c0303 100644 --- a/third_party/python/Parser/grammar.c +++ b/third_party/python/Parser/grammar.c @@ -10,7 +10,6 @@ #include "third_party/python/Include/pgenheaders.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/token.h" -/* clang-format off */ extern int Py_DebugFlag; diff --git a/third_party/python/Parser/grammar1.c b/third_party/python/Parser/grammar1.c index fc70c578d..69782e801 100644 --- a/third_party/python/Parser/grammar1.c +++ b/third_party/python/Parser/grammar1.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/grammar.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/token.h" -/* clang-format off */ /* Return the DFA for the given type */ dfa * diff --git a/third_party/python/Parser/listnode.c b/third_party/python/Parser/listnode.c index 131f5539a..bbabd41cb 100644 --- a/third_party/python/Parser/listnode.c +++ b/third_party/python/Parser/listnode.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/node.h" #include "third_party/python/Include/pgenheaders.h" #include "third_party/python/Include/token.h" -/* clang-format off */ static void list1node(FILE *, node *); static void listnode(FILE *, node *); diff --git a/third_party/python/Parser/metagrammar.c b/third_party/python/Parser/metagrammar.c index 411910ed6..029bd1235 100644 --- a/third_party/python/Parser/metagrammar.c +++ b/third_party/python/Parser/metagrammar.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/metagrammar.h" #include "third_party/python/Include/pgen.h" #include "third_party/python/Include/pgenheaders.h" -/* clang-format off */ static arc arcs_0_0[3] = { {2, 0}, diff --git a/third_party/python/Parser/myreadline.c b/third_party/python/Parser/myreadline.c index 1a1fe1b7b..030e7c7c9 100644 --- a/third_party/python/Parser/myreadline.c +++ b/third_party/python/Parser/myreadline.c @@ -14,7 +14,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/pystate.h" -/* clang-format off */ /* Readline interface for tokenizer.c and [raw_]input() in bltinmodule.c. By default, or when stdin is not a tty device, we have a super diff --git a/third_party/python/Parser/node.c b/third_party/python/Parser/node.c index ce8372a9d..a5d9336f8 100644 --- a/third_party/python/Parser/node.c +++ b/third_party/python/Parser/node.c @@ -9,7 +9,6 @@ #include "third_party/python/Include/errcode.h" #include "third_party/python/Include/node.h" #include "third_party/python/Include/objimpl.h" -/* clang-format off */ node * PyNode_New(int type) diff --git a/third_party/python/Parser/parser.c b/third_party/python/Parser/parser.c index bacbf68df..350909b70 100644 --- a/third_party/python/Parser/parser.c +++ b/third_party/python/Parser/parser.c @@ -13,7 +13,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/token.h" #include "third_party/python/Parser/parser.h" -/* clang-format off */ /* diff --git a/third_party/python/Parser/parser.h b/third_party/python/Parser/parser.h index 6ffe364e4..34a559885 100644 --- a/third_party/python/Parser/parser.h +++ b/third_party/python/Parser/parser.h @@ -3,7 +3,6 @@ #include "third_party/python/Include/grammar.h" #include "third_party/python/Include/node.h" COSMOPOLITAN_C_START_ -/* clang-format off */ #define MAXSTACK 1500 diff --git a/third_party/python/Parser/parsetok.c b/third_party/python/Parser/parsetok.c index 258ae5c3f..7092d1e75 100644 --- a/third_party/python/Parser/parsetok.c +++ b/third_party/python/Parser/parsetok.c @@ -14,7 +14,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Parser/parser.h" #include "third_party/python/Parser/tokenizer.h" -/* clang-format off */ static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int *); static int initerr(perrdetail *err_ret, PyObject * filename); diff --git a/third_party/python/Parser/pgen.c b/third_party/python/Parser/pgen.c index c1ba4f4c2..c4b902843 100644 --- a/third_party/python/Parser/pgen.c +++ b/third_party/python/Parser/pgen.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pgen.h" #include "third_party/python/Include/pgenheaders.h" #include "third_party/python/Include/token.h" -/* clang-format off */ /* diff --git a/third_party/python/Parser/pgenmain.c b/third_party/python/Parser/pgenmain.c index e2cf524b8..f1c38066f 100644 --- a/third_party/python/Parser/pgenmain.c +++ b/third_party/python/Parser/pgenmain.c @@ -14,7 +14,6 @@ #include "third_party/python/Include/pgenheaders.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymem.h" -/* clang-format off */ /* This expects a filename containing the grammar as argv[1] (UNIX) or asks the console for such a file name (THINK C). diff --git a/third_party/python/Parser/printgrammar.c b/third_party/python/Parser/printgrammar.c index b1f97a80f..8dbef295b 100644 --- a/third_party/python/Parser/printgrammar.c +++ b/third_party/python/Parser/printgrammar.c @@ -7,7 +7,6 @@ #define PGEN #include "third_party/python/Include/grammar.h" #include "third_party/python/Include/pgenheaders.h" -/* clang-format off */ /* Print a bunch of C initializers that represent a grammar */ diff --git a/third_party/python/Parser/tokenizer.c b/third_party/python/Parser/tokenizer.c index 559bd8235..48014c2b9 100644 --- a/third_party/python/Parser/tokenizer.c +++ b/third_party/python/Parser/tokenizer.c @@ -25,7 +25,6 @@ #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/unicodeobject.h" #endif -/* clang-format off */ /* Tokenizer implementation */ diff --git a/third_party/python/Parser/tokenizer.h b/third_party/python/Parser/tokenizer.h index 33e47ec45..8b798cfba 100644 --- a/third_party/python/Parser/tokenizer.h +++ b/third_party/python/Parser/tokenizer.h @@ -5,7 +5,6 @@ #ifdef __cplusplus extern "C" { #endif -/* clang-format off */ #define MAXINDENT 100 /* Max indentation level */ diff --git a/third_party/python/Python/Python-ast.c b/third_party/python/Python/Python-ast.c index ec400aa03..e12a51054 100644 --- a/third_party/python/Python/Python-ast.c +++ b/third_party/python/Python/Python-ast.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/pythonrun.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_ast"); diff --git a/third_party/python/Python/_warnings.c b/third_party/python/Python/_warnings.c index 95a6764dc..1f2c8f1cd 100644 --- a/third_party/python/Python/_warnings.c +++ b/third_party/python/Python/_warnings.c @@ -24,7 +24,6 @@ #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_warnings"); diff --git a/third_party/python/Python/asdl.c b/third_party/python/Python/asdl.c index e5947f50e..94d28b57f 100644 --- a/third_party/python/Python/asdl.c +++ b/third_party/python/Python/asdl.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/asdl.h" #include "third_party/python/Include/pyerrors.h" -/* clang-format off */ asdl_seq * _Py_asdl_seq_new(Py_ssize_t size, PyArena *arena) diff --git a/third_party/python/Python/ast.c b/third_party/python/Python/ast.c index df287cd85..82b804190 100644 --- a/third_party/python/Python/ast.c +++ b/third_party/python/Python/ast.c @@ -30,7 +30,6 @@ #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/warnings.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ static int validate_stmts(asdl_seq *); static int validate_exprs(asdl_seq *, expr_context_ty, int); diff --git a/third_party/python/Python/atexit.c b/third_party/python/Python/atexit.c index fc59803f9..218b5e07d 100644 --- a/third_party/python/Python/atexit.c +++ b/third_party/python/Python/atexit.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ #define NEXITFUNCS 32 diff --git a/third_party/python/Python/bltinmodule.c b/third_party/python/Python/bltinmodule.c index f0d4b3c76..aaa327bf4 100644 --- a/third_party/python/Python/bltinmodule.c +++ b/third_party/python/Python/bltinmodule.c @@ -46,7 +46,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("builtins.ArithmeticError"); PYTHON_PROVIDE("builtins.AssertionError"); diff --git a/third_party/python/Python/ceval.c b/third_party/python/Python/ceval.c index 2f69dd4af..39fbf77b0 100644 --- a/third_party/python/Python/ceval.c +++ b/third_party/python/Python/ceval.c @@ -36,7 +36,6 @@ #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ /* Execute compiled code */ diff --git a/third_party/python/Python/ceval_gil.inc b/third_party/python/Python/ceval_gil.inc index ef58897ea..c3fd4b61d 100644 --- a/third_party/python/Python/ceval_gil.inc +++ b/third_party/python/Python/ceval_gil.inc @@ -9,7 +9,6 @@ #include "libc/thread/thread2.h" #include "third_party/python/Include/pylifecycle.h" #include "third_party/python/Python/condvar.h" -/* clang-format off */ /* * Implementation of the Global Interpreter Lock (GIL). diff --git a/third_party/python/Python/clinic/bltinmodule.inc b/third_party/python/Python/clinic/bltinmodule.inc index 224b5c062..fa327da0f 100644 --- a/third_party/python/Python/clinic/bltinmodule.inc +++ b/third_party/python/Python/clinic/bltinmodule.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Python/clinic/import.inc b/third_party/python/Python/clinic/import.inc index b64071b2e..ddd694ff9 100644 --- a/third_party/python/Python/clinic/import.inc +++ b/third_party/python/Python/clinic/import.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /*[clinic input] preserve [clinic start generated code]*/ diff --git a/third_party/python/Python/codecs.c b/third_party/python/Python/codecs.c index 7d21b6a4d..b26a869cf 100644 --- a/third_party/python/Python/codecs.c +++ b/third_party/python/Python/codecs.c @@ -22,7 +22,6 @@ #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/ucnhash.h" #include "third_party/python/Modules/unicodedata.h" -/* clang-format off */ /* ------------------------------------------------------------------------ diff --git a/third_party/python/Python/compile.c b/third_party/python/Python/compile.c index 99c643665..ad1076172 100644 --- a/third_party/python/Python/compile.c +++ b/third_party/python/Python/compile.c @@ -25,7 +25,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/warnings.h" #include "third_party/python/Python/wordcode_helpers.inc" -/* clang-format off */ /* * This file compiles an abstract syntax tree (AST) into Python bytecode. diff --git a/third_party/python/Python/condvar.h b/third_party/python/Python/condvar.h index cccd81e51..b9a792585 100644 --- a/third_party/python/Python/condvar.h +++ b/third_party/python/Python/condvar.h @@ -1,7 +1,6 @@ #ifndef _CONDVAR_H_ #define _CONDVAR_H_ #include "libc/time/time.h" -/* clang-format off */ /* * Portable condition variable support for windows and pthreads. diff --git a/third_party/python/Python/cosmomodule.c b/third_party/python/Python/cosmomodule.c index 6665e326d..9b28038ba 100644 --- a/third_party/python/Python/cosmomodule.c +++ b/third_party/python/Python/cosmomodule.c @@ -44,7 +44,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/yoink.h" #include "third_party/xed/x86.h" -/* clang-format off */ PYTHON_PROVIDE("cosmo"); PYTHON_PROVIDE("cosmo.exit1"); diff --git a/third_party/python/Python/dtoa.c b/third_party/python/Python/dtoa.c index 30013e25d..eacc08d8b 100644 --- a/third_party/python/Python/dtoa.c +++ b/third_party/python/Python/dtoa.c @@ -10,7 +10,6 @@ #include "libc/runtime/runtime.h" #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/pyport.h" -/* clang-format off */ /**************************************************************** * diff --git a/third_party/python/Python/dynamic_annotations.c b/third_party/python/Python/dynamic_annotations.c index 3f39cb553..2dd7ac891 100644 --- a/third_party/python/Python/dynamic_annotations.c +++ b/third_party/python/Python/dynamic_annotations.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/dynamic_annotations.h" -/* clang-format off */ /* Copyright (c) 2008-2009, Google Inc. * All rights reserved. diff --git a/third_party/python/Python/dynload_dl.c b/third_party/python/Python/dynload_dl.c index fdc49f02d..6462086da 100644 --- a/third_party/python/Python/dynload_dl.c +++ b/third_party/python/Python/dynload_dl.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Python/importdl.h" -/* clang-format off */ /* Support for dynamic loading of extension modules */ diff --git a/third_party/python/Python/dynload_shlib.c b/third_party/python/Python/dynload_shlib.c index dfbf21ca2..ba9d11b5c 100644 --- a/third_party/python/Python/dynload_shlib.c +++ b/third_party/python/Python/dynload_shlib.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pystate.h" #include "third_party/python/Python/importdl.h" -/* clang-format off */ #define SOABI "cpython36m-x86_64-cosmo" diff --git a/third_party/python/Python/dynload_stub.c b/third_party/python/Python/dynload_stub.c index de551cf21..0bb24f421 100644 --- a/third_party/python/Python/dynload_stub.c +++ b/third_party/python/Python/dynload_stub.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Python/importdl.h" -/* clang-format off */ /* This module provides the necessary stubs for when dynamic loading is not present. */ diff --git a/third_party/python/Python/dynload_win.c b/third_party/python/Python/dynload_win.c index 1a2817e5a..a63356ea1 100644 --- a/third_party/python/Python/dynload_win.c +++ b/third_party/python/Python/dynload_win.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/patchlevel.h" #include "third_party/python/Python/importdl.h" -/* clang-format off */ // "activation context" magic - see dl_nt.c... #if HAVE_SXS diff --git a/third_party/python/Python/errors.c b/third_party/python/Python/errors.c index 7cb1318fc..9b43b27e1 100644 --- a/third_party/python/Python/errors.c +++ b/third_party/python/Python/errors.c @@ -27,7 +27,6 @@ #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ _Py_IDENTIFIER(builtins); _Py_IDENTIFIER(stderr); diff --git a/third_party/python/Python/fatality.c b/third_party/python/Python/fatality.c index 85d687865..f5dc14aee 100644 --- a/third_party/python/Python/fatality.c +++ b/third_party/python/Python/fatality.c @@ -14,7 +14,6 @@ #include "third_party/python/Include/pythonrun.h" #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/traceback.h" -/* clang-format off */ _Py_IDENTIFIER(flush); _Py_IDENTIFIER(stderr); diff --git a/third_party/python/Python/fdisinteractive.c b/third_party/python/Python/fdisinteractive.c index 45d495a5a..981527f1e 100644 --- a/third_party/python/Python/fdisinteractive.c +++ b/third_party/python/Python/fdisinteractive.c @@ -7,7 +7,6 @@ #include "libc/calls/calls.h" #include "third_party/python/Include/pydebug.h" #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ /* * The file descriptor fd is considered ``interactive'' if either diff --git a/third_party/python/Python/fileutils.c b/third_party/python/Python/fileutils.c index 73534591b..9264394ee 100644 --- a/third_party/python/Python/fileutils.c +++ b/third_party/python/Python/fileutils.c @@ -25,7 +25,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/pyport.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ wchar_t* _Py_DecodeUTF8_surrogateescape(const char *, Py_ssize_t); diff --git a/third_party/python/Python/finalize.c b/third_party/python/Python/finalize.c index 82ac66151..d75910647 100644 --- a/third_party/python/Python/finalize.c +++ b/third_party/python/Python/finalize.c @@ -17,7 +17,6 @@ #include "third_party/python/Include/pystate.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ /* Undo the effect of Py_Initialize(). diff --git a/third_party/python/Python/flags.c b/third_party/python/Python/flags.c index ae54fad6d..d0f920d89 100644 --- a/third_party/python/Python/flags.c +++ b/third_party/python/Python/flags.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/pydebug.h" #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ /* Global configuration variable declarations are in pydebug.h */ /* XXX (ncoghlan): move those declarations to pylifecycle.h? */ diff --git a/third_party/python/Python/flushstdfiles.c b/third_party/python/Python/flushstdfiles.c index eabb77d8b..1816baa09 100644 --- a/third_party/python/Python/flushstdfiles.c +++ b/third_party/python/Python/flushstdfiles.c @@ -9,7 +9,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pylifecycle.h" #include "third_party/python/Include/sysmodule.h" -/* clang-format off */ _Py_IDENTIFIER(flush); _Py_IDENTIFIER(stdout); diff --git a/third_party/python/Python/formatter_unicode.c b/third_party/python/Python/formatter_unicode.c index e078df711..ad13c346c 100644 --- a/third_party/python/Python/formatter_unicode.c +++ b/third_party/python/Python/formatter_unicode.c @@ -19,7 +19,6 @@ #include "third_party/python/Include/pyport.h" #include "third_party/python/Include/pystrtod.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ /* implements the unicode (as opposed to string) version of the built-in formatters for string, int, float. that is, the versions diff --git a/third_party/python/Python/frozen.c b/third_party/python/Python/frozen.c index 21e287a0a..6a11f9d0f 100644 --- a/third_party/python/Python/frozen.c +++ b/third_party/python/Python/frozen.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/import.h" -/* clang-format off */ #include "o//third_party/python/Python/importlib.inc" #include "o//third_party/python/Python/importlib_external.inc" diff --git a/third_party/python/Python/frozenmain.c b/third_party/python/Python/frozenmain.c index b679b35e0..8deaaaa38 100644 --- a/third_party/python/Python/frozenmain.c +++ b/third_party/python/Python/frozenmain.c @@ -15,7 +15,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/pythonrun.h" #include "third_party/python/Include/sysmodule.h" -/* clang-format off */ #ifdef MS_WINDOWS extern void PyWinFreeze_ExeInit(void); diff --git a/third_party/python/Python/future.c b/third_party/python/Python/future.c index e0d80ffd0..22bdf163f 100644 --- a/third_party/python/Python/future.c +++ b/third_party/python/Python/future.c @@ -13,7 +13,6 @@ #include "third_party/python/Include/symtable.h" #include "third_party/python/Include/token.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined" #define ERR_LATE_FUTURE \ diff --git a/third_party/python/Python/getargs.c b/third_party/python/Python/getargs.c index 0c14dba00..3005729d6 100644 --- a/third_party/python/Python/getargs.c +++ b/third_party/python/Python/getargs.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/pymem.h" -/* clang-format off */ #define FLAG_COMPAT 1 #define FLAG_SIZE_T 2 diff --git a/third_party/python/Python/getcompiler.c b/third_party/python/Python/getcompiler.c index 2d9841344..64ad2a610 100644 --- a/third_party/python/Python/getcompiler.c +++ b/third_party/python/Python/getcompiler.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ #ifndef COMPILER #ifdef __llvm__ diff --git a/third_party/python/Python/getcopyright.c b/third_party/python/Python/getcopyright.c index 56a669283..afc1935ae 100644 --- a/third_party/python/Python/getcopyright.c +++ b/third_party/python/Python/getcopyright.c @@ -9,7 +9,6 @@ #include "libc/stdio/append.h" #include "libc/str/str.h" #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ Python 3.6 (https://docs.python.org/3/license.html)\\n\ diff --git a/third_party/python/Python/getopt.c b/third_party/python/Python/getopt.c index facd53020..7d1d4e483 100644 --- a/third_party/python/Python/getopt.c +++ b/third_party/python/Python/getopt.c @@ -7,12 +7,10 @@ #include "libc/stdio/stdio.h" #include "libc/str/str.h" #include "third_party/python/Include/pygetopt.h" -/* clang-format off */ asm(".ident\t\"\\n\\n\ python getopt (isc license)\\n\ Copyright 1992-1994 David Gottner\""); -/* clang-format off */ /*---------------------------------------------------------------------------* * diff --git a/third_party/python/Python/getplatform.c b/third_party/python/Python/getplatform.c index 0ce444e72..4e5834541 100644 --- a/third_party/python/Python/getplatform.c +++ b/third_party/python/Python/getplatform.c @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ const char * Py_GetPlatform(void) diff --git a/third_party/python/Python/getsig.c b/third_party/python/Python/getsig.c index c93dcfe74..b65be6f9d 100644 --- a/third_party/python/Python/getsig.c +++ b/third_party/python/Python/getsig.c @@ -9,7 +9,6 @@ #include "third_party/python/Include/pydebug.h" #include "third_party/python/Include/pylifecycle.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PyOS_sighandler_t PyOS_getsig(int sig) diff --git a/third_party/python/Python/getversion.c b/third_party/python/Python/getversion.c index 404070a4a..12aad1002 100644 --- a/third_party/python/Python/getversion.c +++ b/third_party/python/Python/getversion.c @@ -7,7 +7,6 @@ #include "third_party/python/Include/patchlevel.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ /* Return the full version string. */ diff --git a/third_party/python/Python/graminit.c b/third_party/python/Python/graminit.c index aaed0f20e..525051044 100644 --- a/third_party/python/Python/graminit.c +++ b/third_party/python/Python/graminit.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/grammar.h" #include "third_party/python/Include/pgenheaders.h" -/* clang-format off */ /* Generated by Parser/pgen */ diff --git a/third_party/python/Python/import.c b/third_party/python/Python/import.c index db38a72fb..bb40a5232 100644 --- a/third_party/python/Python/import.c +++ b/third_party/python/Python/import.c @@ -10,7 +10,6 @@ #include "libc/calls/struct/stat.macros.h" #include "libc/fmt/conv.h" #include "libc/fmt/libgen.h" -#include "libc/intrin/bits.h" #include "libc/macros.internal.h" #include "libc/mem/alg.h" #include "libc/mem/gc.h" @@ -51,8 +50,8 @@ #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/weakrefobject.h" #include "third_party/python/Include/yoink.h" +#include "libc/serialize.h" #include "third_party/python/Python/importdl.h" -/* clang-format off */ PYTHON_PROVIDE("_imp"); PYTHON_PROVIDE("_imp.__doc__"); diff --git a/third_party/python/Python/importdl.c b/third_party/python/Python/importdl.c index 881880ab7..7c14f4c34 100644 --- a/third_party/python/Python/importdl.c +++ b/third_party/python/Python/importdl.c @@ -12,7 +12,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Python/importdl.h" -/* clang-format off */ /* Support for dynamic loading of extension modules */ diff --git a/third_party/python/Python/initfsencoding.c b/third_party/python/Python/initfsencoding.c index 1ebaaabdb..d2523c068 100644 --- a/third_party/python/Python/initfsencoding.c +++ b/third_party/python/Python/initfsencoding.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pystate.h" #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ _Py_IDENTIFIER(name); diff --git a/third_party/python/Python/initimport.c b/third_party/python/Python/initimport.c index 23cc1f019..2a94ee282 100644 --- a/third_party/python/Python/initimport.c +++ b/third_party/python/Python/initimport.c @@ -20,7 +20,6 @@ #include "third_party/python/Include/pythonrun.h" #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("_frozen_importlib"); PYTHON_PROVIDE("_frozen_importlib_external"); diff --git a/third_party/python/Python/initmain.c b/third_party/python/Python/initmain.c index e2e9cdd28..fe393e205 100644 --- a/third_party/python/Python/initmain.c +++ b/third_party/python/Python/initmain.c @@ -10,7 +10,6 @@ #include "third_party/python/Include/pylifecycle.h" #include "third_party/python/Include/pystate.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("__main__"); diff --git a/third_party/python/Python/initsigs.c b/third_party/python/Python/initsigs.c index aed2770eb..412aebade 100644 --- a/third_party/python/Python/initsigs.c +++ b/third_party/python/Python/initsigs.c @@ -9,7 +9,6 @@ #include "third_party/python/Include/intrcheck.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ void _Py_InitSigs(void) diff --git a/third_party/python/Python/initsite.c b/third_party/python/Python/initsite.c index 75c97c0cc..60db7768d 100644 --- a/third_party/python/Python/initsite.c +++ b/third_party/python/Python/initsite.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pylifecycle.h" #include "third_party/python/Include/pythonrun.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ /* PYTHON_YOINK("site"); */ /* PYTHON_YOINK("_sysconfigdata_m_cosmo_x86_64_cosmo"); */ diff --git a/third_party/python/Python/initstdio.c b/third_party/python/Python/initstdio.c index 42e1a3bcb..95d0a8aeb 100644 --- a/third_party/python/Python/initstdio.c +++ b/third_party/python/Python/initstdio.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ /* PYTHON_YOINK("io"); */ /* PYTHON_YOINK("encodings.aliases"); */ diff --git a/third_party/python/Python/marshal.c b/third_party/python/Python/marshal.c index 91d30331c..952f740fe 100644 --- a/third_party/python/Python/marshal.c +++ b/third_party/python/Python/marshal.c @@ -32,7 +32,6 @@ #include "third_party/python/Include/tupleobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/Modules/hashtable.h" -/* clang-format off */ PYTHON_PROVIDE("marshal"); diff --git a/third_party/python/Python/modsupport.c b/third_party/python/Python/modsupport.c index 813b873df..acc2525b3 100644 --- a/third_party/python/Python/modsupport.c +++ b/third_party/python/Python/modsupport.c @@ -15,7 +15,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/tupleobject.h" -/* clang-format off */ #define FLAG_SIZE_T 1 typedef double va_double; diff --git a/third_party/python/Python/mysnprintf.c b/third_party/python/Python/mysnprintf.c index 58c6f2df4..9bd65f9a1 100644 --- a/third_party/python/Python/mysnprintf.c +++ b/third_party/python/Python/mysnprintf.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "third_party/python/Include/pyerrors.h" -/* clang-format off */ /* snprintf() wrappers. If the platform has vsnprintf, we use it, else we emulate it in a half-hearted way. Even if the platform has it, we wrap diff --git a/third_party/python/Python/mystrtoul.c b/third_party/python/Python/mystrtoul.c index 8ee8477a2..e12b77ffb 100644 --- a/third_party/python/Python/mystrtoul.c +++ b/third_party/python/Python/mystrtoul.c @@ -10,7 +10,6 @@ #include "third_party/python/Include/pyctype.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ /* Static overflow check values for bases 2 through 36. * smallmax[base] is the largest unsigned long i such that diff --git a/third_party/python/Python/opcode_targets.inc b/third_party/python/Python/opcode_targets.inc index a218b7a3d..77aad46e1 100644 --- a/third_party/python/Python/opcode_targets.inc +++ b/third_party/python/Python/opcode_targets.inc @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ static void *const opcode_targets[256] = { &&_unknown_opcode, diff --git a/third_party/python/Python/peephole.c b/third_party/python/Python/peephole.c index d111ee433..c1b4768d2 100644 --- a/third_party/python/Python/peephole.c +++ b/third_party/python/Python/peephole.c @@ -21,7 +21,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Python/wordcode_helpers.inc" #include "third_party/quickjs/internal.h" -/* clang-format off */ /* Peephole optimizations for bytecode compiler. */ diff --git a/third_party/python/Python/progname.c b/third_party/python/Python/progname.c index 6c5301ab0..a68617f04 100644 --- a/third_party/python/Python/progname.c +++ b/third_party/python/Python/progname.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ #ifdef MS_WINDOWS static wchar_t *progname = L"python"; diff --git a/third_party/python/Python/pyarena.c b/third_party/python/Python/pyarena.c index b49f42dbc..48b506975 100644 --- a/third_party/python/Python/pyarena.c +++ b/third_party/python/Python/pyarena.c @@ -12,7 +12,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/pymem.h" -/* clang-format off */ /* A simple arena block structure. diff --git a/third_party/python/Python/pyfpe.c b/third_party/python/Python/pyfpe.c index bf7de3823..06cba3fef 100644 --- a/third_party/python/Python/pyfpe.c +++ b/third_party/python/Python/pyfpe.c @@ -4,7 +4,6 @@ │ Python 3 │ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ -/* clang-format off */ #include "third_party/python/pyconfig.h" #include "third_party/python/Include/pyfpe.h" /* diff --git a/third_party/python/Python/pyhash.c b/third_party/python/Python/pyhash.c index 20ba44327..5a6ef4997 100644 --- a/third_party/python/Python/pyhash.c +++ b/third_party/python/Python/pyhash.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "third_party/python/Include/pyhash.h" -/* clang-format off */ /* Set of hash utility functions to help maintaining the invariant that if a==b then hash(a)==hash(b) diff --git a/third_party/python/Python/pylifecycle.c b/third_party/python/Python/pylifecycle.c index 067e7de38..2ee2e33ec 100644 --- a/third_party/python/Python/pylifecycle.c +++ b/third_party/python/Python/pylifecycle.c @@ -49,7 +49,6 @@ #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ /* Python interpreter top-level routines, including init/exit */ diff --git a/third_party/python/Python/pymath.c b/third_party/python/Python/pymath.c index a6aeb35ed..d557edd7e 100644 --- a/third_party/python/Python/pymath.c +++ b/third_party/python/Python/pymath.c @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/pyconfig.h" -/* clang-format off */ #ifdef X87_DOUBLE_ROUNDING /* On x86 platforms using an x87 FPU, this function is called from the diff --git a/third_party/python/Python/pystate.c b/third_party/python/Python/pystate.c index e4a71ed2a..c40d03183 100644 --- a/third_party/python/Python/pystate.c +++ b/third_party/python/Python/pystate.c @@ -16,7 +16,6 @@ #include "third_party/python/Include/pydebug.h" #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymem.h" -/* clang-format off */ #if defined(__SANITIZE_ADDRESS__) || defined(__SANITIZE_UNDEFINED__) __static_yoink("__die"); /* to guarantee backtraces */ diff --git a/third_party/python/Python/pystrcmp.c b/third_party/python/Python/pystrcmp.c index 192a16b5e..c382903b3 100644 --- a/third_party/python/Python/pystrcmp.c +++ b/third_party/python/Python/pystrcmp.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pyctype.h" -/* clang-format off */ /* Cross platform case insensitive string compare functions */ diff --git a/third_party/python/Python/pystrhex.c b/third_party/python/Python/pystrhex.c index bf51a6029..71e4fc984 100644 --- a/third_party/python/Python/pystrhex.c +++ b/third_party/python/Python/pystrhex.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ /* bytes to hex implementation */ diff --git a/third_party/python/Python/pystrtod.c b/third_party/python/Python/pystrtod.c index 9071fd3e9..f6e06892d 100644 --- a/third_party/python/Python/pystrtod.c +++ b/third_party/python/Python/pystrtod.c @@ -15,7 +15,6 @@ #include "third_party/python/Include/pymem.h" #include "third_party/python/Include/pyport.h" #include "third_party/python/Include/pystrtod.h" -/* clang-format off */ /* Case-insensitive string match used for nan and inf detection; t should be lower-case. Returns 1 for a successful match, 0 otherwise. */ diff --git a/third_party/python/Python/pythonhome.c b/third_party/python/Python/pythonhome.c index 849e99bc2..38207c6e6 100644 --- a/third_party/python/Python/pythonhome.c +++ b/third_party/python/Python/pythonhome.c @@ -9,7 +9,6 @@ #include "third_party/python/Include/pydebug.h" #include "third_party/python/Include/pylifecycle.h" #include "third_party/python/Include/pymacro.h" -/* clang-format off */ static wchar_t *default_home = NULL; static wchar_t env_home[MAXPATHLEN+1]; diff --git a/third_party/python/Python/pythonrun.c b/third_party/python/Python/pythonrun.c index 762fd5a6c..0aa88ad4e 100644 --- a/third_party/python/Python/pythonrun.c +++ b/third_party/python/Python/pythonrun.c @@ -34,7 +34,6 @@ #include "third_party/python/Include/token.h" #include "third_party/python/Include/traceback.h" #include "third_party/python/Include/unicodeobject.h" -/* clang-format off */ /* Python interpreter top-level routines, including init/exit */ diff --git a/third_party/python/Python/pytime.c b/third_party/python/Python/pytime.c index 6bfb38c60..2f9cc7d5e 100644 --- a/third_party/python/Python/pytime.c +++ b/third_party/python/Python/pytime.c @@ -16,7 +16,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/pymath.h" -/* clang-format off */ #define _PyTime_check_mul_overflow(a, b) \ (assert(b > 0), \ diff --git a/third_party/python/Python/random.c b/third_party/python/Python/random.c index 7aac024e1..8f4dd89d3 100644 --- a/third_party/python/Python/random.c +++ b/third_party/python/Python/random.c @@ -25,7 +25,6 @@ #include "third_party/python/Include/pyhash.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ #ifdef Py_DEBUG int _Py_HashSecret_Initialized = 0; diff --git a/third_party/python/Python/recursive.c b/third_party/python/Python/recursive.c index d7e92a6e7..e87e99afc 100644 --- a/third_party/python/Python/recursive.c +++ b/third_party/python/Python/recursive.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/ceval.h" -/* clang-format off */ int (Py_EnterRecursiveCall)(const char *where) diff --git a/third_party/python/Python/restoresigs.c b/third_party/python/Python/restoresigs.c index 00583bd68..0b0010706 100644 --- a/third_party/python/Python/restoresigs.c +++ b/third_party/python/Python/restoresigs.c @@ -7,7 +7,6 @@ #include "libc/calls/calls.h" #include "libc/sysv/consts/sig.h" #include "third_party/python/Include/pylifecycle.h" -/* clang-format off */ /* Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. * diff --git a/third_party/python/Python/sigcheck.c b/third_party/python/Python/sigcheck.c index 004ee4bd1..e4bebfb73 100644 --- a/third_party/python/Python/sigcheck.c +++ b/third_party/python/Python/sigcheck.c @@ -6,7 +6,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/intrcheck.h" #include "third_party/python/Include/pyerrors.h" -/* clang-format off */ /* Sigcheck is similar to intrcheck() but sets an exception when an interrupt occurs. It can't be in the intrcheck.c file since that diff --git a/third_party/python/Python/structmember.c b/third_party/python/Python/structmember.c index b627b2c22..5a7bbf373 100644 --- a/third_party/python/Python/structmember.c +++ b/third_party/python/Python/structmember.c @@ -11,7 +11,6 @@ #include "third_party/python/Include/pyerrors.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/warnings.h" -/* clang-format off */ /* Map C struct members to Python object attributes */ diff --git a/third_party/python/Python/symtable.c b/third_party/python/Python/symtable.c index 9b46cdbde..b2001d4e3 100644 --- a/third_party/python/Python/symtable.c +++ b/third_party/python/Python/symtable.c @@ -17,7 +17,6 @@ #include "third_party/python/Include/setobject.h" #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/symtable.h" -/* clang-format off */ /* error strings used for warnings */ #define GLOBAL_AFTER_ASSIGN \ diff --git a/third_party/python/Python/sysmodule.c b/third_party/python/Python/sysmodule.c index dccb6f0a9..9e004ff9e 100644 --- a/third_party/python/Python/sysmodule.c +++ b/third_party/python/Python/sysmodule.c @@ -49,7 +49,6 @@ #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ PYTHON_PROVIDE("sys"); PYTHON_PROVIDE("sys.__displayhook__"); diff --git a/third_party/python/Python/thread.c b/third_party/python/Python/thread.c index f6ed2ee90..2f3c7f2ba 100644 --- a/third_party/python/Python/thread.c +++ b/third_party/python/Python/thread.c @@ -18,7 +18,6 @@ #include "third_party/python/Include/pythread.h" #include "third_party/python/Include/structseq.h" #include "third_party/python/pyconfig.h" -/* clang-format off */ /* Thread package. This is intended to be usable independently from Python. diff --git a/third_party/python/Python/thread_pthread.inc b/third_party/python/Python/thread_pthread.inc index 2b7eb2120..fbf9b0a86 100644 --- a/third_party/python/Python/thread_pthread.inc +++ b/third_party/python/Python/thread_pthread.inc @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/thread/semaphore.h" -/* clang-format off */ /* Posix threads interface */ diff --git a/third_party/python/Python/traceback.c b/third_party/python/Python/traceback.c index 403c25744..6b8062232 100644 --- a/third_party/python/Python/traceback.c +++ b/third_party/python/Python/traceback.c @@ -24,7 +24,6 @@ #include "third_party/python/Include/structmember.h" #include "third_party/python/Include/sysmodule.h" #include "third_party/python/Include/traceback.h" -/* clang-format off */ #define OFF(x) offsetof(PyTracebackObject, x) diff --git a/third_party/python/Python/wordcode_helpers.inc b/third_party/python/Python/wordcode_helpers.inc index 49252be05..b73bbaf38 100644 --- a/third_party/python/Python/wordcode_helpers.inc +++ b/third_party/python/Python/wordcode_helpers.inc @@ -5,7 +5,6 @@ │ https://docs.python.org/3/license.html │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/python/Include/code.h" -/* clang-format off */ /* This file contains code shared by the compiler and the peephole optimizer. diff --git a/third_party/python/Python/xedmodule.c b/third_party/python/Python/xedmodule.c index 00ed73b5a..9c069d397 100644 --- a/third_party/python/Python/xedmodule.c +++ b/third_party/python/Python/xedmodule.c @@ -25,7 +25,6 @@ #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" #include "third_party/xed/x86.h" -/* clang-format off */ PYTHON_PROVIDE("xed"); PYTHON_PROVIDE("xed.ild"); diff --git a/third_party/python/Python/xtermmodule.c b/third_party/python/Python/xtermmodule.c index e8fa34fff..6ddd526f3 100644 --- a/third_party/python/Python/xtermmodule.c +++ b/third_party/python/Python/xtermmodule.c @@ -24,7 +24,6 @@ #include "third_party/python/Include/object.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ PYTHON_PROVIDE("xterm"); PYTHON_PROVIDE("xterm.rgb2xterm256"); diff --git a/third_party/python/Tools/unicode/makecjkcodecs.c b/third_party/python/Tools/unicode/makecjkcodecs.c index 72671f465..55de80985 100644 --- a/third_party/python/Tools/unicode/makecjkcodecs.c +++ b/third_party/python/Tools/unicode/makecjkcodecs.c @@ -53,7 +53,6 @@ void m(const char *s, void *p, size_t n) { q = Deflate(p, n, &m); f = fopen(xstrcat("third_party/python/Modules/cjkcodecs/", s, ".c"), "wb"); fprintf(f, "#include \"libc/x/x.h\"\n"); - fprintf(f, "/* clang-format off */\n"); fprintf(f, "\n"); fprintf(f, "static _Atomic(void *) %s_ptr;\n", s); fprintf(f, "static const unsigned char %s_rodata[] = {", s); @@ -94,7 +93,6 @@ void dzd(const char *s, void *p, size_t n, size_t z) { q = Deflate(r, appendz(r).i, &m); f = fopen(xstrcat("third_party/python/Modules/cjkcodecs/", s, ".c"), "wb"); fprintf(f, "#include \"libc/x/x.h\"\n"); - fprintf(f, "/* clang-format off */\n"); fprintf(f, "\n"); fprintf(f, "static _Atomic(void *) %s_ptr;\n", s); fprintf(f, "static const unsigned char %s_rodata[%zu] = {", s, m); diff --git a/third_party/python/Tools/unicode/makeunicodedata.py b/third_party/python/Tools/unicode/makeunicodedata.py index af80aac84..2cd591ed4 100644 --- a/third_party/python/Tools/unicode/makeunicodedata.py +++ b/third_party/python/Tools/unicode/makeunicodedata.py @@ -147,7 +147,6 @@ COSMOPOLITAN_C_END_ def startfile(fp): print('#include "libc/nexgen32e/kompressor.h"', file=fp) print('#include "third_party/python/Modules/unicodedata.h"', file=fp) - print("/* clang-format off */", file=fp) print("/* GENERATED BY %s %s */" % (SCRIPT, VERSION), file=fp) print(file=fp) diff --git a/third_party/python/freeze.c b/third_party/python/freeze.c index a77a76326..2122ecb0b 100644 --- a/third_party/python/freeze.c +++ b/third_party/python/freeze.c @@ -17,7 +17,6 @@ #include "third_party/python/Include/pylifecycle.h" #include "third_party/python/Include/pymacro.h" #include "third_party/python/Include/pythonrun.h" -/* clang-format off */ STATIC_STACK_ALIGN(GetStackSize()); @@ -28,7 +27,6 @@ STATIC_STACK_ALIGN(GetStackSize()); │ Python 3 │\n\ │ https://docs.python.org/3/license.html │\n\ ╚─────────────────────────────────────────────────────────────────────────────*/\n\ -/* clang-format off */\n\ \n\ /*\n\ * Auto-generated by\n\ diff --git a/third_party/python/launch.c b/third_party/python/launch.c index b9c0512e9..5df9f984c 100644 --- a/third_party/python/launch.c +++ b/third_party/python/launch.c @@ -38,7 +38,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/warnings.h" #include "third_party/python/Include/yoink.h" -/* clang-format off */ STATIC_STACK_ALIGN(GetStackSize()); diff --git a/third_party/python/pycomp.c b/third_party/python/pycomp.c index 3aaf2e043..0c2994820 100644 --- a/third_party/python/pycomp.c +++ b/third_party/python/pycomp.c @@ -21,7 +21,6 @@ #include "libc/calls/struct/iovec.h" #include "libc/calls/struct/stat.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" #include "libc/log/check.h" #include "libc/log/log.h" #include "libc/mem/gc.h" @@ -41,8 +40,8 @@ #include "third_party/python/Include/pythonrun.h" #include "third_party/python/Include/ucnhash.h" #include "third_party/python/Include/yoink.h" +#include "libc/serialize.h" #include "tool/build/lib/stripcomponents.h" -/* clang-format off */ __static_yoink("_PyUnicode_GetCode"); diff --git a/third_party/python/pyobj.c b/third_party/python/pyobj.c index 4367b22a0..7afad8601 100644 --- a/third_party/python/pyobj.c +++ b/third_party/python/pyobj.c @@ -22,7 +22,6 @@ #include "libc/calls/struct/stat.h" #include "libc/elf/def.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" #include "libc/log/check.h" #include "libc/log/log.h" #include "libc/macros.internal.h" @@ -62,8 +61,8 @@ #include "third_party/python/Include/unicodeobject.h" #include "tool/build/lib/elfwriter.h" #include "tool/build/lib/interner.h" +#include "libc/serialize.h" #include "tool/build/lib/stripcomponents.h" -/* clang-format off */ STATIC_STACK_ALIGN(GetStackSize()); diff --git a/third_party/python/python.c b/third_party/python/python.c index 0e99c2aeb..9fa2016c6 100644 --- a/third_party/python/python.c +++ b/third_party/python/python.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/runpythonmodule.h" #include "tool/args/args.h" -// clang-format off STATIC_STACK_ALIGN(GetStackSize()); diff --git a/third_party/python/pythontester.c b/third_party/python/pythontester.c index f5f4cfbba..e045c080a 100644 --- a/third_party/python/pythontester.c +++ b/third_party/python/pythontester.c @@ -10,7 +10,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/runpythonmodule.h" #include "tool/args/args.h" -// clang-format off STATIC_STACK_ALIGN(GetStackSize()); diff --git a/third_party/python/repl.c b/third_party/python/repl.c index 8741cb007..602a43645 100644 --- a/third_party/python/repl.c +++ b/third_party/python/repl.c @@ -8,7 +8,6 @@ #include "third_party/python/Include/yoink.h" #include "third_party/python/runpythonmodule.h" #include "tool/args/args.h" -// clang-format off STATIC_STACK_ALIGN(GetStackSize()); diff --git a/third_party/python/runpythonmodule.c b/third_party/python/runpythonmodule.c index db1c99790..e9928d520 100644 --- a/third_party/python/runpythonmodule.c +++ b/third_party/python/runpythonmodule.c @@ -12,7 +12,6 @@ #include "libc/calls/ucontext.h" #include "libc/dce.h" #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/intrin/safemacros.internal.h" #include "libc/intrin/weaken.h" #include "libc/log/check.h" @@ -50,7 +49,6 @@ #include "third_party/python/Include/unicodeobject.h" #include "third_party/python/Include/yoink.h" #include "third_party/xed/x86.h" -// clang-format off STATIC_STACK_SIZE(0x100000); diff --git a/third_party/python/runpythonmodule.h b/third_party/python/runpythonmodule.h index 2aa150780..ef77f85fb 100644 --- a/third_party/python/runpythonmodule.h +++ b/third_party/python/runpythonmodule.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_RUNPYTHONMODULE_H_ #define COSMOPOLITAN_THIRD_PARTY_PYTHON_RUNPYTHONMODULE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int RunPythonModule(int, char **); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_RUNPYTHONMODULE_H_ */ diff --git a/third_party/quickjs/array.c b/third_party/quickjs/array.c index 25cc26225..000c18ef8 100644 --- a/third_party/quickjs/array.c +++ b/third_party/quickjs/array.c @@ -30,7 +30,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* Check if an object has a generalized numeric property. Return value: -1 for exception, diff --git a/third_party/quickjs/atof.c b/third_party/quickjs/atof.c index 272fc4108..39a75d13c 100644 --- a/third_party/quickjs/atof.c +++ b/third_party/quickjs/atof.c @@ -33,7 +33,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* XXX: remove */ static double js_strtod(const char *p, int radix, BOOL is_float) diff --git a/third_party/quickjs/atom.c b/third_party/quickjs/atom.c index d5ffafb63..314e62925 100644 --- a/third_party/quickjs/atom.c +++ b/third_party/quickjs/atom.c @@ -33,7 +33,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* Should only be used for debug. */ const char *JS_AtomGetStrRT(JSRuntime *rt, char *buf, int buf_size, JSAtom atom) diff --git a/third_party/quickjs/atomics.c b/third_party/quickjs/atomics.c index 78102e3b2..bf486522e 100644 --- a/third_party/quickjs/atomics.c +++ b/third_party/quickjs/atomics.c @@ -30,7 +30,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #ifdef CONFIG_ATOMICS diff --git a/third_party/quickjs/bigdecimal.c b/third_party/quickjs/bigdecimal.c index 89e544e89..07b072c64 100644 --- a/third_party/quickjs/bigdecimal.c +++ b/third_party/quickjs/bigdecimal.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ JSValue JS_NewBigDecimal(JSContext *ctx) { diff --git a/third_party/quickjs/bigint.c b/third_party/quickjs/bigint.c index 55de313c7..48931a1bf 100644 --- a/third_party/quickjs/bigint.c +++ b/third_party/quickjs/bigint.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ JSValue JS_NewBigInt(JSContext *ctx) { diff --git a/third_party/quickjs/byte.c b/third_party/quickjs/byte.c index 7b871c54a..9a10644f0 100644 --- a/third_party/quickjs/byte.c +++ b/third_party/quickjs/byte.c @@ -35,7 +35,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ BOOL js_class_has_bytecode(JSClassID class_id) { diff --git a/third_party/quickjs/call.c b/third_party/quickjs/call.c index 2c4d52a50..ea262ab6e 100644 --- a/third_party/quickjs/call.c +++ b/third_party/quickjs/call.c @@ -33,7 +33,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static const uint16_t func_kind_to_class_id[] = { [JS_FUNC_NORMAL] = JS_CLASS_BYTECODE_FUNCTION, diff --git a/third_party/quickjs/cutils.c b/third_party/quickjs/cutils.c index c4044bb99..65415593b 100644 --- a/third_party/quickjs/cutils.c +++ b/third_party/quickjs/cutils.c @@ -32,7 +32,6 @@ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ void pstrcpy(char *buf, int buf_size, const char *str) { diff --git a/third_party/quickjs/cutils.h b/third_party/quickjs/cutils.h index a27b52c02..f53941960 100644 --- a/third_party/quickjs/cutils.h +++ b/third_party/quickjs/cutils.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_QUICKJS_CUTILS_H_ #define COSMOPOLITAN_THIRD_PARTY_QUICKJS_CUTILS_H_ #include "libc/intrin/bswap.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ /* set if CPU is big endian */ #undef WORDS_BIGENDIAN @@ -258,5 +256,4 @@ void rqsort(void *base, size_t nmemb, size_t size, /* clang-format on */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_CUTILS_H_ */ diff --git a/third_party/quickjs/date.c b/third_party/quickjs/date.c index 58700a170..aa989d281 100644 --- a/third_party/quickjs/date.c +++ b/third_party/quickjs/date.c @@ -35,7 +35,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #if 0 /* OS dependent: return the UTC time in ms since 1970. */ diff --git a/third_party/quickjs/dbuf.c b/third_party/quickjs/dbuf.c index ede819ab0..fe2261e8c 100644 --- a/third_party/quickjs/dbuf.c +++ b/third_party/quickjs/dbuf.c @@ -33,7 +33,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static void *dbuf_default_realloc(void *opaque, void *ptr, size_t size) { diff --git a/third_party/quickjs/diglet.h b/third_party/quickjs/diglet.h index b4fd9f9a3..ac7ec9c52 100644 --- a/third_party/quickjs/diglet.h +++ b/third_party/quickjs/diglet.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_QUICKJS_DIGLET_H_ #define COSMOPOLITAN_THIRD_PARTY_QUICKJS_DIGLET_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int to_digit(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_DIGLET_H_ */ diff --git a/third_party/quickjs/eq.c b/third_party/quickjs/eq.c index 67315e7bc..4a01cba32 100644 --- a/third_party/quickjs/eq.c +++ b/third_party/quickjs/eq.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* XXX: Should take JSValueConst arguments */ BOOL js_strict_eq2(JSContext *ctx, JSValue op1, JSValue op2, diff --git a/third_party/quickjs/err.c b/third_party/quickjs/err.c index 8a4507a67..c2e2b776f 100644 --- a/third_party/quickjs/err.c +++ b/third_party/quickjs/err.c @@ -32,7 +32,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ int js_parse_error(JSParseState *s, const char *fmt, ...) { diff --git a/third_party/quickjs/float.c b/third_party/quickjs/float.c index e558e95a5..62818ec4e 100644 --- a/third_party/quickjs/float.c +++ b/third_party/quickjs/float.c @@ -30,7 +30,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ JSValue JS_NewBigFloat(JSContext *ctx) { diff --git a/third_party/quickjs/gc.c b/third_party/quickjs/gc.c index f5da99fa5..94e59d22d 100644 --- a/third_party/quickjs/gc.c +++ b/third_party/quickjs/gc.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ void js_trigger_gc(JSRuntime *rt, size_t size) { diff --git a/third_party/quickjs/gen.c b/third_party/quickjs/gen.c index be64d69a5..623e20955 100644 --- a/third_party/quickjs/gen.c +++ b/third_party/quickjs/gen.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ typedef enum JSGeneratorStateEnum { JS_GENERATOR_STATE_SUSPENDED_START, diff --git a/third_party/quickjs/internal.h b/third_party/quickjs/internal.h index 759c4211f..c3a4d9eea 100644 --- a/third_party/quickjs/internal.h +++ b/third_party/quickjs/internal.h @@ -4,9 +4,7 @@ #include "third_party/quickjs/libbf.h" #include "third_party/quickjs/list.h" #include "third_party/quickjs/quickjs.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #define OPTIMIZE 1 #define SHORT_OPCODES 1 @@ -2210,5 +2208,4 @@ static inline void js_async_function_free(JSRuntime *rt, JSAsyncFunctionData *s) } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_INTERNAL_H_ */ diff --git a/third_party/quickjs/iter.c b/third_party/quickjs/iter.c index 9e6c21fd3..ffaadfe1e 100644 --- a/third_party/quickjs/iter.c +++ b/third_party/quickjs/iter.c @@ -29,7 +29,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ JSValue js_iterator_proto_iterator(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) { diff --git a/third_party/quickjs/json.c b/third_party/quickjs/json.c index 87ad290a7..b08d65e28 100644 --- a/third_party/quickjs/json.c +++ b/third_party/quickjs/json.c @@ -33,7 +33,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* 'c' is the first character. Return JS_ATOM_NULL in case of error */ static JSAtom json_parse_ident(JSParseState *s, const uint8_t **pp, int c) diff --git a/third_party/quickjs/leb128.c b/third_party/quickjs/leb128.c index 2528a2827..25d0e0f2a 100644 --- a/third_party/quickjs/leb128.c +++ b/third_party/quickjs/leb128.c @@ -30,7 +30,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ int get_leb128(uint32_t *pval, const uint8_t *buf, const uint8_t *buf_end) { diff --git a/third_party/quickjs/leb128.h b/third_party/quickjs/leb128.h index 8c6a9dfe0..e6eb7c19d 100644 --- a/third_party/quickjs/leb128.h +++ b/third_party/quickjs/leb128.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_QUICKJS_LEB128_H_ #define COSMOPOLITAN_THIRD_PARTY_QUICKJS_LEB128_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int get_leb128(uint32_t *, const uint8_t *, const uint8_t *); int get_sleb128(int32_t *, const uint8_t *, const uint8_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_LEB128_H_ */ diff --git a/third_party/quickjs/libbf.c b/third_party/quickjs/libbf.c index c370edb17..518ebd430 100644 --- a/third_party/quickjs/libbf.c +++ b/third_party/quickjs/libbf.c @@ -43,7 +43,6 @@ asm(".include \"libc/disclaimer.inc\""); /* #undef __AVX2__ */ /* #endif */ -/* clang-format off */ /* enable it to check the multiplication result */ //#define USE_MUL_CHECK diff --git a/third_party/quickjs/libbf.h b/third_party/quickjs/libbf.h index ae9159eed..ab5a56e7d 100644 --- a/third_party/quickjs/libbf.h +++ b/third_party/quickjs/libbf.h @@ -2,9 +2,7 @@ #define COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBBF_H_ #include "libc/limits.h" #include "libc/literal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #if INTPTR_MAX >= INT64_MAX #define LIMB_LOG2_BITS 6 @@ -513,5 +511,4 @@ int bfdec_normalize_and_round(bfdec_t *r, limb_t prec1, bf_flags_t flags); /* clang-format on */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBBF_H_ */ diff --git a/third_party/quickjs/libregexp-opcode.inc b/third_party/quickjs/libregexp-opcode.inc index dab647839..794668935 100644 --- a/third_party/quickjs/libregexp-opcode.inc +++ b/third_party/quickjs/libregexp-opcode.inc @@ -22,7 +22,6 @@ * THE SOFTWARE. */ -/* clang-format off */ #ifdef DEF diff --git a/third_party/quickjs/libregexp.c b/third_party/quickjs/libregexp.c index 54475c52c..aa4b2d546 100644 --- a/third_party/quickjs/libregexp.c +++ b/third_party/quickjs/libregexp.c @@ -37,7 +37,6 @@ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* TODO: diff --git a/third_party/quickjs/libregexp.h b/third_party/quickjs/libregexp.h index 1d04a8d49..bf7e2350c 100644 --- a/third_party/quickjs/libregexp.h +++ b/third_party/quickjs/libregexp.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBREGEXP_H_ #define COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBREGEXP_H_ #include "third_party/quickjs/libunicode.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #define LRE_BOOL int /* for documentation purposes */ @@ -68,5 +66,4 @@ static inline int lre_js_is_ident_next(int c) /* clang-format on */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBREGEXP_H_ */ diff --git a/third_party/quickjs/libunicode-table.inc b/third_party/quickjs/libunicode-table.inc index b4543ad7f..46cd9fa86 100644 --- a/third_party/quickjs/libunicode-table.inc +++ b/third_party/quickjs/libunicode-table.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* Compressed unicode tables */ /* Automatically generated file - do not edit */ diff --git a/third_party/quickjs/libunicode.c b/third_party/quickjs/libunicode.c index 00927631e..554ad151c 100644 --- a/third_party/quickjs/libunicode.c +++ b/third_party/quickjs/libunicode.c @@ -36,7 +36,6 @@ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ #include "third_party/quickjs/libunicode-table.inc" diff --git a/third_party/quickjs/libunicode.h b/third_party/quickjs/libunicode.h index 312b68dc7..d32f2b480 100644 --- a/third_party/quickjs/libunicode.h +++ b/third_party/quickjs/libunicode.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBUNICODE_H_ #define COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBUNICODE_H_ #include "third_party/quickjs/libunicode.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #define LRE_BOOL int /* for documentation purposes */ @@ -102,5 +100,4 @@ int unicode_prop(CharRange *cr, const char *prop_name); /* clang-format on */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBUNICODE_H_ */ diff --git a/third_party/quickjs/list.h b/third_party/quickjs/list.h index 76d72be6c..d1b8644fe 100644 --- a/third_party/quickjs/list.h +++ b/third_party/quickjs/list.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIST_H_ #define COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIST_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ struct list_head { struct list_head *prev; @@ -75,5 +73,4 @@ static inline int list_empty(struct list_head *el) /* clang-format on */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIST_H_ */ diff --git a/third_party/quickjs/map.c b/third_party/quickjs/map.c index 2fe80fb43..df444e6da 100644 --- a/third_party/quickjs/map.c +++ b/third_party/quickjs/map.c @@ -30,7 +30,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static JSValue js_map_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv, int magic) diff --git a/third_party/quickjs/math.c b/third_party/quickjs/math.c index f7951bab6..c967088d1 100644 --- a/third_party/quickjs/math.c +++ b/third_party/quickjs/math.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* precondition: a and b are not NaN */ static double js_fmin(double a, double b) diff --git a/third_party/quickjs/mem.c b/third_party/quickjs/mem.c index 9dcb5c8a2..cc2eba087 100644 --- a/third_party/quickjs/mem.c +++ b/third_party/quickjs/mem.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ JSValue JS_ThrowTypeErrorRevokedProxy(JSContext *ctx) { diff --git a/third_party/quickjs/object.c b/third_party/quickjs/object.c index f932029ef..ab0154246 100644 --- a/third_party/quickjs/object.c +++ b/third_party/quickjs/object.c @@ -29,7 +29,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ void js_object_data_finalizer(JSRuntime *rt, JSValue val) { diff --git a/third_party/quickjs/parse.c b/third_party/quickjs/parse.c index 13e9929d2..105d8633c 100644 --- a/third_party/quickjs/parse.c +++ b/third_party/quickjs/parse.c @@ -33,7 +33,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static __exception int js_parse_assign_expr(JSParseState *); static __exception int js_parse_assign_expr2(JSParseState *, int); diff --git a/third_party/quickjs/prim.c b/third_party/quickjs/prim.c index de1244675..c22c711ef 100644 --- a/third_party/quickjs/prim.c +++ b/third_party/quickjs/prim.c @@ -29,7 +29,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ JSValue JS_ToPrimitiveFree(JSContext *ctx, JSValue val, int hint) { diff --git a/third_party/quickjs/promise.c b/third_party/quickjs/promise.c index f5a2cb2d1..62d62edd6 100644 --- a/third_party/quickjs/promise.c +++ b/third_party/quickjs/promise.c @@ -30,7 +30,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ typedef enum JSPromiseStateEnum { JS_PROMISE_PENDING, diff --git a/third_party/quickjs/proxy.c b/third_party/quickjs/proxy.c index 73cfb6cb7..f3f29d196 100644 --- a/third_party/quickjs/proxy.c +++ b/third_party/quickjs/proxy.c @@ -30,7 +30,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static void js_proxy_finalizer(JSRuntime *rt, JSValue val) { diff --git a/third_party/quickjs/qjs.c b/third_party/quickjs/qjs.c index a2cc7a7e8..2208806f4 100644 --- a/third_party/quickjs/qjs.c +++ b/third_party/quickjs/qjs.c @@ -45,7 +45,6 @@ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ extern const uint8_t qjsc_repl[]; extern const uint32_t qjsc_repl_size; diff --git a/third_party/quickjs/qjsc.c b/third_party/quickjs/qjsc.c index b6fbb7b10..47d64c260 100644 --- a/third_party/quickjs/qjsc.c +++ b/third_party/quickjs/qjsc.c @@ -42,7 +42,6 @@ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ typedef struct { char *name; diff --git a/third_party/quickjs/quickjs-libc.c b/third_party/quickjs/quickjs-libc.c index c1e43fa47..3a50a577d 100644 --- a/third_party/quickjs/quickjs-libc.c +++ b/third_party/quickjs/quickjs-libc.c @@ -60,7 +60,6 @@ asm(".include \"libc/disclaimer.inc\""); #define MAXPATH 1024 -/* clang-format off */ /* TODO: - add socket calls diff --git a/third_party/quickjs/quickjs-libc.h b/third_party/quickjs/quickjs-libc.h index b03445273..f34c4b623 100644 --- a/third_party/quickjs/quickjs-libc.h +++ b/third_party/quickjs/quickjs-libc.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBC_H_ #define COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBC_H_ #include "third_party/quickjs/quickjs.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ JSModuleDef *js_init_module_std(JSContext *ctx, const char *module_name); JSModuleDef *js_init_module_os(JSContext *ctx, const char *module_name); @@ -26,5 +24,4 @@ void js_std_set_worker_new_context_func(JSContext *(*func)(JSRuntime *rt)); /* clang-format on */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_LIBC_H_ */ diff --git a/third_party/quickjs/quickjs-opcode.inc b/third_party/quickjs/quickjs-opcode.inc index 5e13da11a..11b30df23 100644 --- a/third_party/quickjs/quickjs-opcode.inc +++ b/third_party/quickjs/quickjs-opcode.inc @@ -23,7 +23,6 @@ * THE SOFTWARE. */ -/* clang-format off */ #ifdef FMT FMT(none) diff --git a/third_party/quickjs/quickjs.c b/third_party/quickjs/quickjs.c index 1ecabea6e..3dd8d9913 100644 --- a/third_party/quickjs/quickjs.c +++ b/third_party/quickjs/quickjs.c @@ -54,7 +54,6 @@ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static const char js_atom_init[] = #define DEF(name, str) str "\0" diff --git a/third_party/quickjs/quickjs.h b/third_party/quickjs/quickjs.h index 5af4890de..7b8d62029 100644 --- a/third_party/quickjs/quickjs.h +++ b/third_party/quickjs/quickjs.h @@ -3,9 +3,7 @@ #include "libc/intrin/likely.h" #include "libc/math.h" #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #if (defined(__GNUC__) || defined(__clang__)) && !defined(__STRICT_ANSI__) #define __js_printf_like(f, a) __attribute__((__format__(__printf__, f, a))) @@ -1010,5 +1008,4 @@ int JS_SetModuleExportList(JSContext *ctx, JSModuleDef *m, /* clang-format on */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_QUICKJS_QUICKJS_H_ */ diff --git a/third_party/quickjs/reflect.c b/third_party/quickjs/reflect.c index 0b960a4ef..bca54c9c9 100644 --- a/third_party/quickjs/reflect.c +++ b/third_party/quickjs/reflect.c @@ -29,7 +29,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static JSValue js_reflect_apply(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) diff --git a/third_party/quickjs/regexp.c b/third_party/quickjs/regexp.c index 11237d96d..0862de38a 100644 --- a/third_party/quickjs/regexp.c +++ b/third_party/quickjs/regexp.c @@ -32,7 +32,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ void js_regexp_finalizer(JSRuntime *rt, JSValue val) { diff --git a/third_party/quickjs/run-test262.c b/third_party/quickjs/run-test262.c index 1d01d2585..86d3e7ef1 100644 --- a/third_party/quickjs/run-test262.c +++ b/third_party/quickjs/run-test262.c @@ -43,7 +43,6 @@ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* enable test262 thread support to test SharedArrayBuffer and Atomics */ /* #define CONFIG_AGENT */ diff --git a/third_party/quickjs/shape.c b/third_party/quickjs/shape.c index 08b921291..9bf23cd02 100644 --- a/third_party/quickjs/shape.c +++ b/third_party/quickjs/shape.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ int init_shape_hash(JSRuntime *rt) { diff --git a/third_party/quickjs/str.c b/third_party/quickjs/str.c index 542f629cf..966d1733d 100644 --- a/third_party/quickjs/str.c +++ b/third_party/quickjs/str.c @@ -36,7 +36,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static int memcmp16_8(const uint16_t *src1, const uint8_t *src2, int len) { diff --git a/third_party/quickjs/strbuf.c b/third_party/quickjs/strbuf.c index 8e31d225d..9d85a255e 100644 --- a/third_party/quickjs/strbuf.c +++ b/third_party/quickjs/strbuf.c @@ -32,7 +32,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* It is valid to call string_buffer_end() and all string_buffer functions even if string_buffer_init() or another string_buffer function returns an error. diff --git a/third_party/quickjs/tok.c b/third_party/quickjs/tok.c index 53b70a890..f81c22778 100644 --- a/third_party/quickjs/tok.c +++ b/third_party/quickjs/tok.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* 'c' is the first character. Return JS_ATOM_NULL in case of error */ static JSAtom parse_ident(JSParseState *s, const uint8_t **pp, diff --git a/third_party/quickjs/typedarray.c b/third_party/quickjs/typedarray.c index 1812116d5..742c956e2 100644 --- a/third_party/quickjs/typedarray.c +++ b/third_party/quickjs/typedarray.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static JSObject *get_typed_array(JSContext *ctx, JSValueConst this_val, diff --git a/third_party/quickjs/unicode_gen.c b/third_party/quickjs/unicode_gen.c index 47aa908ec..aa2009f57 100644 --- a/third_party/quickjs/unicode_gen.c +++ b/third_party/quickjs/unicode_gen.c @@ -38,7 +38,6 @@ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* define it to be able to test unicode.c */ //#define USE_TEST diff --git a/third_party/quickjs/uri.c b/third_party/quickjs/uri.c index 9d9d3478d..6a4e79f61 100644 --- a/third_party/quickjs/uri.c +++ b/third_party/quickjs/uri.c @@ -30,7 +30,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ static int string_get_hex(JSString *p, int k, int n) { int c = 0, h; diff --git a/third_party/quickjs/usage.c b/third_party/quickjs/usage.c index 54343304b..cf2562336 100644 --- a/third_party/quickjs/usage.c +++ b/third_party/quickjs/usage.c @@ -31,7 +31,6 @@ QuickJS (MIT License)\\n\ Copyright (c) 2017-2021 Fabrice Bellard\\n\ Copyright (c) 2017-2021 Charlie Gordon\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ /* Compute memory used by various object types */ /* XXX: poor man's approach to handling multiply referenced objects */ diff --git a/third_party/radpajama/common-gptneox.cc b/third_party/radpajama/common-gptneox.cc index 6739678de..0730e4902 100644 --- a/third_party/radpajama/common-gptneox.cc +++ b/third_party/radpajama/common-gptneox.cc @@ -36,7 +36,6 @@ #include "third_party/libcxx/iterator" #include "third_party/libcxx/sstream" #include "third_party/libcxx/string" -// clang-format off bool gpt_params_parse(int argc, char ** argv, gpt_params & params) { params.n_threads = std::min(20., (unsigned)__get_cpu_count() * 0.75); diff --git a/third_party/radpajama/common-gptneox.h b/third_party/radpajama/common-gptneox.h index f74a6283e..63c3a5656 100644 --- a/third_party/radpajama/common-gptneox.h +++ b/third_party/radpajama/common-gptneox.h @@ -9,8 +9,6 @@ #include "third_party/libcxx/unordered_map" #include "third_party/libcxx/vector" #include "third_party/radpajama/gptneox.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) -// clang-format off // Various helper functions and utilities // @@ -110,5 +108,4 @@ void win32_console_init(bool enable_color); void win32_utf8_encode(const std::wstring & wstr, std::string & str); #endif -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_RADPAJAMA_COMMON_GPTNEOX_H_ */ diff --git a/third_party/radpajama/copy-gptneox.cc b/third_party/radpajama/copy-gptneox.cc index fd5940bcd..0213bd052 100644 --- a/third_party/radpajama/copy-gptneox.cc +++ b/third_party/radpajama/copy-gptneox.cc @@ -32,7 +32,6 @@ #include "third_party/libcxx/map" #include "third_party/libcxx/string" #include "third_party/radpajama/gptneox.h" -// clang-format off static const std::map GPTNEOX_FTYPE_MAP = { {"q4_0", GPTNEOX_FTYPE_MOSTLY_Q4_0}, diff --git a/third_party/radpajama/gptneox-util.h b/third_party/radpajama/gptneox-util.h index c06bf1a0a..8d5539c85 100644 --- a/third_party/radpajama/gptneox-util.h +++ b/third_party/radpajama/gptneox-util.h @@ -39,7 +39,6 @@ #include "third_party/libcxx/vector" #include "third_party/musl/crypt.h" #include "third_party/musl/lockf.h" -// clang-format off // Internal header to be included only by llama.cpp. // Contains wrappers around OS interfaces. diff --git a/third_party/radpajama/gptneox.cc b/third_party/radpajama/gptneox.cc index 39d40f865..d6cf84130 100644 --- a/third_party/radpajama/gptneox.cc +++ b/third_party/radpajama/gptneox.cc @@ -27,7 +27,6 @@ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/radpajama/gptneox.h" -#include "libc/intrin/bits.h" #include "libc/str/str.h" #include "libc/sysv/consts/posix.h" #include "third_party/ggml/fp16.h" @@ -53,8 +52,8 @@ #include "third_party/libcxx/sstream" #include "third_party/libcxx/thread" #include "third_party/libcxx/unordered_map" +#include "libc/serialize.h" #include "third_party/radpajama/gptneox-util.h" -// clang-format off // Defines fileno on msys: // TODO: Add back in n_ctx (max_position_embeddings) to ggml model, it is currently hard-coded to 2048 max for llama diff --git a/third_party/radpajama/gptneox.h b/third_party/radpajama/gptneox.h index aaf62fcc9..7c68bf9d4 100644 --- a/third_party/radpajama/gptneox.h +++ b/third_party/radpajama/gptneox.h @@ -1,7 +1,6 @@ // -*- c++; c-basic-offset:4 -*- #ifndef GPTNEOX_H #define GPTNEOX_H -// clang-format off #ifdef GPTNEOX_SHARED # if defined(_WIN32) && !defined(__MINGW32__) diff --git a/third_party/radpajama/main-redpajama-chat.cc b/third_party/radpajama/main-redpajama-chat.cc index 754421020..488413271 100644 --- a/third_party/radpajama/main-redpajama-chat.cc +++ b/third_party/radpajama/main-redpajama-chat.cc @@ -59,7 +59,6 @@ #include "third_party/musl/lockf.h" #include "third_party/radpajama/common-gptneox.h" #include "third_party/radpajama/gptneox.h" -// clang-format off static console_state con_st; static gptneox_context ** g_ctx; diff --git a/third_party/radpajama/main-redpajama.cc b/third_party/radpajama/main-redpajama.cc index 1cd9c82a4..2bcb9494e 100644 --- a/third_party/radpajama/main-redpajama.cc +++ b/third_party/radpajama/main-redpajama.cc @@ -58,7 +58,6 @@ #include "third_party/musl/lockf.h" #include "third_party/radpajama/common-gptneox.h" #include "third_party/radpajama/gptneox.h" -// clang-format off static console_state con_st; static gptneox_context ** g_ctx; diff --git a/third_party/radpajama/quantize-gptneox.cc b/third_party/radpajama/quantize-gptneox.cc index 0bd1ee235..c323f103f 100644 --- a/third_party/radpajama/quantize-gptneox.cc +++ b/third_party/radpajama/quantize-gptneox.cc @@ -33,7 +33,6 @@ #include "third_party/libcxx/map" #include "third_party/libcxx/string" #include "third_party/radpajama/gptneox.h" -// clang-format off static const std::map GPTNEOX_FTYPE_MAP = { {"f16", GPTNEOX_FTYPE_MOSTLY_F16}, diff --git a/third_party/radpajama/scripts/convert_gptneox_to_ggml.py b/third_party/radpajama/scripts/convert_gptneox_to_ggml.py index 1217c05dd..6a3294261 100644 --- a/third_party/radpajama/scripts/convert_gptneox_to_ggml.py +++ b/third_party/radpajama/scripts/convert_gptneox_to_ggml.py @@ -1,4 +1,3 @@ -// clang-format off # Convert Hugging Face fine-tuned gpt-neox-like models to ggml format import io diff --git a/third_party/radpajama/scripts/install-RedPajama-INCITE-Base-3B-v1.sh b/third_party/radpajama/scripts/install-RedPajama-INCITE-Base-3B-v1.sh index dca37488a..95be87af1 100644 --- a/third_party/radpajama/scripts/install-RedPajama-INCITE-Base-3B-v1.sh +++ b/third_party/radpajama/scripts/install-RedPajama-INCITE-Base-3B-v1.sh @@ -1,4 +1,3 @@ -// clang-format off #!/bin/bash # cd to scripts dir diff --git a/third_party/radpajama/scripts/install-RedPajama-INCITE-Chat-3B-v1.sh b/third_party/radpajama/scripts/install-RedPajama-INCITE-Chat-3B-v1.sh index 9e507afd1..efa8de356 100644 --- a/third_party/radpajama/scripts/install-RedPajama-INCITE-Chat-3B-v1.sh +++ b/third_party/radpajama/scripts/install-RedPajama-INCITE-Chat-3B-v1.sh @@ -1,4 +1,3 @@ -// clang-format off #!/bin/bash # cd to scripts dir diff --git a/third_party/radpajama/scripts/install-RedPajama-INCITE-Instruct-3B-v1.sh b/third_party/radpajama/scripts/install-RedPajama-INCITE-Instruct-3B-v1.sh index 8e0f18765..3d6d70b9c 100644 --- a/third_party/radpajama/scripts/install-RedPajama-INCITE-Instruct-3B-v1.sh +++ b/third_party/radpajama/scripts/install-RedPajama-INCITE-Instruct-3B-v1.sh @@ -1,4 +1,3 @@ -// clang-format off #!/bin/bash # cd to scripts dir diff --git a/third_party/radpajama/scripts/quantize-gptneox.py b/third_party/radpajama/scripts/quantize-gptneox.py index ba291e9b2..629c1b411 100644 --- a/third_party/radpajama/scripts/quantize-gptneox.py +++ b/third_party/radpajama/scripts/quantize-gptneox.py @@ -1,4 +1,3 @@ -// clang-format off #!/usr/bin/env python3 """Script to execute the "quantize" script on a given set of models.""" diff --git a/third_party/regex/regex.h b/third_party/regex/regex.h index 038511dd4..a8a1f0367 100644 --- a/third_party/regex/regex.h +++ b/third_party/regex/regex.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_REGEX_REGEX_H_ #define COSMOPOLITAN_LIBC_REGEX_REGEX_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if 0 @@ -57,5 +56,4 @@ size_t regerror(int, const regex_t *, char *, size_t); void regfree(regex_t *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_REGEX_REGEX_H_ */ diff --git a/third_party/sed/cmd.h b/third_party/sed/cmd.h index c620cfca9..a97a62602 100644 --- a/third_party/sed/cmd.h +++ b/third_party/sed/cmd.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_SED_CMD_H_ #define COSMOPOLITAN_THIRD_PARTY_SED_CMD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int _sed(int, char *[]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_SED_CMD_H_ */ diff --git a/third_party/sed/compile.c b/third_party/sed/compile.c index 7cf416571..d03736f00 100644 --- a/third_party/sed/compile.c +++ b/third_party/sed/compile.c @@ -1,4 +1,3 @@ -// clang-format off /* $NetBSD: compile.c,v 1.48 2019/10/05 20:23:55 christos Exp $ */ /*- diff --git a/third_party/sed/defs.h b/third_party/sed/defs.h index 9a4bc4f3a..54ac79922 100644 --- a/third_party/sed/defs.h +++ b/third_party/sed/defs.h @@ -3,9 +3,7 @@ #include "libc/calls/typedef/u.h" #include "libc/limits.h" #include "third_party/regex/regex.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -// clang-format off /* * Types of address specifications @@ -122,5 +120,4 @@ typedef struct { } SPACE; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_SED_DEFS_H_ */ diff --git a/third_party/sed/extern.h b/third_party/sed/extern.h index 8fcb5f414..0c190c9bc 100644 --- a/third_party/sed/extern.h +++ b/third_party/sed/extern.h @@ -4,9 +4,7 @@ #include "libc/stdio/stdio.h" #include "third_party/regex/regex.h" #include "third_party/sed/defs.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -// clang-format off extern struct s_command *prog; extern struct s_appends *appends_; @@ -33,5 +31,4 @@ void *xrealloc(void *, size_t); void *xcalloc(size_t, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_SED_EXTERN_H_ */ diff --git a/third_party/sed/main.c b/third_party/sed/main.c index f500969fc..f7662ac73 100644 --- a/third_party/sed/main.c +++ b/third_party/sed/main.c @@ -46,7 +46,6 @@ #include "third_party/sed/cmd.h" #include "third_party/sed/defs.h" #include "third_party/sed/extern.h" -// clang-format off /* * Linked list of units (strings and files) to be compiled diff --git a/third_party/sed/misc.c b/third_party/sed/misc.c index 7cfba6ac7..85a1d58ed 100644 --- a/third_party/sed/misc.c +++ b/third_party/sed/misc.c @@ -34,7 +34,6 @@ #include "libc/log/bsd.h" #include "libc/mem/mem.h" #include "third_party/sed/extern.h" -// clang-format off /* * malloc with result test diff --git a/third_party/sed/process.c b/third_party/sed/process.c index 1d9caf1cb..8d723bc61 100644 --- a/third_party/sed/process.c +++ b/third_party/sed/process.c @@ -48,7 +48,6 @@ #include "libc/sysv/consts/termios.h" #include "third_party/sed/defs.h" #include "third_party/sed/extern.h" -// clang-format off static SPACE HS, PS, SS, YS; #define pd PS.deleted diff --git a/third_party/smallz4/smallz4.hh b/third_party/smallz4/smallz4.hh index 5adda1dc5..2c283e0fa 100644 --- a/third_party/smallz4/smallz4.hh +++ b/third_party/smallz4/smallz4.hh @@ -1,6 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_SMALLZ4_SMALLZ4_H_ #define COSMOPOLITAN_THIRD_PARTY_SMALLZ4_SMALLZ4_H_ -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "third_party/libcxx/vector" /** diff --git a/third_party/sqlite3/appendvfs.c b/third_party/sqlite3/appendvfs.c index 4baa94172..f59da01dc 100644 --- a/third_party/sqlite3/appendvfs.c +++ b/third_party/sqlite3/appendvfs.c @@ -49,7 +49,6 @@ #include "libc/assert.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3ext.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/btree.c b/third_party/sqlite3/btree.c index 6ab963e3e..c7fcc3a0e 100644 --- a/third_party/sqlite3/btree.c +++ b/third_party/sqlite3/btree.c @@ -19,7 +19,6 @@ #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif -/* clang-format off */ /* ** The header string that appears at the beginning of every diff --git a/third_party/sqlite3/build.c b/third_party/sqlite3/build.c index 2277863b2..a1fc519b0 100644 --- a/third_party/sqlite3/build.c +++ b/third_party/sqlite3/build.c @@ -28,7 +28,6 @@ #pragma GCC diagnostic ignored "-Wmisleading-indentation" #endif -/* clang-format off */ #ifndef SQLITE_OMIT_SHARED_CACHE /* diff --git a/third_party/sqlite3/completion.c b/third_party/sqlite3/completion.c index 663867b3f..e7279f297 100644 --- a/third_party/sqlite3/completion.c +++ b/third_party/sqlite3/completion.c @@ -36,7 +36,6 @@ #include "libc/assert.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3ext.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/ctime.c b/third_party/sqlite3/ctime.c index ada2cfac7..2eb1cd287 100644 --- a/third_party/sqlite3/ctime.c +++ b/third_party/sqlite3/ctime.c @@ -1,4 +1,3 @@ -// clang-format off /* DO NOT EDIT! ** This file is automatically generated by the script in the canonical ** SQLite source tree at tool/mkctimec.tcl. diff --git a/third_party/sqlite3/dbdata.c b/third_party/sqlite3/dbdata.c index 39d701f07..a7fc6a888 100644 --- a/third_party/sqlite3/dbdata.c +++ b/third_party/sqlite3/dbdata.c @@ -74,7 +74,6 @@ #include "libc/assert.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3ext.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/decimal.c b/third_party/sqlite3/decimal.c index 0b1f637b2..f6326842a 100644 --- a/third_party/sqlite3/decimal.c +++ b/third_party/sqlite3/decimal.c @@ -18,7 +18,6 @@ #include "libc/mem/mem.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3ext.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/extensions.h b/third_party/sqlite3/extensions.h index 625665f67..98b1b7d47 100644 --- a/third_party/sqlite3/extensions.h +++ b/third_party/sqlite3/extensions.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_SQLITE3_EXTENSIONS_H_ #include "libc/stdio/stdio.h" #include "third_party/sqlite3/sqlite3.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int sqlite3MemTraceActivate(FILE *); @@ -21,5 +20,4 @@ int sqlite3_uint_init(sqlite3 *, char **, const sqlite3_api_routines *); int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_SQLITE3_EXTENSIONS_H_ */ diff --git a/third_party/sqlite3/fileio.c b/third_party/sqlite3/fileio.c index 3f788003f..2cfe76ee4 100644 --- a/third_party/sqlite3/fileio.c +++ b/third_party/sqlite3/fileio.c @@ -87,7 +87,6 @@ #include "libc/sysv/consts/s.h" #include "libc/time/time.h" #include "third_party/sqlite3/sqlite3ext.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/fts5.c b/third_party/sqlite3/fts5.c index cb7a2e32e..77f0c7b9b 100644 --- a/third_party/sqlite3/fts5.c +++ b/third_party/sqlite3/fts5.c @@ -1,4 +1,3 @@ -// clang-format off #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS5) diff --git a/third_party/sqlite3/func.c b/third_party/sqlite3/func.c index c454ca113..9ca68ba88 100644 --- a/third_party/sqlite3/func.c +++ b/third_party/sqlite3/func.c @@ -20,7 +20,6 @@ #include "libc/math.h" #endif #include "third_party/sqlite3/vdbeInt.inc" -/* clang-format off */ /* ** Return the collating function associated with a function. diff --git a/third_party/sqlite3/geopoly.inc b/third_party/sqlite3/geopoly.inc index ea7243a31..8de1fdbee 100644 --- a/third_party/sqlite3/geopoly.inc +++ b/third_party/sqlite3/geopoly.inc @@ -17,7 +17,6 @@ ** access to all of the R-Tree internals. */ #include "libc/fmt/conv.h" -/* clang-format off */ /* Enable -DGEOPOLY_ENABLE_DEBUG for debugging facilities */ #ifdef GEOPOLY_ENABLE_DEBUG diff --git a/third_party/sqlite3/ieee754.c b/third_party/sqlite3/ieee754.c index bbdea458b..9ba7c6938 100644 --- a/third_party/sqlite3/ieee754.c +++ b/third_party/sqlite3/ieee754.c @@ -88,7 +88,6 @@ #include "libc/assert.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3ext.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/json.c b/third_party/sqlite3/json.c index 18f790814..a93fd75b8 100644 --- a/third_party/sqlite3/json.c +++ b/third_party/sqlite3/json.c @@ -24,7 +24,6 @@ #ifndef SQLITE_OMIT_JSON #include "libc/fmt/conv.h" #include "third_party/sqlite3/sqliteInt.h" -// clang-format off /* ** Growing our own isspace() routine this way is twice as fast as diff --git a/third_party/sqlite3/main.c b/third_party/sqlite3/main.c index fdc05beeb..4c2116d90 100644 --- a/third_party/sqlite3/main.c +++ b/third_party/sqlite3/main.c @@ -1,4 +1,3 @@ -// clang-format off /* ** 2001 September 15 ** diff --git a/third_party/sqlite3/memtrace.c b/third_party/sqlite3/memtrace.c index 0f2f84629..2e727eadc 100644 --- a/third_party/sqlite3/memtrace.c +++ b/third_party/sqlite3/memtrace.c @@ -25,7 +25,6 @@ #include "libc/stdio/stdio.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3.h" -// clang-format off /* The original memory allocation routines */ static sqlite3_mem_methods memtraceBase; diff --git a/third_party/sqlite3/mutex.internal.h b/third_party/sqlite3/mutex.internal.h index 08a731d5c..2a3a9770e 100644 --- a/third_party/sqlite3/mutex.internal.h +++ b/third_party/sqlite3/mutex.internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_SQLITE3_MUTEX_INTERNAL_H_ #define COSMOPOLITAN_THIRD_PARTY_SQLITE3_MUTEX_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if !SQLITE_THREADSAFE @@ -37,5 +36,4 @@ int sqlite3_mutex_held(sqlite3_mutex*); #endif /* defined(SQLITE_MUTEX_OMIT) */ COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_SQLITE3_MUTEX_INTERNAL_H_ */ diff --git a/third_party/sqlite3/os_unix.c b/third_party/sqlite3/os_unix.c index 801ed24da..2e8f9dd52 100644 --- a/third_party/sqlite3/os_unix.c +++ b/third_party/sqlite3/os_unix.c @@ -1,4 +1,3 @@ -// clang-format off /* ** 2004 May 22 ** diff --git a/third_party/sqlite3/pcache1.c b/third_party/sqlite3/pcache1.c index 0c9d308d7..891ba7f38 100644 --- a/third_party/sqlite3/pcache1.c +++ b/third_party/sqlite3/pcache1.c @@ -84,7 +84,6 @@ #include "libc/assert.h" #include "third_party/sqlite3/sqlite3.h" #include "third_party/sqlite3/sqliteInt.h" -/* clang-format off */ typedef struct PCache1 PCache1; typedef struct PgHdr1 PgHdr1; diff --git a/third_party/sqlite3/rtree.c b/third_party/sqlite3/rtree.c index 8490d7292..33b766cf6 100644 --- a/third_party/sqlite3/rtree.c +++ b/third_party/sqlite3/rtree.c @@ -1,4 +1,3 @@ -// clang-format off /* ** 2001 September 15 ** diff --git a/third_party/sqlite3/series.c b/third_party/sqlite3/series.c index 0a154ff7e..c36423b64 100644 --- a/third_party/sqlite3/series.c +++ b/third_party/sqlite3/series.c @@ -71,7 +71,6 @@ #include "libc/assert.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3ext.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/shathree.c b/third_party/sqlite3/shathree.c index cff761706..6964a4fae 100644 --- a/third_party/sqlite3/shathree.c +++ b/third_party/sqlite3/shathree.c @@ -29,7 +29,6 @@ #include "libc/assert.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3ext.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/shell.c b/third_party/sqlite3/shell.c index 8bed834c1..b94dfc00e 100644 --- a/third_party/sqlite3/shell.c +++ b/third_party/sqlite3/shell.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* DO NOT EDIT! ** This file is automatically generated by the script in the canonical ** SQLite source tree at tool/mkshellc.tcl. That script combines source diff --git a/third_party/sqlite3/sqlar.c b/third_party/sqlite3/sqlar.c index 57d234f5f..2a4a55f1c 100644 --- a/third_party/sqlite3/sqlar.c +++ b/third_party/sqlite3/sqlar.c @@ -17,7 +17,6 @@ #include "libc/assert.h" #include "third_party/sqlite3/sqlite3ext.h" #include "third_party/zlib/zlib.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/sqlite3expert.c b/third_party/sqlite3/sqlite3expert.c index 01cbbe56d..1c0157a32 100644 --- a/third_party/sqlite3/sqlite3expert.c +++ b/third_party/sqlite3/sqlite3expert.c @@ -15,7 +15,6 @@ #include "libc/stdio/stdio.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3expert.h" -// clang-format off #ifndef SQLITE_OMIT_VIRTUALTABLE diff --git a/third_party/sqlite3/sqlite3expert.h b/third_party/sqlite3/sqlite3expert.h index 0869363b5..e4e3623dc 100644 --- a/third_party/sqlite3/sqlite3expert.h +++ b/third_party/sqlite3/sqlite3expert.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_SQLITE3_SQLITE3EXPERT_H_ #define COSMOPOLITAN_THIRD_PARTY_SQLITE3_SQLITE3EXPERT_H_ #include "third_party/sqlite3/sqlite3.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct sqlite3expert sqlite3expert; @@ -155,5 +154,4 @@ const char *sqlite3_expert_report(sqlite3expert *, int iStmt, int eReport); void sqlite3_expert_destroy(sqlite3expert *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_SQLITE3_SQLITE3EXPERT_H_ */ diff --git a/third_party/sqlite3/sqlite3rbu.c b/third_party/sqlite3/sqlite3rbu.c index 5cf6bde0b..bdfe0a1bb 100644 --- a/third_party/sqlite3/sqlite3rbu.c +++ b/third_party/sqlite3/sqlite3rbu.c @@ -1,4 +1,3 @@ -// clang-format off /* ** 2014 August 30 ** diff --git a/third_party/sqlite3/sqlite3session.c b/third_party/sqlite3/sqlite3session.c index 0cc02ddae..b34be2f29 100644 --- a/third_party/sqlite3/sqlite3session.c +++ b/third_party/sqlite3/sqlite3session.c @@ -1,4 +1,3 @@ -/* clang-format off */ #if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK) #include "third_party/sqlite3/sqlite3session.h" diff --git a/third_party/sqlite3/sqliteInt.h b/third_party/sqlite3/sqliteInt.h index a6a511f85..12fae0b23 100644 --- a/third_party/sqlite3/sqliteInt.h +++ b/third_party/sqlite3/sqliteInt.h @@ -1,4 +1,3 @@ -// clang-format off /* ** 2001 September 15 ** diff --git a/third_party/sqlite3/uint.c b/third_party/sqlite3/uint.c index c6eccb19f..5bbc9ed08 100644 --- a/third_party/sqlite3/uint.c +++ b/third_party/sqlite3/uint.c @@ -30,7 +30,6 @@ #include "libc/assert.h" #include "libc/str/str.h" #include "third_party/sqlite3/sqlite3ext.h" -// clang-format off SQLITE_EXTENSION_INIT1 diff --git a/third_party/sqlite3/zipfile.c b/third_party/sqlite3/zipfile.c index 063f497b9..a1625c4fa 100644 --- a/third_party/sqlite3/zipfile.c +++ b/third_party/sqlite3/zipfile.c @@ -32,7 +32,6 @@ #include "third_party/sqlite3/sqlite3.h" #include "third_party/sqlite3/sqlite3ext.h" #include "third_party/zlib/zlib.h" -// clang-format off typedef sqlite3_int64 i64; typedef sqlite3_uint64 u64; diff --git a/third_party/stb/stb_image.c b/third_party/stb/stb_image.c index 0f330ea99..093e80f97 100644 --- a/third_party/stb/stb_image.c +++ b/third_party/stb/stb_image.c @@ -20,7 +20,8 @@ #include "libc/assert.h" #include "libc/calls/calls.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" +#include "libc/intrin/bswap.h" #include "libc/limits.h" #include "libc/log/gdb.h" #include "libc/log/log.h" @@ -2937,11 +2938,23 @@ typedef struct { uint16_t value[288]; } stbi__zhuffman; +static uint32_t ReverseBits32(uint32_t x) { + x = bswap_32(x); + x = (x & 0xaaaaaaaa) >> 1 | (x & 0x55555555) << 1; + x = (x & 0xcccccccc) >> 2 | (x & 0x33333333) << 2; + x = (x & 0xf0f0f0f0) >> 4 | (x & 0x0f0f0f0f) << 4; + return x; +} + +static int ReverseBits16(int x) { + return ReverseBits32(x) >> 16; +} + forceinline int stbi__bit_reverse(int v, int bits) { assert(bits <= 16); // to bit reverse n bits, reverse 16 and shift // e.g. 11 bits, bit reverse and shift away 5 - return _bitreverse16(v) >> (16 - bits); + return ReverseBits16(v) >> (16 - bits); } static int stbi__zbuild_huffman(stbi__zhuffman *z, diff --git a/third_party/stb/stb_image.h b/third_party/stb/stb_image.h index 74cc96ad7..9f3076887 100644 --- a/third_party/stb/stb_image.h +++ b/third_party/stb/stb_image.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_STB_STB_IMAGE_H_ #define COSMOPOLITAN_THIRD_PARTY_STB_STB_IMAGE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ enum { @@ -114,5 +113,4 @@ int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_STB_STB_IMAGE_H_ */ diff --git a/third_party/stb/stb_image_resize.h b/third_party/stb/stb_image_resize.h index 6147fc224..32a22c89e 100644 --- a/third_party/stb/stb_image_resize.h +++ b/third_party/stb/stb_image_resize.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_STB_STB_IMAGE_RESIZE_H_ #define COSMOPOLITAN_THIRD_PARTY_STB_STB_IMAGE_RESIZE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ // Easy-to-use API: @@ -188,5 +187,4 @@ int stbir_resize_region( // style: [0, 1]x[0, 1]) of a region of the input image to use. COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_STB_STB_IMAGE_RESIZE_H_ */ diff --git a/third_party/stb/stb_image_write.h b/third_party/stb/stb_image_write.h index 69ab97401..2b21f4f15 100644 --- a/third_party/stb/stb_image_write.h +++ b/third_party/stb/stb_image_write.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_STB_STB_IMAGE_WRITE_H_ #define COSMOPOLITAN_THIRD_PARTY_STB_STB_IMAGE_WRITE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern int stbi_write_png_compression_level; @@ -32,5 +31,4 @@ unsigned char *stbi_write_png_to_mem(const unsigned char *, int, int, int, int, void stbi_flip_vertically_on_write(int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_STB_STB_IMAGE_WRITE_H_ */ diff --git a/third_party/stb/stb_rect_pack.c b/third_party/stb/stb_rect_pack.c index ae5aa7475..34fcea341 100644 --- a/third_party/stb/stb_rect_pack.c +++ b/third_party/stb/stb_rect_pack.c @@ -34,7 +34,6 @@ asm(".ident\t\"\\n\\n\ stb_rect_pack (MIT License)\\n\ Copyright 2017 Sean Barrett\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ // stb_rect_pack.h - v1.01 - public domain - rectangle packing // Sean Barrett 2014 diff --git a/third_party/stb/stb_rect_pack.h b/third_party/stb/stb_rect_pack.h index 3f0e30914..5b408c11f 100644 --- a/third_party/stb/stb_rect_pack.h +++ b/third_party/stb/stb_rect_pack.h @@ -8,7 +8,6 @@ #define STBRP_HEURISTIC_Skyline_BL_sortHeight 0 #define STBRP_HEURISTIC_Skyline_BF_sortHeight 1 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct stbrp_context stbrp_context; @@ -46,5 +45,4 @@ void stbrp_setup_heuristic(stbrp_context *, int); int stbrp_pack_rects(stbrp_context *, stbrp_rect *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_STB_STB_RECT_PACK_H_ */ diff --git a/third_party/stb/stb_truetype.c b/third_party/stb/stb_truetype.c index 7fd85b196..482fea968 100644 --- a/third_party/stb/stb_truetype.c +++ b/third_party/stb/stb_truetype.c @@ -27,7 +27,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "third_party/stb/stb_truetype.h" #include "libc/assert.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/likely.h" #include "libc/macros.internal.h" #include "libc/math.h" @@ -40,7 +40,6 @@ asm(".ident\t\"\\n\\n\ stb_truetype (MIT License)\\n\ Copyright 2017 Sean Barrett\""); asm(".include \"libc/disclaimer.inc\""); -/* clang-format off */ // stb_truetype.h - v1.26 - public domain // authored from 2009-2021 by Sean Barrett / RAD Game Tools diff --git a/third_party/stb/stb_truetype.h b/third_party/stb/stb_truetype.h index 2ca143d21..469e1c732 100644 --- a/third_party/stb/stb_truetype.h +++ b/third_party/stb/stb_truetype.h @@ -69,7 +69,6 @@ #define STBTT_POINT_SIZE(x) (-(x)) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef int16_t stbtt_vertex_type; @@ -258,5 +257,4 @@ const char *stbtt_GetFontNameString(const stbtt_fontinfo *, int *, int, int, int, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_STB_STB_TRUETYPE_H_ */ diff --git a/third_party/stb/stb_vorbis.c b/third_party/stb/stb_vorbis.c index 283d7c1a8..88124b77d 100644 --- a/third_party/stb/stb_vorbis.c +++ b/third_party/stb/stb_vorbis.c @@ -32,17 +32,18 @@ // manxorist@github saga musix github:infatum // Timur Gagiev Maxwell Koo // +#include "third_party/stb/stb_vorbis.h" #include "libc/assert.h" #include "libc/calls/calls.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" +#include "libc/intrin/bswap.h" #include "libc/limits.h" #include "libc/math.h" #include "libc/mem/alg.h" #include "libc/mem/alloca.h" #include "libc/mem/mem.h" #include "libc/str/str.h" -#include "third_party/stb/stb_vorbis.h" // STB_VORBIS_NO_PUSHDATA_API // does not compile the code for the various stb_vorbis_*_pushdata() @@ -66,7 +67,7 @@ // STB_VORBIS_NO_FAST_SCALED_FLOAT // does not use a fast float-to-int trick to accelerate float-to-int on // most platforms which requires endianness be defined correctly. -//#define STB_VORBIS_NO_FAST_SCALED_FLOAT +// #define STB_VORBIS_NO_FAST_SCALED_FLOAT // STB_VORBIS_MAX_CHANNELS [number] // globally define this to the maximum number of channels you need. @@ -141,7 +142,7 @@ // because otherwise an integer divide-per-vector-element is required to // unpack the index. If you define STB_VORBIS_DIVIDES_IN_CODEBOOK, you can // trade off storage for speed. -//#define STB_VORBIS_DIVIDES_IN_CODEBOOK +// #define STB_VORBIS_DIVIDES_IN_CODEBOOK #ifdef STB_VORBIS_CODEBOOK_SHORTS #error \ @@ -613,6 +614,17 @@ static void add_entry(Codebook *c, uint32 huff_code, int symbol, int count, } } +/** + * Reverses bits in 32-bit word. + */ +static uint32_t ReverseBits32(uint32_t x) { + x = bswap_32(x); + x = (x & 0xaaaaaaaa) >> 1 | (x & 0x55555555) << 1; + x = (x & 0xcccccccc) >> 2 | (x & 0x33333333) << 2; + x = (x & 0xf0f0f0f0) >> 4 | (x & 0x0f0f0f0f) << 4; + return x; +} + static int compute_codewords(Codebook *c, uint8 *len, int n, uint32 *values) { int i, k, m = 0; uint32 available[32]; @@ -649,7 +661,7 @@ static int compute_codewords(Codebook *c, uint8 *len, int n, uint32 *values) { res = available[z]; assert(z >= 0 && z < 32); available[z] = 0; - add_entry(c, _bitreverse32(res), i, m++, len[i], values); + add_entry(c, ReverseBits32(res), i, m++, len[i], values); // propagate availability up the tree if (z != len[i]) { assert(len[i] >= 0 && len[i] < 32); @@ -675,7 +687,7 @@ static void compute_accelerated_huffman(Codebook *c) { for (i = 0; i < len; ++i) { if (c->codeword_lengths[i] <= STB_VORBIS_FAST_HUFFMAN_LENGTH) { uint32 z = - c->sparse ? _bitreverse32(c->sorted_codewords[i]) : c->codewords[i]; + c->sparse ? ReverseBits32(c->sorted_codewords[i]) : c->codewords[i]; // set table entries for all bit combinations in the higher bits while (z < FAST_HUFFMAN_TABLE_SIZE) { c->fast_huffman[z] = i; @@ -720,11 +732,11 @@ static void compute_sorted_huffman(Codebook *c, uint8 *lengths, int k = 0; for (i = 0; i < c->entries; ++i) if (include_in_sort(c, lengths[i])) - c->sorted_codewords[k++] = _bitreverse32(c->codewords[i]); + c->sorted_codewords[k++] = ReverseBits32(c->codewords[i]); assert(k == c->sorted_entries); } else { for (i = 0; i < c->sorted_entries; ++i) - c->sorted_codewords[i] = _bitreverse32(c->codewords[i]); + c->sorted_codewords[i] = ReverseBits32(c->codewords[i]); } qsort(c->sorted_codewords, c->sorted_entries, sizeof(c->sorted_codewords[0]), @@ -740,7 +752,7 @@ static void compute_sorted_huffman(Codebook *c, uint8 *lengths, for (i = 0; i < len; ++i) { int huff_len = c->sparse ? lengths[values[i]] : lengths[i]; if (include_in_sort(c, huff_len)) { - uint32 code = _bitreverse32(c->codewords[i]); + uint32 code = ReverseBits32(c->codewords[i]); int x = 0, n = c->sorted_entries; while (n > 1) { // invariant: sc[x] <= code < sc[x+n] @@ -808,7 +820,7 @@ static void compute_window(int n, float *window) { static void compute_bitreverse(int n, uint16 *rev) { int ld = ilog(n) - 1; // ilog is off-by-one from normal definitions int i, n8 = n >> 3; - for (i = 0; i < n8; ++i) rev[i] = (_bitreverse32(i) >> (32 - ld + 3)) << 2; + for (i = 0; i < n8; ++i) rev[i] = (ReverseBits32(i) >> (32 - ld + 3)) << 2; } static int init_blocksize(vorb *f, int b, int n) { @@ -1182,7 +1194,7 @@ static int codebook_decode_scalar_raw(vorb *f, Codebook *c) { // sorted_codewords && c->entries > 8 if (c->entries > 8 ? c->sorted_codewords != NULL : !c->codewords) { // binary search - uint32 code = _bitreverse32(f->acc); + uint32 code = ReverseBits32(f->acc); int x = 0, n = c->sorted_entries, len; while (n > 1) { @@ -2560,7 +2572,7 @@ void inverse_mdct_naive(float *buffer, int n) // step 4 for (i=0; i < n8; ++i) { - int j = _bitreverse32(i) >> (32-ld+3); + int j = ReverseBits32(i) >> (32-ld+3); assert(j < n8); if (i == j) { // paper bug: original code probably swapped in place; if copying, diff --git a/third_party/stb/stb_vorbis.h b/third_party/stb/stb_vorbis.h index 8dd54975b..758e251b4 100644 --- a/third_party/stb/stb_vorbis.h +++ b/third_party/stb/stb_vorbis.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_STB_STB_VORBIS_H_ #define COSMOPOLITAN_THIRD_PARTY_STB_STB_VORBIS_H_ #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ enum STBVorbisError { @@ -260,5 +259,4 @@ int stb_vorbis_get_samples_short(stb_vorbis *f, int channels, short **buffer, // no more samples in the file, returns 0. COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_STB_STB_VORBIS_H_ */ diff --git a/third_party/tidy/README.cosmo b/third_party/tidy/README.cosmo index c2d351706..2136f80e2 100644 --- a/third_party/tidy/README.cosmo +++ b/third_party/tidy/README.cosmo @@ -27,5 +27,4 @@ LOCAL CHANGES - Rename a few .h files to .inc - Normalize header includes for cosmopolitan repo - Delete ugly no-op macros, e.g. TIDY_CALL, TIDY_EXPORT, etc. - - Add clang-format off directives - Delete trailing whitespace diff --git a/third_party/tidy/access.c b/third_party/tidy/access.c index 878697146..e213ee0d2 100644 --- a/third_party/tidy/access.c +++ b/third_party/tidy/access.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* access.c -- carry out accessibility checks Copyright University of Toronto diff --git a/third_party/tidy/access.h b/third_party/tidy/access.h index 4d1eb0f89..3f82cdd11 100644 --- a/third_party/tidy/access.h +++ b/third_party/tidy/access.h @@ -1,6 +1,5 @@ #ifndef __ACCESS_H__ #define __ACCESS_H__ -/* clang-format off */ /********************************************************************* * carry out accessibility checks diff --git a/third_party/tidy/alloc.c b/third_party/tidy/alloc.c index fa16e8865..b2c6eefcc 100644 --- a/third_party/tidy/alloc.c +++ b/third_party/tidy/alloc.c @@ -1,5 +1,3 @@ -/* clang-format off */ -/* clang-format off */ /* alloc.c -- Default memory allocation routines. (c) 1998-2006 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/attrdict.c b/third_party/tidy/attrdict.c index 4b1881803..017eb6322 100644 --- a/third_party/tidy/attrdict.c +++ b/third_party/tidy/attrdict.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* attrdict.c -- extended attribute information (c) 1998-2006 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/attrdict.h b/third_party/tidy/attrdict.h index 89c453594..aae0a32b6 100644 --- a/third_party/tidy/attrdict.h +++ b/third_party/tidy/attrdict.h @@ -1,6 +1,5 @@ #ifndef __ATTRDICT_H__ #define __ATTRDICT_H__ -/* clang-format off */ /* attrdict.h -- extended attribute information diff --git a/third_party/tidy/attrs.c b/third_party/tidy/attrs.c index 576fba320..3b96f361f 100644 --- a/third_party/tidy/attrs.c +++ b/third_party/tidy/attrs.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* attrs.c -- recognize HTML attributes (c) 1998-2009 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/attrs.h b/third_party/tidy/attrs.h index a186af4a1..6be31de44 100644 --- a/third_party/tidy/attrs.h +++ b/third_party/tidy/attrs.h @@ -1,6 +1,5 @@ #ifndef __ATTRS_H__ #define __ATTRS_H__ -/* clang-format off */ /* attrs.h -- recognize HTML attributes diff --git a/third_party/tidy/buffio.c b/third_party/tidy/buffio.c index 31d8bf8ac..d113fbc51 100644 --- a/third_party/tidy/buffio.c +++ b/third_party/tidy/buffio.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* buffio.c -- Treat buffer as an I/O stream. (c) 1998-2007 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/charsets.c b/third_party/tidy/charsets.c index e7aac1c46..b8239bd56 100644 --- a/third_party/tidy/charsets.c +++ b/third_party/tidy/charsets.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* charsets.c -- character set information and mappings (c) 1998-2006 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/charsets.h b/third_party/tidy/charsets.h index 5f68249ae..5ef147f6a 100644 --- a/third_party/tidy/charsets.h +++ b/third_party/tidy/charsets.h @@ -2,7 +2,6 @@ #define __CHARSETS_H__ #include "third_party/tidy/access.h" #include "third_party/tidy/tidyplatform.h" -/* clang-format off */ /* charsets.h -- character set information and mappings diff --git a/third_party/tidy/clean.c b/third_party/tidy/clean.c index 02f0de7d7..28e3615ce 100644 --- a/third_party/tidy/clean.c +++ b/third_party/tidy/clean.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* clean.c -- clean up misuse of presentation markup diff --git a/third_party/tidy/clean.h b/third_party/tidy/clean.h index 8427bcb43..9576e5841 100644 --- a/third_party/tidy/clean.h +++ b/third_party/tidy/clean.h @@ -1,7 +1,6 @@ #ifndef __CLEAN_H__ #define __CLEAN_H__ #include "third_party/tidy/forward.h" -/* clang-format off */ /* clean.h -- clean up misuse of presentation markup diff --git a/third_party/tidy/config.c b/third_party/tidy/config.c index d6592df3d..3dc7b0486 100644 --- a/third_party/tidy/config.c +++ b/third_party/tidy/config.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* config.c * Read configuration files and manage configuration properties. * diff --git a/third_party/tidy/config.h b/third_party/tidy/config.h index 8f55da1f2..7facebe73 100644 --- a/third_party/tidy/config.h +++ b/third_party/tidy/config.h @@ -1,6 +1,5 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ -/* clang-format off */ /**************************************************************************//** * @file diff --git a/third_party/tidy/entities.c b/third_party/tidy/entities.c index bec420ea0..8fb728650 100644 --- a/third_party/tidy/entities.c +++ b/third_party/tidy/entities.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* entities.c -- recognize HTML ISO entities (c) 1998-2008 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/entities.h b/third_party/tidy/entities.h index d9672f3c4..42b80e6a2 100644 --- a/third_party/tidy/entities.h +++ b/third_party/tidy/entities.h @@ -1,6 +1,5 @@ #ifndef __ENTITIES_H__ #define __ENTITIES_H__ -/* clang-format off */ /* entities.h -- recognize character entities diff --git a/third_party/tidy/fileio.c b/third_party/tidy/fileio.c index a3b32f1c3..481932b29 100644 --- a/third_party/tidy/fileio.c +++ b/third_party/tidy/fileio.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* fileio.c -- does standard I/O (c) 1998-2007 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/fileio.h b/third_party/tidy/fileio.h index 51b488dda..d25f592ba 100644 --- a/third_party/tidy/fileio.h +++ b/third_party/tidy/fileio.h @@ -1,6 +1,5 @@ #ifndef __FILEIO_H__ #define __FILEIO_H__ -/* clang-format off */ /** @file fileio.h - does standard C I/O diff --git a/third_party/tidy/forward.h b/third_party/tidy/forward.h index 00183a7f2..98dbd56cc 100644 --- a/third_party/tidy/forward.h +++ b/third_party/tidy/forward.h @@ -1,6 +1,5 @@ #ifndef __FORWARD_H__ #define __FORWARD_H__ -/* clang-format off */ /* forward.h -- Forward declarations for major Tidy structures diff --git a/third_party/tidy/gdoc.c b/third_party/tidy/gdoc.c index 22e3dcfdf..cce0242ef 100644 --- a/third_party/tidy/gdoc.c +++ b/third_party/tidy/gdoc.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* clean.c -- clean up misuse of presentation markup diff --git a/third_party/tidy/gdoc.h b/third_party/tidy/gdoc.h index a0256618b..6fc024bc3 100644 --- a/third_party/tidy/gdoc.h +++ b/third_party/tidy/gdoc.h @@ -1,7 +1,6 @@ #ifndef __GDOC_H__ #define __GDOC_H__ #include "third_party/tidy/forward.h" -/* clang-format off */ /* gdoc.h -- clean up html exported by Google Docs diff --git a/third_party/tidy/istack.c b/third_party/tidy/istack.c index 9b590d508..8811e021d 100644 --- a/third_party/tidy/istack.c +++ b/third_party/tidy/istack.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* istack.c -- inline stack for compatibility with Mosaic (c) 1998-2006 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/language.c b/third_party/tidy/language.c index d27b9b6b3..ea80ad7a2 100644 --- a/third_party/tidy/language.c +++ b/third_party/tidy/language.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* language.c -- localization support for HTML Tidy. Copyright 2015 HTACG diff --git a/third_party/tidy/language.h b/third_party/tidy/language.h index 8981bd4cc..2f8f2b3c7 100644 --- a/third_party/tidy/language.h +++ b/third_party/tidy/language.h @@ -1,6 +1,5 @@ #ifndef language_h #define language_h -/* clang-format off */ /********************************************************************* * Localization support for HTML Tidy. diff --git a/third_party/tidy/language_en.inc b/third_party/tidy/language_en.inc index d3bece787..55a2c0ac2 100644 --- a/third_party/tidy/language_en.inc +++ b/third_party/tidy/language_en.inc @@ -1,4 +1,3 @@ -/* clang-format off */ #ifndef language_en_h #define language_en_h /* diff --git a/third_party/tidy/lexer.c b/third_party/tidy/lexer.c index 821a530df..eacda557b 100644 --- a/third_party/tidy/lexer.c +++ b/third_party/tidy/lexer.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* lexer.c -- Lexer for html parser (c) 1998-2008 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/lexer.h b/third_party/tidy/lexer.h index dc8507921..a7cd6cb6a 100644 --- a/third_party/tidy/lexer.h +++ b/third_party/tidy/lexer.h @@ -1,6 +1,5 @@ #ifndef __LEXER_H__ #define __LEXER_H__ -/* clang-format off */ /**************************************************************************//** diff --git a/third_party/tidy/mappedio.c b/third_party/tidy/mappedio.c index 37d718bb5..fcba681cf 100644 --- a/third_party/tidy/mappedio.c +++ b/third_party/tidy/mappedio.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Interface to mmap style I/O (c) 2006-2008 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/mappedio.h b/third_party/tidy/mappedio.h index 30c53c776..74ec059f4 100644 --- a/third_party/tidy/mappedio.h +++ b/third_party/tidy/mappedio.h @@ -1,6 +1,5 @@ #ifndef __TIDY_MAPPED_IO_H__ #define __TIDY_MAPPED_IO_H__ -/* clang-format off */ /* Interface to mmap style I/O diff --git a/third_party/tidy/message.c b/third_party/tidy/message.c index b05d32657..7bd24afe8 100644 --- a/third_party/tidy/message.c +++ b/third_party/tidy/message.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* message.c -- General Message Writing Routines (c) 1998-2017 (W3C) MIT, ERCIM, Keio University, University of diff --git a/third_party/tidy/message.h b/third_party/tidy/message.h index 1110863a5..edb032cd4 100644 --- a/third_party/tidy/message.h +++ b/third_party/tidy/message.h @@ -1,6 +1,5 @@ #ifndef __MESSAGE_H__ #define __MESSAGE_H__ -/* clang-format off */ /****************************************************************************** * @file diff --git a/third_party/tidy/messageobj.c b/third_party/tidy/messageobj.c index 1a5e3f4e9..75f4f418c 100644 --- a/third_party/tidy/messageobj.c +++ b/third_party/tidy/messageobj.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* messageobj.c * Provides an external, extensible API for message reporting. * diff --git a/third_party/tidy/messageobj.h b/third_party/tidy/messageobj.h index 437cd242c..2e1089014 100644 --- a/third_party/tidy/messageobj.h +++ b/third_party/tidy/messageobj.h @@ -1,6 +1,5 @@ #ifndef messageobj_h #define messageobj_h -/* clang-format off */ /**************************************************************************//** * @file diff --git a/third_party/tidy/parser.c b/third_party/tidy/parser.c index 331883edb..fdf55de01 100644 --- a/third_party/tidy/parser.c +++ b/third_party/tidy/parser.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* parser.c -- HTML Parser (c) 1998-2007 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/parser.h b/third_party/tidy/parser.h index 43cce6157..aecbde633 100644 --- a/third_party/tidy/parser.h +++ b/third_party/tidy/parser.h @@ -1,6 +1,5 @@ #ifndef __PARSER_H__ #define __PARSER_H__ -/* clang-format off */ /**************************************************************************//** * @file diff --git a/third_party/tidy/pprint.c b/third_party/tidy/pprint.c index bad763392..d7a98f4cd 100644 --- a/third_party/tidy/pprint.c +++ b/third_party/tidy/pprint.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* pprint.c -- pretty print parse tree diff --git a/third_party/tidy/pprint.h b/third_party/tidy/pprint.h index 20f390238..45d054ebc 100644 --- a/third_party/tidy/pprint.h +++ b/third_party/tidy/pprint.h @@ -1,6 +1,5 @@ #ifndef __PPRINT_H__ #define __PPRINT_H__ -/* clang-format off */ /**************************************************************************//** * @file diff --git a/third_party/tidy/sprtf.c b/third_party/tidy/sprtf.c index 0dd45c5a3..ea0e3cfae 100644 --- a/third_party/tidy/sprtf.c +++ b/third_party/tidy/sprtf.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* sprtf.c * SPRTF - Log output utility - part of the HTML Tidy project * diff --git a/third_party/tidy/sprtf.h b/third_party/tidy/sprtf.h index 326eed8d1..bafb5d362 100644 --- a/third_party/tidy/sprtf.h +++ b/third_party/tidy/sprtf.h @@ -1,6 +1,5 @@ #ifndef _SPRTF_HXX_ #define _SPRTF_HXX_ -/* clang-format off */ /**************************************************************************//** * @file diff --git a/third_party/tidy/streamio.c b/third_party/tidy/streamio.c index ac5cfe82d..559c33570 100644 --- a/third_party/tidy/streamio.c +++ b/third_party/tidy/streamio.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* streamio.c -- handles character stream I/O (c) 1998-2008 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/streamio.h b/third_party/tidy/streamio.h index 83c400b61..1c07d9c15 100644 --- a/third_party/tidy/streamio.h +++ b/third_party/tidy/streamio.h @@ -1,6 +1,5 @@ #ifndef __STREAMIO_H__ #define __STREAMIO_H__ -/* clang-format off */ /* streamio.h -- handles character stream I/O diff --git a/third_party/tidy/tagask.c b/third_party/tidy/tagask.c index 13b616204..6ea4d164c 100644 --- a/third_party/tidy/tagask.c +++ b/third_party/tidy/tagask.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* tagask.c -- Interrogate node type (c) 1998-2006 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/tags.c b/third_party/tidy/tags.c index c29bb1615..e69d50eae 100644 --- a/third_party/tidy/tags.c +++ b/third_party/tidy/tags.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* tags.c * Recognize HTML tags. * diff --git a/third_party/tidy/tags.h b/third_party/tidy/tags.h index f8c4ca9a5..fc0179858 100644 --- a/third_party/tidy/tags.h +++ b/third_party/tidy/tags.h @@ -1,6 +1,5 @@ #ifndef __TAGS_H__ #define __TAGS_H__ -/* clang-format off */ /**************************************************************************//** * @file diff --git a/third_party/tidy/tidy-int.h b/third_party/tidy/tidy-int.h index ccdde224c..be0ed84b3 100644 --- a/third_party/tidy/tidy-int.h +++ b/third_party/tidy/tidy-int.h @@ -1,4 +1,3 @@ -/* clang-format off */ #ifndef __TIDY_INT_H__ #define __TIDY_INT_H__ diff --git a/third_party/tidy/tidy.c b/third_party/tidy/tidy.c index f241aae6a..4798eafda 100644 --- a/third_party/tidy/tidy.c +++ b/third_party/tidy/tidy.c @@ -1,4 +1,3 @@ -/* clang-format off */ /***************************************************************************//** * @file * HTML TidyLib command line driver. diff --git a/third_party/tidy/tidy.h b/third_party/tidy/tidy.h index 4c9133154..756fd0f93 100644 --- a/third_party/tidy/tidy.h +++ b/third_party/tidy/tidy.h @@ -1,6 +1,5 @@ #ifndef __TIDY_H__ #define __TIDY_H__ -/* clang-format off */ /***************************************************************************//** * @file diff --git a/third_party/tidy/tidybuffio.h b/third_party/tidy/tidybuffio.h index 52cc8922e..537203de6 100644 --- a/third_party/tidy/tidybuffio.h +++ b/third_party/tidy/tidybuffio.h @@ -1,6 +1,5 @@ #ifndef __TIDY_BUFFIO_H__ #define __TIDY_BUFFIO_H__ -/* clang-format off */ /**************************************************************************//** * @file diff --git a/third_party/tidy/tidyenum.h b/third_party/tidy/tidyenum.h index 426ec6c2b..37e519a2c 100644 --- a/third_party/tidy/tidyenum.h +++ b/third_party/tidy/tidyenum.h @@ -1,6 +1,5 @@ #ifndef __TIDYENUM_H__ #define __TIDYENUM_H__ -/* clang-format off */ /**************************************************************************//** * @file diff --git a/third_party/tidy/tidylib.c b/third_party/tidy/tidylib.c index 1aa98ed8b..db284519b 100644 --- a/third_party/tidy/tidylib.c +++ b/third_party/tidy/tidylib.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* tidylib.c -- internal library definitions (c) 1998-2008 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/tmbstr.c b/third_party/tidy/tmbstr.c index 24ea7eb3f..7bf15f6da 100644 --- a/third_party/tidy/tmbstr.c +++ b/third_party/tidy/tmbstr.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* tmbstr.c -- Tidy string utility functions (c) 1998-2006 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/tmbstr.h b/third_party/tidy/tmbstr.h index 376a34562..be7414a0c 100644 --- a/third_party/tidy/tmbstr.h +++ b/third_party/tidy/tmbstr.h @@ -1,6 +1,5 @@ #ifndef __TMBSTR_H__ #define __TMBSTR_H__ -/* clang-format off */ /* tmbstr.h - Tidy string utility functions diff --git a/third_party/tidy/utf8.c b/third_party/tidy/utf8.c index 0a14e4c30..3f8dfb27c 100644 --- a/third_party/tidy/utf8.c +++ b/third_party/tidy/utf8.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* utf8.c -- convert characters to/from UTF-8 (c) 1998-2007 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tidy/utf8.h b/third_party/tidy/utf8.h index 089874939..ac95ef0b2 100644 --- a/third_party/tidy/utf8.h +++ b/third_party/tidy/utf8.h @@ -1,6 +1,5 @@ #ifndef __UTF8_H__ #define __UTF8_H__ -/* clang-format off */ /* utf8.h -- convert characters to/from UTF-8 diff --git a/third_party/tidy/version.inc b/third_party/tidy/version.inc index 39f9d67fd..bb9c42e16 100644 --- a/third_party/tidy/version.inc +++ b/third_party/tidy/version.inc @@ -1,4 +1,3 @@ -/* clang-format off */ /* version information (c) 2007-2015 (W3C) MIT, ERCIM, Keio University diff --git a/third_party/tr/cmd.h b/third_party/tr/cmd.h index 652bf0f69..28fd2803c 100644 --- a/third_party/tr/cmd.h +++ b/third_party/tr/cmd.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_TR_CMD_H_ #define COSMOPOLITAN_THIRD_PARTY_TR_CMD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int _tr(int, char *[]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_TR_CMD_H_ */ diff --git a/third_party/tr/extern.h b/third_party/tr/extern.h index 0b6ddbb15..31b1ed884 100644 --- a/third_party/tr/extern.h +++ b/third_party/tr/extern.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_TR_EXTERN_H_ #define COSMOPOLITAN_THIRD_PARTY_TR_EXTERN_H_ #include "libc/limits.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef struct { @@ -20,5 +19,4 @@ typedef struct { int next(STR *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_TR_EXTERN_H_ */ diff --git a/third_party/tr/next.c b/third_party/tr/next.c index 545424e1d..802197dd7 100644 --- a/third_party/tr/next.c +++ b/third_party/tr/next.c @@ -36,7 +36,6 @@ #include "libc/mem/mem.h" #include "libc/str/str.h" #include "third_party/tr/extern.h" -// clang-format off static int backslash(STR *); static int bracket(STR *); diff --git a/third_party/tr/tr.c b/third_party/tr/tr.c index 309b04b21..b964b8408 100644 --- a/third_party/tr/tr.c +++ b/third_party/tr/tr.c @@ -41,7 +41,6 @@ #include "third_party/getopt/getopt.internal.h" #include "third_party/tr/cmd.h" #include "third_party/tr/extern.h" -// clang-format off int delete[NCHARS], squeeze[NCHARS]; int translate[NCHARS] = { diff --git a/third_party/tree/color.c b/third_party/tree/color.c index 2dc5ca705..f8ae632ec 100644 --- a/third_party/tree/color.c +++ b/third_party/tree/color.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/file.c b/third_party/tree/file.c index a9e02fd65..bf0b19a47 100644 --- a/third_party/tree/file.c +++ b/third_party/tree/file.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/filter.c b/third_party/tree/filter.c index ed822552f..dfc81fd53 100644 --- a/third_party/tree/filter.c +++ b/third_party/tree/filter.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/hash.c b/third_party/tree/hash.c index 50939258d..709aaddeb 100644 --- a/third_party/tree/hash.c +++ b/third_party/tree/hash.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/html.c b/third_party/tree/html.c index 3606b4ab5..41b731d19 100644 --- a/third_party/tree/html.c +++ b/third_party/tree/html.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/info.c b/third_party/tree/info.c index 3b32c77ef..1d014b911 100644 --- a/third_party/tree/info.c +++ b/third_party/tree/info.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/json.c b/third_party/tree/json.c index 9e9754a1b..e9ef424e9 100644 --- a/third_party/tree/json.c +++ b/third_party/tree/json.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/list.c b/third_party/tree/list.c index 8340eb01b..c3aea1cdd 100644 --- a/third_party/tree/list.c +++ b/third_party/tree/list.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/tree.c b/third_party/tree/tree.c index 7370a6c3a..d68e8ad96 100644 --- a/third_party/tree/tree.c +++ b/third_party/tree/tree.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/tree.h b/third_party/tree/tree.h index 400e910ba..c61fde210 100644 --- a/third_party/tree/tree.h +++ b/third_party/tree/tree.h @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/unix.c b/third_party/tree/unix.c index 73e21e02b..93e6fe715 100644 --- a/third_party/tree/unix.c +++ b/third_party/tree/unix.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/tree/xml.c b/third_party/tree/xml.c index ef475787f..295d385df 100644 --- a/third_party/tree/xml.c +++ b/third_party/tree/xml.c @@ -1,4 +1,3 @@ -// clang-format off /* $Copyright: $ * Copyright (c) 1996 - 2023 by Steve Baker (ice@mama.indstate.edu) * diff --git a/third_party/unzip/README.cosmo b/third_party/unzip/README.cosmo index 85432be94..c05ab13cc 100644 --- a/third_party/unzip/README.cosmo +++ b/third_party/unzip/README.cosmo @@ -22,6 +22,5 @@ LOCAL CHANGES - Normalization of header / build config for platform / repository sed -i -e '/# *include *<.*/d' *.* sed -i -e 's!# *include *"!#include "third_party/unzip/!' *.* - sed -i -e '1 i\// clang-format off' *.c *.h - Fixed a lot of static analysis buffer overflow warnings. diff --git a/third_party/unzip/api.c b/third_party/unzip/api.c index 4c03677ee..f7846c49d 100644 --- a/third_party/unzip/api.c +++ b/third_party/unzip/api.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2009 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/apihelp.c b/third_party/unzip/apihelp.c index a555cedc3..6683dbc9d 100644 --- a/third_party/unzip/apihelp.c +++ b/third_party/unzip/apihelp.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2001 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/consts.h b/third_party/unzip/consts.h index 09eb9cdad..bb07bbb08 100644 --- a/third_party/unzip/consts.h +++ b/third_party/unzip/consts.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2001 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/crc32.c b/third_party/unzip/crc32.c index e55fbe846..4b8cb053f 100644 --- a/third_party/unzip/crc32.c +++ b/third_party/unzip/crc32.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2007 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/crc32.h b/third_party/unzip/crc32.h index 7a1e1ee60..de7e4ba2e 100644 --- a/third_party/unzip/crc32.h +++ b/third_party/unzip/crc32.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2008 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/crypt.c b/third_party/unzip/crypt.c index 06e8994a9..c730ace5a 100644 --- a/third_party/unzip/crypt.c +++ b/third_party/unzip/crypt.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2007 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/crypt.h b/third_party/unzip/crypt.h index 6367e7095..6538aa9b4 100644 --- a/third_party/unzip/crypt.h +++ b/third_party/unzip/crypt.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2007 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/ebcdic.h b/third_party/unzip/ebcdic.h index 407b0bd08..2ebb6d861 100644 --- a/third_party/unzip/ebcdic.h +++ b/third_party/unzip/ebcdic.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2008 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/envargs.c b/third_party/unzip/envargs.c index 5bdd56f71..7d8e21eab 100644 --- a/third_party/unzip/envargs.c +++ b/third_party/unzip/envargs.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2005 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/explode.c b/third_party/unzip/explode.c index 92f49393d..aaea23851 100644 --- a/third_party/unzip/explode.c +++ b/third_party/unzip/explode.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2007 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/extract.c b/third_party/unzip/extract.c index b31dc0bf4..feeea6384 100644 --- a/third_party/unzip/extract.c +++ b/third_party/unzip/extract.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/fileio.c b/third_party/unzip/fileio.c index 354d5a600..54090af23 100644 --- a/third_party/unzip/fileio.c +++ b/third_party/unzip/fileio.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/globals.c b/third_party/unzip/globals.c index 5592438cc..134a7f84a 100644 --- a/third_party/unzip/globals.c +++ b/third_party/unzip/globals.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2007 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/globals.h b/third_party/unzip/globals.h index 485538186..9bcea246d 100644 --- a/third_party/unzip/globals.h +++ b/third_party/unzip/globals.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/inflate.c b/third_party/unzip/inflate.c index e34cbb0b1..30c428d86 100644 --- a/third_party/unzip/inflate.c +++ b/third_party/unzip/inflate.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/inflate.h b/third_party/unzip/inflate.h index a9ec2ddae..ced836831 100644 --- a/third_party/unzip/inflate.h +++ b/third_party/unzip/inflate.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2000 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/list.c b/third_party/unzip/list.c index bc8400686..e36097280 100644 --- a/third_party/unzip/list.c +++ b/third_party/unzip/list.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2009 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/match.c b/third_party/unzip/match.c index f8abfee0e..836e3d745 100644 --- a/third_party/unzip/match.c +++ b/third_party/unzip/match.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/process.c b/third_party/unzip/process.c index 40a8fccb2..6218a27bf 100644 --- a/third_party/unzip/process.c +++ b/third_party/unzip/process.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2009 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/timezone.c b/third_party/unzip/timezone.c index e21a5955b..95cf80652 100644 --- a/third_party/unzip/timezone.c +++ b/third_party/unzip/timezone.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2001 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/timezone.h b/third_party/unzip/timezone.h index 9e822c481..6c57560f6 100644 --- a/third_party/unzip/timezone.h +++ b/third_party/unzip/timezone.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2001 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/ttyio.c b/third_party/unzip/ttyio.c index bb72edcb3..3100a7d03 100644 --- a/third_party/unzip/ttyio.c +++ b/third_party/unzip/ttyio.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2008 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/ttyio.h b/third_party/unzip/ttyio.h index fd0076dfe..c99ed0c9e 100644 --- a/third_party/unzip/ttyio.h +++ b/third_party/unzip/ttyio.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2004 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/ubz2err.c b/third_party/unzip/ubz2err.c index 9454ca9db..5e009a3c6 100644 --- a/third_party/unzip/ubz2err.c +++ b/third_party/unzip/ubz2err.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2008 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/unix.c b/third_party/unzip/unix.c index 9bd101b4d..6e15a11e0 100644 --- a/third_party/unzip/unix.c +++ b/third_party/unzip/unix.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/unreduce.c b/third_party/unzip/unreduce.c index a0c442a47..f64f673ad 100644 --- a/third_party/unzip/unreduce.c +++ b/third_party/unzip/unreduce.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2002 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/unshrink.c b/third_party/unzip/unshrink.c index a42d688af..f1cc8c355 100644 --- a/third_party/unzip/unshrink.c +++ b/third_party/unzip/unshrink.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2008 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/unxcfg.h b/third_party/unzip/unxcfg.h index cce015473..a3ba26301 100644 --- a/third_party/unzip/unxcfg.h +++ b/third_party/unzip/unxcfg.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/unzip.c b/third_party/unzip/unzip.c index d9dfd8218..1642f0bd4 100644 --- a/third_party/unzip/unzip.c +++ b/third_party/unzip/unzip.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/unzip.h b/third_party/unzip/unzip.h index 3caefa10a..4cef5e72c 100644 --- a/third_party/unzip/unzip.h +++ b/third_party/unzip/unzip.h @@ -1,4 +1,3 @@ -// clang-format off /*--------------------------------------------------------------------------- unzip.h (new) diff --git a/third_party/unzip/unzpriv.h b/third_party/unzip/unzpriv.h index 2d16250a4..4be099f8b 100644 --- a/third_party/unzip/unzpriv.h +++ b/third_party/unzip/unzpriv.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/unzvers.h b/third_party/unzip/unzvers.h index 9be67cf36..d3224e820 100644 --- a/third_party/unzip/unzvers.h +++ b/third_party/unzip/unzvers.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/zip.h b/third_party/unzip/zip.h index 0532ae0f3..d3a6a02ff 100644 --- a/third_party/unzip/zip.h +++ b/third_party/unzip/zip.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2005 Info-ZIP. All rights reserved. diff --git a/third_party/unzip/zipinfo.c b/third_party/unzip/zipinfo.c index 99a8d8f8b..6cd85b744 100644 --- a/third_party/unzip/zipinfo.c +++ b/third_party/unzip/zipinfo.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2010 Info-ZIP. All rights reserved. diff --git a/third_party/vqsort/vqsort.h b/third_party/vqsort/vqsort.h index e32517f5c..9dd947197 100644 --- a/third_party/vqsort/vqsort.h +++ b/third_party/vqsort/vqsort.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_VQSORT_H_ #define COSMOPOLITAN_THIRD_PARTY_VQSORT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void vqsort_int64(int64_t *, size_t); @@ -16,5 +15,4 @@ void vqsort_int32_ssse3(int32_t *, size_t); void vqsort_int32_sse2(int32_t *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_VQSORT_H_ */ diff --git a/third_party/xed/avx512.h b/third_party/xed/avx512.h index 14385b8ad..fcf6f795d 100644 --- a/third_party/xed/avx512.h +++ b/third_party/xed/avx512.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_XED_AVX512_H_ #define COSMOPOLITAN_THIRD_PARTY_XED_AVX512_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ union XedAvx512Payload1 { @@ -40,5 +39,4 @@ union XedAvx512Payload3 { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_XED_AVX512_H_ */ diff --git a/third_party/xed/private.h b/third_party/xed/private.h index 0af73e2d6..84e0dc5d5 100644 --- a/third_party/xed/private.h +++ b/third_party/xed/private.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_XED_PRIVATE_H_ #define COSMOPOLITAN_THIRD_PARTY_XED_PRIVATE_H_ #include "third_party/xed/x86.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef int xed_int_t; @@ -12,5 +11,4 @@ typedef intptr_t xed_addr_t; typedef bool xed_bool_t; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_XED_PRIVATE_H_ */ diff --git a/third_party/xed/x86.h b/third_party/xed/x86.h index c506c0b8c..623f2cd45 100644 --- a/third_party/xed/x86.h +++ b/third_party/xed/x86.h @@ -42,7 +42,6 @@ #define xed_sib_scale(M) (((M)&0xff) >> 6) #define xed_get_modrm_reg_field(M) (((M)&0x38) >> 3) -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define XED_MACHINE_MODE_REAL XED_MODE_REAL @@ -246,5 +245,4 @@ int xed_instruction_length_decode(struct XedDecodedInst *, const void *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_XED_X86_H_ */ diff --git a/third_party/xed/x86features.c b/third_party/xed/x86features.c index b06f5ac97..65604c29b 100644 --- a/third_party/xed/x86features.c +++ b/third_party/xed/x86features.c @@ -36,7 +36,7 @@ asm(".include \"libc/disclaimer.inc\""); * example, 0x2800000ul was calculated as: 1UL<<(XED_ISA_SET_I86-64) | * 1UL<<(XED_ISA_SET_LAHF-64). */ -const uint64_t kXedChipFeatures[XED_CHIP_LAST][3] /* clang-format off */ = { +const uint64_t kXedChipFeatures[XED_CHIP_LAST][3] = { {0, 0, 0, }, {0, 0x02800000, 0, }, /*I86*/ {0, 0x02800000, 0x02000}, /*I86FP*/ @@ -89,4 +89,4 @@ const uint64_t kXedChipFeatures[XED_CHIP_LAST][3] /* clang-format off */ = { {0xfffffffc3f3fffec, 0xffffebff5fffdfb9, 0x7b79e}, /*ICEL..SERVER*/ {0xfffffffc3f3fffec, 0xffdffbf75fffdfbb, 0x7a79e}, /*FUTURE*/ {0xfffffffffffffffe, 0xffffffffffffffff, 0x7ffff} /*ALL*/ -} /* clang-format on */; +}; diff --git a/third_party/xed/x86ild.greg.c b/third_party/xed/x86ild.greg.c index e2c7d4bdc..422b7d8a9 100644 --- a/third_party/xed/x86ild.greg.c +++ b/third_party/xed/x86ild.greg.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/dce.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsr.h" #include "libc/log/libfatal.internal.h" #include "libc/macros.internal.h" diff --git a/third_party/xed/x86isa.h b/third_party/xed/x86isa.h index 3b03b3c6d..62e7473c4 100644 --- a/third_party/xed/x86isa.h +++ b/third_party/xed/x86isa.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_XED_X86ISA_H_ #define COSMOPOLITAN_THIRD_PARTY_XED_X86ISA_H_ #include "third_party/xed/x86.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define XED_CHIP_INVALID 1 @@ -257,5 +256,4 @@ void xed_get_chip_features(struct XedChipFeatures *, int); bool xed_isa_set_is_valid_for_chip(int, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_XED_X86ISA_H_ */ diff --git a/third_party/xxhash/LICENSE b/third_party/xxhash/LICENSE index 55c4fc095..e4c5da723 100644 --- a/third_party/xxhash/LICENSE +++ b/third_party/xxhash/LICENSE @@ -1,4 +1,3 @@ -// clang-format off xxHash Library Copyright (c) 2012-2021 Yann Collet All rights reserved. diff --git a/third_party/xxhash/cli/COPYING b/third_party/xxhash/cli/COPYING index 0d83b0427..d159169d1 100644 --- a/third_party/xxhash/cli/COPYING +++ b/third_party/xxhash/cli/COPYING @@ -1,4 +1,3 @@ -// clang-format off GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/third_party/xxhash/cli/README.md b/third_party/xxhash/cli/README.md index c8f33f0c5..a60a945fc 100644 --- a/third_party/xxhash/cli/README.md +++ b/third_party/xxhash/cli/README.md @@ -1,4 +1,3 @@ -// clang-format off This directory contains source code dedicated to the `xxhsum` command line utility, which is a user program of `libxxhash`. diff --git a/third_party/xxhash/cli/xsum_arch.h b/third_party/xxhash/cli/xsum_arch.h index ed7ee0aa4..76fcc2ef7 100644 --- a/third_party/xxhash/cli/xsum_arch.h +++ b/third_party/xxhash/cli/xsum_arch.h @@ -1,4 +1,3 @@ -// clang-format off /* * xxhsum - Command line interface for xxhash algorithms * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xsum_bench.c b/third_party/xxhash/cli/xsum_bench.c index 633f0451f..12f0e2c0b 100644 --- a/third_party/xxhash/cli/xsum_bench.c +++ b/third_party/xxhash/cli/xsum_bench.c @@ -1,4 +1,3 @@ -// clang-format off /* * xsum_bench - Benchmark functions for xxhsum * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xsum_bench.h b/third_party/xxhash/cli/xsum_bench.h index 894895bb3..53487cea0 100644 --- a/third_party/xxhash/cli/xsum_bench.h +++ b/third_party/xxhash/cli/xsum_bench.h @@ -1,4 +1,3 @@ -// clang-format off /* * xsum_bench - Benchmark functions for xxhsum * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xsum_config.h b/third_party/xxhash/cli/xsum_config.h index b3db44b89..a30cf28a4 100644 --- a/third_party/xxhash/cli/xsum_config.h +++ b/third_party/xxhash/cli/xsum_config.h @@ -1,4 +1,3 @@ -// clang-format off /* * xxhsum - Command line interface for xxhash algorithms * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xsum_os_specific.c b/third_party/xxhash/cli/xsum_os_specific.c index 767545184..1a767a16b 100644 --- a/third_party/xxhash/cli/xsum_os_specific.c +++ b/third_party/xxhash/cli/xsum_os_specific.c @@ -1,4 +1,3 @@ -// clang-format off /* * xxhsum - Command line interface for xxhash algorithms * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xsum_os_specific.h b/third_party/xxhash/cli/xsum_os_specific.h index e03aded7d..997e25589 100644 --- a/third_party/xxhash/cli/xsum_os_specific.h +++ b/third_party/xxhash/cli/xsum_os_specific.h @@ -1,4 +1,3 @@ -// clang-format off /* * xxhsum - Command line interface for xxhash algorithms * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xsum_output.c b/third_party/xxhash/cli/xsum_output.c index 71da757bf..594cfe35e 100644 --- a/third_party/xxhash/cli/xsum_output.c +++ b/third_party/xxhash/cli/xsum_output.c @@ -1,4 +1,3 @@ -// clang-format off /* * xxhsum - Command line interface for xxhash algorithms * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xsum_output.h b/third_party/xxhash/cli/xsum_output.h index 1f681d8f3..696543f35 100644 --- a/third_party/xxhash/cli/xsum_output.h +++ b/third_party/xxhash/cli/xsum_output.h @@ -1,4 +1,3 @@ -// clang-format off /* * xxhsum - Command line interface for xxhash algorithms * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xsum_sanity_check.c b/third_party/xxhash/cli/xsum_sanity_check.c index 591aedc11..2dcc70020 100644 --- a/third_party/xxhash/cli/xsum_sanity_check.c +++ b/third_party/xxhash/cli/xsum_sanity_check.c @@ -1,4 +1,3 @@ -// clang-format off /* * xxhsum - Command line interface for xxhash algorithms * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xsum_sanity_check.h b/third_party/xxhash/cli/xsum_sanity_check.h index 29ada2d42..116b5c95d 100644 --- a/third_party/xxhash/cli/xsum_sanity_check.h +++ b/third_party/xxhash/cli/xsum_sanity_check.h @@ -1,4 +1,3 @@ -// clang-format off /* * xxhsum - Command line interface for xxhash algorithms * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/cli/xxhsum.1 b/third_party/xxhash/cli/xxhsum.1 index 672a63c57..715fc4be9 100644 --- a/third_party/xxhash/cli/xxhsum.1 +++ b/third_party/xxhash/cli/xxhsum.1 @@ -1,4 +1,3 @@ -// clang-format off .TH "XXHSUM" "1" "December 2021" "xxhsum 0.8.1" "User Commands" .SH "NAME" \fBxxhsum\fR \- print or check xxHash non\-cryptographic checksums diff --git a/third_party/xxhash/cli/xxhsum.1.md b/third_party/xxhash/cli/xxhsum.1.md index 049eff36d..8d9df5d03 100644 --- a/third_party/xxhash/cli/xxhsum.1.md +++ b/third_party/xxhash/cli/xxhsum.1.md @@ -1,4 +1,3 @@ -// clang-format off xxhsum(1) -- print or check xxHash non-cryptographic checksums ============================================================== diff --git a/third_party/xxhash/cli/xxhsum.c b/third_party/xxhash/cli/xxhsum.c index e20d5273d..01ee976fe 100644 --- a/third_party/xxhash/cli/xxhsum.c +++ b/third_party/xxhash/cli/xxhsum.c @@ -1,4 +1,3 @@ -// clang-format off /* * xxhsum - Command line interface for xxhash algorithms * Copyright (C) 2013-2021 Yann Collet diff --git a/third_party/xxhash/tests/Makefile b/third_party/xxhash/tests/Makefile index 9c764ea57..eee15094a 100644 --- a/third_party/xxhash/tests/Makefile +++ b/third_party/xxhash/tests/Makefile @@ -1,4 +1,3 @@ -// clang-format off # ################################################################ # xxHash Makefile # Copyright (C) 2012-2021 Yann Collet diff --git a/third_party/xxhash/tests/bench/.clang_complete b/third_party/xxhash/tests/bench/.clang_complete index 7f87e84fc..87dff6b82 100644 --- a/third_party/xxhash/tests/bench/.clang_complete +++ b/third_party/xxhash/tests/bench/.clang_complete @@ -1,2 +1 @@ -// clang-format off -I../.. diff --git a/third_party/xxhash/tests/bench/.gitignore b/third_party/xxhash/tests/bench/.gitignore index e9cdc8bdf..ede2d5880 100644 --- a/third_party/xxhash/tests/bench/.gitignore +++ b/third_party/xxhash/tests/bench/.gitignore @@ -1,4 +1,3 @@ -// clang-format off # build artifacts *.o diff --git a/third_party/xxhash/tests/bench/LICENSE b/third_party/xxhash/tests/bench/LICENSE index 0d83b0427..d159169d1 100644 --- a/third_party/xxhash/tests/bench/LICENSE +++ b/third_party/xxhash/tests/bench/LICENSE @@ -1,4 +1,3 @@ -// clang-format off GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/third_party/xxhash/tests/bench/Makefile b/third_party/xxhash/tests/bench/Makefile index 4832ffc57..4eb7467e1 100644 --- a/third_party/xxhash/tests/bench/Makefile +++ b/third_party/xxhash/tests/bench/Makefile @@ -1,4 +1,3 @@ -// clang-format off # ################################################################ # xxHash benchHash Makefile # Copyright (C) 2019-2021 Yann Collet diff --git a/third_party/xxhash/tests/bench/benchHash.c b/third_party/xxhash/tests/bench/benchHash.c index 45bcd58bb..90289ce17 100644 --- a/third_party/xxhash/tests/bench/benchHash.c +++ b/third_party/xxhash/tests/bench/benchHash.c @@ -1,4 +1,3 @@ -// clang-format off /* * Hash benchmark module * Part of the xxHash project diff --git a/third_party/xxhash/tests/bench/benchHash.h b/third_party/xxhash/tests/bench/benchHash.h index ea49079f0..a76172164 100644 --- a/third_party/xxhash/tests/bench/benchHash.h +++ b/third_party/xxhash/tests/bench/benchHash.h @@ -1,4 +1,3 @@ -// clang-format off /* * Hash benchmark module * Part of the xxHash project diff --git a/third_party/xxhash/tests/bench/benchfn.c b/third_party/xxhash/tests/bench/benchfn.c index ea13ef6d0..f07f907c6 100644 --- a/third_party/xxhash/tests/bench/benchfn.c +++ b/third_party/xxhash/tests/bench/benchfn.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (C) 2016-2021 Yann Collet, Facebook, Inc. * All rights reserved. diff --git a/third_party/xxhash/tests/bench/benchfn.h b/third_party/xxhash/tests/bench/benchfn.h index c615fe9d0..f7ee78e21 100644 --- a/third_party/xxhash/tests/bench/benchfn.h +++ b/third_party/xxhash/tests/bench/benchfn.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (C) 2016-2021 Yann Collet, Facebook, Inc. * All rights reserved. diff --git a/third_party/xxhash/tests/bench/bhDisplay.c b/third_party/xxhash/tests/bench/bhDisplay.c index 8d244aea0..9d3ed34da 100644 --- a/third_party/xxhash/tests/bench/bhDisplay.c +++ b/third_party/xxhash/tests/bench/bhDisplay.c @@ -1,4 +1,3 @@ -// clang-format off /* * CSV Display module for the hash benchmark program * Part of the xxHash project diff --git a/third_party/xxhash/tests/bench/bhDisplay.h b/third_party/xxhash/tests/bench/bhDisplay.h index c9b5de2ca..917a70b20 100644 --- a/third_party/xxhash/tests/bench/bhDisplay.h +++ b/third_party/xxhash/tests/bench/bhDisplay.h @@ -1,4 +1,3 @@ -// clang-format off /* * CSV Display module for the hash benchmark program * Part of the xxHash project diff --git a/third_party/xxhash/tests/bench/hashes.h b/third_party/xxhash/tests/bench/hashes.h index ae016d8f3..e030a22ee 100644 --- a/third_party/xxhash/tests/bench/hashes.h +++ b/third_party/xxhash/tests/bench/hashes.h @@ -1,4 +1,3 @@ -// clang-format off /* * List hash algorithms to benchmark * Part of xxHash project diff --git a/third_party/xxhash/tests/bench/main.c b/third_party/xxhash/tests/bench/main.c index 04128291c..3f8f4b42e 100644 --- a/third_party/xxhash/tests/bench/main.c +++ b/third_party/xxhash/tests/bench/main.c @@ -1,4 +1,3 @@ -// clang-format off /* * Main program to benchmark hash functions * Part of the xxHash project diff --git a/third_party/xxhash/tests/bench/timefn.c b/third_party/xxhash/tests/bench/timefn.c index fa7158a9a..cb65af84e 100644 --- a/third_party/xxhash/tests/bench/timefn.c +++ b/third_party/xxhash/tests/bench/timefn.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (C) 2019-2021 Yann Collet, Facebook, Inc. * All rights reserved. diff --git a/third_party/xxhash/tests/bench/timefn.h b/third_party/xxhash/tests/bench/timefn.h index 7776abc84..ce52d1265 100644 --- a/third_party/xxhash/tests/bench/timefn.h +++ b/third_party/xxhash/tests/bench/timefn.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2016-2021 Yann Collet, Facebook, Inc. * All rights reserved. diff --git a/third_party/xxhash/tests/cli-comment-line.sh b/third_party/xxhash/tests/cli-comment-line.sh index 37cfb0b00..0c024ccab 100644 --- a/third_party/xxhash/tests/cli-comment-line.sh +++ b/third_party/xxhash/tests/cli-comment-line.sh @@ -1,4 +1,3 @@ -// clang-format off #!/bin/bash # Exit immediately if any command fails. diff --git a/third_party/xxhash/tests/collisions/.gitignore b/third_party/xxhash/tests/collisions/.gitignore index cb8a795e1..f85592639 100644 --- a/third_party/xxhash/tests/collisions/.gitignore +++ b/third_party/xxhash/tests/collisions/.gitignore @@ -1,3 +1,2 @@ -// clang-format off #build artefacts collisionsTest diff --git a/third_party/xxhash/tests/collisions/LICENSE b/third_party/xxhash/tests/collisions/LICENSE index 0d83b0427..d159169d1 100644 --- a/third_party/xxhash/tests/collisions/LICENSE +++ b/third_party/xxhash/tests/collisions/LICENSE @@ -1,4 +1,3 @@ -// clang-format off GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/third_party/xxhash/tests/collisions/Makefile b/third_party/xxhash/tests/collisions/Makefile index b56d89499..7191b70a1 100644 --- a/third_party/xxhash/tests/collisions/Makefile +++ b/third_party/xxhash/tests/collisions/Makefile @@ -1,4 +1,3 @@ -// clang-format off # Brute force collision tester for 64-bit hashes # Part of xxHash project # Copyright (C) 2019-2021 Yann Collet diff --git a/third_party/xxhash/tests/collisions/README.md b/third_party/xxhash/tests/collisions/README.md index ddbed9c72..be1c9c3f9 100644 --- a/third_party/xxhash/tests/collisions/README.md +++ b/third_party/xxhash/tests/collisions/README.md @@ -1,4 +1,3 @@ -// clang-format off __collisionsTest__ is a brute force hash analyzer which will measure a 64-bit hash algorithm's collision rate diff --git a/third_party/xxhash/tests/collisions/allcodecs/README.md b/third_party/xxhash/tests/collisions/allcodecs/README.md index acc356a01..d41fc2dbb 100644 --- a/third_party/xxhash/tests/collisions/allcodecs/README.md +++ b/third_party/xxhash/tests/collisions/allcodecs/README.md @@ -1,2 +1 @@ -// clang-format off Put in this directory all hash algorithms to test diff --git a/third_party/xxhash/tests/collisions/allcodecs/dummy.c b/third_party/xxhash/tests/collisions/allcodecs/dummy.c index 233413bf0..6d0df8d9e 100644 --- a/third_party/xxhash/tests/collisions/allcodecs/dummy.c +++ b/third_party/xxhash/tests/collisions/allcodecs/dummy.c @@ -1,4 +1,3 @@ -// clang-format off /* * dummy.c, a fake hash algorithm, just to test integration capabilities. * Part of the xxHash project diff --git a/third_party/xxhash/tests/collisions/allcodecs/dummy.h b/third_party/xxhash/tests/collisions/allcodecs/dummy.h index 5c9798e46..4d02424ff 100644 --- a/third_party/xxhash/tests/collisions/allcodecs/dummy.h +++ b/third_party/xxhash/tests/collisions/allcodecs/dummy.h @@ -1,4 +1,3 @@ -// clang-format off /* * dummy.c, * A fake hash algorithm, just to test integration capabilities. diff --git a/third_party/xxhash/tests/collisions/hashes.h b/third_party/xxhash/tests/collisions/hashes.h index cab86469b..60b38770b 100644 --- a/third_party/xxhash/tests/collisions/hashes.h +++ b/third_party/xxhash/tests/collisions/hashes.h @@ -1,4 +1,3 @@ -// clang-format off /* * List of hashes for the brute force collision tester * Part of xxHash project diff --git a/third_party/xxhash/tests/collisions/main.c b/third_party/xxhash/tests/collisions/main.c index 4cbfa75e1..8970021c2 100644 --- a/third_party/xxhash/tests/collisions/main.c +++ b/third_party/xxhash/tests/collisions/main.c @@ -1,4 +1,3 @@ -// clang-format off /* * Brute force collision tester for 64-bit hashes * Part of the xxHash project diff --git a/third_party/xxhash/tests/collisions/pool.c b/third_party/xxhash/tests/collisions/pool.c index 46b6d0e5d..293a644a0 100644 --- a/third_party/xxhash/tests/collisions/pool.c +++ b/third_party/xxhash/tests/collisions/pool.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (C) 2016-2021 Yann Collet, Facebook, Inc. * All rights reserved. diff --git a/third_party/xxhash/tests/collisions/pool.h b/third_party/xxhash/tests/collisions/pool.h index ee4828c7f..bba0d4425 100644 --- a/third_party/xxhash/tests/collisions/pool.h +++ b/third_party/xxhash/tests/collisions/pool.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) 2016-2021 Yann Collet, Facebook, Inc. * All rights reserved. diff --git a/third_party/xxhash/tests/collisions/sort.cc b/third_party/xxhash/tests/collisions/sort.cc index 97d5f6794..3574361e6 100644 --- a/third_party/xxhash/tests/collisions/sort.cc +++ b/third_party/xxhash/tests/collisions/sort.cc @@ -1,4 +1,3 @@ -// clang-format off /* * sort.cc - C++ sort functions * Copyright (C) 2019-2021 Yann Collet diff --git a/third_party/xxhash/tests/collisions/sort.hh b/third_party/xxhash/tests/collisions/sort.hh index f5cee3faa..a1dc5006d 100644 --- a/third_party/xxhash/tests/collisions/sort.hh +++ b/third_party/xxhash/tests/collisions/sort.hh @@ -1,4 +1,3 @@ -// clang-format off /* * sort.hh - headers for C++ sort functions * Copyright (C) 2019-2021 Yann Collet diff --git a/third_party/xxhash/tests/collisions/threading.c b/third_party/xxhash/tests/collisions/threading.c index a7a65d21b..a97dc3602 100644 --- a/third_party/xxhash/tests/collisions/threading.c +++ b/third_party/xxhash/tests/collisions/threading.c @@ -1,4 +1,3 @@ -// clang-format off /** * Copyright (c) 2016 Tino Reichardt * All rights reserved. diff --git a/third_party/xxhash/tests/collisions/threading.h b/third_party/xxhash/tests/collisions/threading.h index 90f849bfb..78539c3ea 100644 --- a/third_party/xxhash/tests/collisions/threading.h +++ b/third_party/xxhash/tests/collisions/threading.h @@ -1,4 +1,3 @@ -// clang-format off /** * Copyright (c) 2016 Tino Reichardt * All rights reserved. diff --git a/third_party/xxhash/tests/filename-escape.sh b/third_party/xxhash/tests/filename-escape.sh index 4a4d2fee4..7c52e7ea1 100755 --- a/third_party/xxhash/tests/filename-escape.sh +++ b/third_party/xxhash/tests/filename-escape.sh @@ -1,4 +1,3 @@ -// clang-format off #!/bin/bash # Exit immediately if any command fails. diff --git a/third_party/xxhash/tests/generate_unicode_test.c b/third_party/xxhash/tests/generate_unicode_test.c index fb25de935..50811be32 100644 --- a/third_party/xxhash/tests/generate_unicode_test.c +++ b/third_party/xxhash/tests/generate_unicode_test.c @@ -1,4 +1,3 @@ -// clang-format off /* * Generates a Unicode test for xxhsum without using Unicode in the source files. * diff --git a/third_party/xxhash/tests/multiInclude.c b/third_party/xxhash/tests/multiInclude.c index bf15cf353..2c60cf626 100644 --- a/third_party/xxhash/tests/multiInclude.c +++ b/third_party/xxhash/tests/multiInclude.c @@ -1,4 +1,3 @@ -// clang-format off /* * Multi-include test program * Validates that xxhash.h can be included multiple times and in any order diff --git a/third_party/xxhash/tests/ppc_define.c b/third_party/xxhash/tests/ppc_define.c index e7531387c..c4e76435a 100644 --- a/third_party/xxhash/tests/ppc_define.c +++ b/third_party/xxhash/tests/ppc_define.c @@ -1,4 +1,3 @@ -// clang-format off /* * Multi-include test program * ensure that pixel, bool and vector are not redefined diff --git a/third_party/xxhash/tests/sanity_test.c b/third_party/xxhash/tests/sanity_test.c index cd1d6050d..1f7c2d848 100644 --- a/third_party/xxhash/tests/sanity_test.c +++ b/third_party/xxhash/tests/sanity_test.c @@ -1,4 +1,3 @@ -// clang-format off // xxHash/tests/sanity_test.c // SPDX-License-Identifier: GPL-2.0-only // diff --git a/third_party/xxhash/tests/sanity_test_vectors.h b/third_party/xxhash/tests/sanity_test_vectors.h index c00906862..a5025a2d3 100644 --- a/third_party/xxhash/tests/sanity_test_vectors.h +++ b/third_party/xxhash/tests/sanity_test_vectors.h @@ -1,4 +1,3 @@ -// clang-format off typedef struct { XSUM_U32 len; XSUM_U32 seed; diff --git a/third_party/xxhash/tests/sanity_test_vectors_generator.c b/third_party/xxhash/tests/sanity_test_vectors_generator.c index 0337fcd8f..b1385b08c 100644 --- a/third_party/xxhash/tests/sanity_test_vectors_generator.c +++ b/third_party/xxhash/tests/sanity_test_vectors_generator.c @@ -1,4 +1,3 @@ -// clang-format off // xxHash/tests/sanity_test_vectors_generator.c // SPDX-License-Identifier: GPL-2.0-only // diff --git a/third_party/xxhash/tests/unicode_lint.sh b/third_party/xxhash/tests/unicode_lint.sh index 878807ea4..2e68f5867 100755 --- a/third_party/xxhash/tests/unicode_lint.sh +++ b/third_party/xxhash/tests/unicode_lint.sh @@ -1,4 +1,3 @@ -// clang-format off #!/bin/bash # `unicode_lint.sh' determines whether source files under ${dirs} directories diff --git a/third_party/xxhash/xxh3.h b/third_party/xxhash/xxh3.h index 2673b567d..8522d954b 100644 --- a/third_party/xxhash/xxh3.h +++ b/third_party/xxhash/xxh3.h @@ -1,4 +1,3 @@ -// clang-format off /* * xxHash - Extremely Fast Hash algorithm * Development source file for `xxh3` diff --git a/third_party/xxhash/xxh_x86dispatch.c b/third_party/xxhash/xxh_x86dispatch.c index 04fc36c7c..7168026be 100644 --- a/third_party/xxhash/xxh_x86dispatch.c +++ b/third_party/xxhash/xxh_x86dispatch.c @@ -1,4 +1,3 @@ -// clang-format off #ifdef __x86_64__ /* diff --git a/third_party/xxhash/xxh_x86dispatch.h b/third_party/xxhash/xxh_x86dispatch.h index be6b434f7..0bdc23a0d 100644 --- a/third_party/xxhash/xxh_x86dispatch.h +++ b/third_party/xxhash/xxh_x86dispatch.h @@ -1,4 +1,3 @@ -// clang-format off /* * xxHash - XXH3 Dispatcher for x86-based targets * Copyright (C) 2020-2021 Yann Collet diff --git a/third_party/xxhash/xxhash.c b/third_party/xxhash/xxhash.c index 6da57ccd6..f6047efa3 100644 --- a/third_party/xxhash/xxhash.c +++ b/third_party/xxhash/xxhash.c @@ -1,4 +1,3 @@ -// clang-format off /* * xxHash - Extremely Fast Hash algorithm * Copyright (C) 2012-2021 Yann Collet diff --git a/third_party/xxhash/xxhash.h b/third_party/xxhash/xxhash.h index 5351be459..b69ea3bad 100644 --- a/third_party/xxhash/xxhash.h +++ b/third_party/xxhash/xxhash.h @@ -1,4 +1,3 @@ -// clang-format off /* * xxHash - Extremely Fast Hash algorithm * Header File diff --git a/third_party/zip/api.h b/third_party/zip/api.h index 4f62616e3..7ef77aeec 100644 --- a/third_party/zip/api.h +++ b/third_party/zip/api.h @@ -1,4 +1,3 @@ -// clang-format off /* api.h - Zip 3 diff --git a/third_party/zip/crc32.c b/third_party/zip/crc32.c index c1a96a5ba..52ea346ae 100644 --- a/third_party/zip/crc32.c +++ b/third_party/zip/crc32.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* Copyright (c) 1990-2008 Info-ZIP. All rights reserved. diff --git a/third_party/zip/crc32.h b/third_party/zip/crc32.h index 4486c5c23..83af2404c 100644 --- a/third_party/zip/crc32.h +++ b/third_party/zip/crc32.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2008 Info-ZIP. All rights reserved. diff --git a/third_party/zip/crypt.c b/third_party/zip/crypt.c index c02e9f9bc..bfb702905 100644 --- a/third_party/zip/crypt.c +++ b/third_party/zip/crypt.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2008 Info-ZIP. All rights reserved. diff --git a/third_party/zip/crypt.h b/third_party/zip/crypt.h index 20b45b861..61f3234c1 100644 --- a/third_party/zip/crypt.h +++ b/third_party/zip/crypt.h @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2007 Info-ZIP. All rights reserved. diff --git a/third_party/zip/deflate.c b/third_party/zip/deflate.c index 139ed048e..8b686494d 100644 --- a/third_party/zip/deflate.c +++ b/third_party/zip/deflate.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* deflate.c - Zip 3 diff --git a/third_party/zip/fileio.c b/third_party/zip/fileio.c index cd24e8645..0e4ee237e 100644 --- a/third_party/zip/fileio.c +++ b/third_party/zip/fileio.c @@ -1,4 +1,3 @@ -// clang-format off /* fileio.c - Zip 3 diff --git a/third_party/zip/globals.c b/third_party/zip/globals.c index 8b6bbbf4b..9bd93f3d5 100644 --- a/third_party/zip/globals.c +++ b/third_party/zip/globals.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* globals.c - Zip 3 diff --git a/third_party/zip/osdep.h b/third_party/zip/osdep.h index c2dfca459..c002669db 100644 --- a/third_party/zip/osdep.h +++ b/third_party/zip/osdep.h @@ -1,4 +1,3 @@ -// clang-format off /* unix/osdep.h - Zip 3 diff --git a/third_party/zip/revision.h b/third_party/zip/revision.h index 0a9d64ab5..7348cb73e 100644 --- a/third_party/zip/revision.h +++ b/third_party/zip/revision.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* revision.h - Zip 3 diff --git a/third_party/zip/tailor.h b/third_party/zip/tailor.h index 73a6c79b4..34dc03491 100644 --- a/third_party/zip/tailor.h +++ b/third_party/zip/tailor.h @@ -1,4 +1,3 @@ -// clang-format off /* tailor.h - Zip 3 diff --git a/third_party/zip/timezone.c b/third_party/zip/timezone.c index 92b29d3dd..200eaa9c7 100644 --- a/third_party/zip/timezone.c +++ b/third_party/zip/timezone.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* timezone.c - Zip 3 diff --git a/third_party/zip/timezone.h b/third_party/zip/timezone.h index 076c7f05f..f4f46f2df 100644 --- a/third_party/zip/timezone.h +++ b/third_party/zip/timezone.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* timezone.h - Zip 3 diff --git a/third_party/zip/trees.c b/third_party/zip/trees.c index 406aa83d8..06ad3d5c2 100644 --- a/third_party/zip/trees.c +++ b/third_party/zip/trees.c @@ -1,4 +1,3 @@ -/* clang-format off */ /* trees.h - Zip 3 diff --git a/third_party/zip/ttyio.c b/third_party/zip/ttyio.c index dca8e0e58..477189f70 100644 --- a/third_party/zip/ttyio.c +++ b/third_party/zip/ttyio.c @@ -1,4 +1,3 @@ -// clang-format off /* ttyio.c - Zip 3 diff --git a/third_party/zip/ttyio.h b/third_party/zip/ttyio.h index 333af6897..fcaf811f4 100644 --- a/third_party/zip/ttyio.h +++ b/third_party/zip/ttyio.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* ttyio.h - Zip 3 diff --git a/third_party/zip/unix.c b/third_party/zip/unix.c index 0af1e2c31..ef9593e99 100644 --- a/third_party/zip/unix.c +++ b/third_party/zip/unix.c @@ -1,4 +1,3 @@ -// clang-format off /* unix/unix.c - Zip 3 diff --git a/third_party/zip/util.c b/third_party/zip/util.c index da42fa60d..9845d4d3b 100644 --- a/third_party/zip/util.c +++ b/third_party/zip/util.c @@ -1,4 +1,3 @@ -// clang-format off /* util.c diff --git a/third_party/zip/zbz2err.c b/third_party/zip/zbz2err.c index 4ff36f721..9952150fc 100644 --- a/third_party/zip/zbz2err.c +++ b/third_party/zip/zbz2err.c @@ -1,4 +1,3 @@ -// clang-format off /* Copyright (c) 1990-2008 Info-ZIP. All rights reserved. diff --git a/third_party/zip/zip.c b/third_party/zip/zip.c index 3b66255de..baf29593e 100644 --- a/third_party/zip/zip.c +++ b/third_party/zip/zip.c @@ -1,4 +1,3 @@ -// clang-format off /* zip.c - Zip 3 diff --git a/third_party/zip/zip.h b/third_party/zip/zip.h index 01405d0ff..f917dd1ce 100644 --- a/third_party/zip/zip.h +++ b/third_party/zip/zip.h @@ -1,4 +1,3 @@ -// clang-format off /* zip.h - Zip 3 diff --git a/third_party/zip/zipcloak.c b/third_party/zip/zipcloak.c index 8badbca18..ed31b8965 100644 --- a/third_party/zip/zipcloak.c +++ b/third_party/zip/zipcloak.c @@ -1,4 +1,3 @@ -// clang-format off /* zipcloak.c - Zip 3 diff --git a/third_party/zip/ziperr.h b/third_party/zip/ziperr.h index 0c25c3ddc..19c7655a9 100644 --- a/third_party/zip/ziperr.h +++ b/third_party/zip/ziperr.h @@ -1,4 +1,3 @@ -/* clang-format off */ /* ziperr.h - Zip 3 diff --git a/third_party/zip/zipfile.c b/third_party/zip/zipfile.c index 655ddd86d..7b923b80e 100644 --- a/third_party/zip/zipfile.c +++ b/third_party/zip/zipfile.c @@ -1,4 +1,3 @@ -// clang-format off /* zipfile.c - Zip 3 diff --git a/third_party/zip/zipnote.c b/third_party/zip/zipnote.c index 19ed23dcd..8e382fb8a 100644 --- a/third_party/zip/zipnote.c +++ b/third_party/zip/zipnote.c @@ -1,4 +1,3 @@ -// clang-format off /* zipnote.c - Zip 3 diff --git a/third_party/zip/zipsplit.c b/third_party/zip/zipsplit.c index 399bf7f9f..a13f382e4 100644 --- a/third_party/zip/zipsplit.c +++ b/third_party/zip/zipsplit.c @@ -1,4 +1,3 @@ -// clang-format off /* zipsplit.c - Zip 3 diff --git a/third_party/zip/zipup.c b/third_party/zip/zipup.c index 9863faab5..e73cd68a2 100644 --- a/third_party/zip/zipup.c +++ b/third_party/zip/zipup.c @@ -1,4 +1,3 @@ -// clang-format off /* zipup.c - Zip 3 diff --git a/third_party/zip/zipup.h b/third_party/zip/zipup.h index 307fd6ea9..0fc3f899d 100644 --- a/third_party/zip/zipup.h +++ b/third_party/zip/zipup.h @@ -1,4 +1,3 @@ -// clang-format off /* unix/zipup.h - Zip 3 diff --git a/third_party/zlib/adler32.c b/third_party/zlib/adler32.c index 461c11aa8..8d2ebe8ba 100644 --- a/third_party/zlib/adler32.c +++ b/third_party/zlib/adler32.c @@ -1,8 +1,6 @@ -// clang-format off /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8 -*-│ │vi: set net ft=c ts=4 sts=4 sw=4 fenc=utf-8 :vi│ ╚─────────────────────────────────────────────────────────────────────────────*/ -// clang-format off /* adler32.c -- compute the Adler-32 checksum of a data stream * Copyright (C) 1995-2011, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h diff --git a/third_party/zlib/adler32_simd.c b/third_party/zlib/adler32_simd.c index 929655f76..f767c49bd 100644 --- a/third_party/zlib/adler32_simd.c +++ b/third_party/zlib/adler32_simd.c @@ -1,7 +1,6 @@ asm(".ident\t\"\\n\\n\ Chromium (BSD-3 License)\\n\ Copyright 2017 The Chromium Authors\""); -// clang-format off /* adler32_simd.c * diff --git a/third_party/zlib/chunkcopy.inc b/third_party/zlib/chunkcopy.inc index caf734952..d667ac45a 100644 --- a/third_party/zlib/chunkcopy.inc +++ b/third_party/zlib/chunkcopy.inc @@ -1,4 +1,3 @@ -// clang-format off /* chunkcopy.h -- fast chunk copy and set operations * Copyright (C) 2017 ARM, Inc. * Copyright 2017 The Chromium Authors diff --git a/third_party/zlib/compress.c b/third_party/zlib/compress.c index 84df9e615..9a3d349ff 100644 --- a/third_party/zlib/compress.c +++ b/third_party/zlib/compress.c @@ -8,7 +8,6 @@ #include "third_party/zlib/internal.h" #include "third_party/zlib/macros.internal.h" #include "third_party/zlib/zlib.h" -// clang-format off /* @(#) $Id$ */ diff --git a/third_party/zlib/cpu_features.internal.h b/third_party/zlib/cpu_features.internal.h index e6e7a8e45..48da0e7b4 100644 --- a/third_party/zlib/cpu_features.internal.h +++ b/third_party/zlib/cpu_features.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_ZLIB_CPU_FEATURES_H_ #include "libc/nexgen32e/x86feature.h" #include "third_party/zlib/zconf.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #ifdef __x86_64__ @@ -28,5 +27,4 @@ void cpu_check_features(void); #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_CPU_FEATURES_H_ */ diff --git a/third_party/zlib/crc32.c b/third_party/zlib/crc32.c index cdfaf82dd..710d4bcf9 100644 --- a/third_party/zlib/crc32.c +++ b/third_party/zlib/crc32.c @@ -13,7 +13,6 @@ #include "third_party/zlib/deflate.internal.h" #include "third_party/zlib/internal.h" #include "third_party/zlib/macros.internal.h" -// clang-format off /* @(#) $Id$ */ diff --git a/third_party/zlib/crc32.inc b/third_party/zlib/crc32.inc index 8c249fb11..644e6fda9 100644 --- a/third_party/zlib/crc32.inc +++ b/third_party/zlib/crc32.inc @@ -1,4 +1,3 @@ -// clang-format off /* crc32.inc -- tables for rapid CRC calculation * Generated automatically by crc32.c diff --git a/third_party/zlib/crc32_simd.c b/third_party/zlib/crc32_simd.c index 740f8259e..cf38bb94b 100644 --- a/third_party/zlib/crc32_simd.c +++ b/third_party/zlib/crc32_simd.c @@ -8,7 +8,6 @@ asm(".ident\t\"\\n\\n\ Chromium (BSD-3 License)\\n\ Copyright 2017 The Chromium Authors\""); -// clang-format off #include "third_party/intel/x86gprintrin.internal.h" #include "third_party/zlib/crc32_simd.internal.h" diff --git a/third_party/zlib/crc32_simd.internal.h b/third_party/zlib/crc32_simd.internal.h index d36761175..65f90b294 100755 --- a/third_party/zlib/crc32_simd.internal.h +++ b/third_party/zlib/crc32_simd.internal.h @@ -3,9 +3,7 @@ #include "third_party/zlib/deflate.internal.h" #include "third_party/zlib/zconf.h" #include "third_party/zlib/zutil.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -// clang-format off /* * crc32_sse42_simd_(): compute the crc32 of the buffer, where the buffer @@ -53,5 +51,4 @@ uint32_t ZLIB_INTERNAL armv8_crc32_pmull_little(const unsigned char* buf, #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_CRC32_SIMD_INTERNAL_H_ */ diff --git a/third_party/zlib/crc_folding.c b/third_party/zlib/crc_folding.c index 4516afa29..2702f909a 100644 --- a/third_party/zlib/crc_folding.c +++ b/third_party/zlib/crc_folding.c @@ -7,7 +7,6 @@ #include "third_party/intel/immintrin.internal.h" #include "third_party/intel/wmmintrin.internal.h" #include "third_party/zlib/deflate.internal.h" -// clang-format off /* * Compute the CRC32 using a parallelized folding approach with the PCLMULQDQ diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c index 06a467b3c..8b81cca9d 100644 --- a/third_party/zlib/deflate.c +++ b/third_party/zlib/deflate.c @@ -16,7 +16,6 @@ asm(".ident\t\"\\n\\n\ zlib 1.2.13 (zlib License)\\n\ Copyright 1995-2022 Jean-loup Gailly and Mark Adler\\n\ Invented 1990 Phillip Walter Katz\""); -// clang-format off /* * ALGORITHM diff --git a/third_party/zlib/deflate.internal.h b/third_party/zlib/deflate.internal.h index a4962ae0d..a018fb3b5 100644 --- a/third_party/zlib/deflate.internal.h +++ b/third_party/zlib/deflate.internal.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_THIRD_PARTY_ZLIB_DEFLATE_INTERNAL_H_ #include "third_party/zlib/macros.internal.h" #include "third_party/zlib/zutil.internal.h" -/* clang-format off */ #define DIST_CODE_LEN 512 /* see definition of array dist_code below */ @@ -40,7 +39,6 @@ #define FINISH_STATE 666 /* stream complete */ /* Stream status */ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /* define NO_GZIP when compiling if you want to disable gzip header and @@ -349,5 +347,4 @@ void ZLIB_INTERNAL crc_fold_copy(deflate_state* const s, unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state* const s); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_DEFLATE_INTERNAL_H_ */ diff --git a/third_party/zlib/gz/gzclose.c b/third_party/zlib/gz/gzclose.c index 09961e5ce..262dfaf3b 100644 --- a/third_party/zlib/gz/gzclose.c +++ b/third_party/zlib/gz/gzclose.c @@ -7,7 +7,6 @@ */ #include "third_party/zlib/gz/gzguts.inc" #include "third_party/zlib/macros.internal.h" -// clang-format off /* gzclose() is in a separate file so that it is linked in only if it is used. That way the other gzclose functions can be used instead to avoid linking in diff --git a/third_party/zlib/gz/gzguts.inc b/third_party/zlib/gz/gzguts.inc index be00fbc30..65bf35cbe 100644 --- a/third_party/zlib/gz/gzguts.inc +++ b/third_party/zlib/gz/gzguts.inc @@ -4,7 +4,6 @@ #include "third_party/zlib/macros.internal.h" #include "third_party/zlib/zlib.h" #include "third_party/zlib/zutil.internal.h" -// clang-format off /* gzguts.h -- zlib internal header definitions for gz* operations * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler diff --git a/third_party/zlib/gz/gzlib.c b/third_party/zlib/gz/gzlib.c index 65ac20bbd..b48ed4aa1 100644 --- a/third_party/zlib/gz/gzlib.c +++ b/third_party/zlib/gz/gzlib.c @@ -14,7 +14,6 @@ #include "third_party/zlib/gz/gzguts.inc" #include "third_party/zlib/zlib.h" #include "third_party/zlib/zutil.internal.h" -// clang-format off #define LSEEK lseek diff --git a/third_party/zlib/gz/gzread.c b/third_party/zlib/gz/gzread.c index 00ee8f1c2..7329c2b04 100644 --- a/third_party/zlib/gz/gzread.c +++ b/third_party/zlib/gz/gzread.c @@ -12,7 +12,6 @@ #include "libc/str/str.h" #include "third_party/zlib/gz/gzguts.inc" #include "third_party/zlib/zlib.h" -// clang-format off /* Local functions */ local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); diff --git a/third_party/zlib/gz/gzwrite.c b/third_party/zlib/gz/gzwrite.c index e91976b4b..6e524f0d6 100644 --- a/third_party/zlib/gz/gzwrite.c +++ b/third_party/zlib/gz/gzwrite.c @@ -9,7 +9,6 @@ #include "libc/mem/mem.h" #include "libc/stdio/stdio.h" #include "third_party/zlib/gz/gzguts.inc" -// clang-format off /* Local functions */ local int gz_init OF((gz_statep)); diff --git a/third_party/zlib/infback.c b/third_party/zlib/infback.c index 702311bf8..764f4f8e8 100644 --- a/third_party/zlib/infback.c +++ b/third_party/zlib/infback.c @@ -11,7 +11,6 @@ #include "third_party/zlib/internal.h" #include "third_party/zlib/macros.internal.h" #include "third_party/zlib/zutil.internal.h" -// clang-format off /* This code is largely copied from inflate.c. Normally either infback.o or diff --git a/third_party/zlib/inffast.c b/third_party/zlib/inffast.c index c785b04da..8b2d48ddf 100644 --- a/third_party/zlib/inffast.c +++ b/third_party/zlib/inffast.c @@ -5,7 +5,6 @@ * Copyright (C) 1995-2017 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ -// clang-format off #include "third_party/zlib/zutil.internal.h" #include "third_party/zlib/inftrees.internal.h" diff --git a/third_party/zlib/inffast.internal.h b/third_party/zlib/inffast.internal.h index 9dbe3d1be..bed26e3ba 100644 --- a/third_party/zlib/inffast.internal.h +++ b/third_party/zlib/inffast.internal.h @@ -1,9 +1,7 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_ZLIB_INFFAST_INTERNAL_H_ #define COSMOPOLITAN_THIRD_PARTY_ZLIB_INFFAST_INTERNAL_H_ #include "third_party/zlib/zlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ /* INFLATE_FAST_MIN_INPUT: the minimum number of input bytes needed so that we can safely call inflate_fast() with only one up-front bounds check. One @@ -23,5 +21,4 @@ COSMOPOLITAN_C_START_ void inflate_fast(z_streamp strm, unsigned start); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_INFFAST_INTERNAL_H_ */ diff --git a/third_party/zlib/inffast_chunk.c b/third_party/zlib/inffast_chunk.c index 472d2ac7c..81da025cd 100644 --- a/third_party/zlib/inffast_chunk.c +++ b/third_party/zlib/inffast_chunk.c @@ -10,7 +10,6 @@ asm(".ident\t\"\\n\\n\ Chromium (BSD-3 License)\\n\ Copyright 2017 The Chromium Authors\""); -// clang-format off #include "third_party/zlib/zutil.internal.h" #include "third_party/zlib/inftrees.internal.h" diff --git a/third_party/zlib/inffixed.inc b/third_party/zlib/inffixed.inc index 0d6f2cd70..a29b836ed 100644 --- a/third_party/zlib/inffixed.inc +++ b/third_party/zlib/inffixed.inc @@ -1,4 +1,3 @@ -// clang-format off /* inffixed.h -- table for decoding fixed codes * Generated automatically by makefixed(). diff --git a/third_party/zlib/inflate.c b/third_party/zlib/inflate.c index c809f60eb..0ba721211 100644 --- a/third_party/zlib/inflate.c +++ b/third_party/zlib/inflate.c @@ -10,7 +10,6 @@ asm(".ident\t\"\\n\\n\ zlib 1.2.13 (zlib License)\\n\ Copyright 1995-2022 Jean-loup Gailly and Mark Adler\\n\ Invented 1990 Phillip Walter Katz\""); -// clang-format off /* * Change history: diff --git a/third_party/zlib/inflate.internal.h b/third_party/zlib/inflate.internal.h index f6208e5d1..727732969 100644 --- a/third_party/zlib/inflate.internal.h +++ b/third_party/zlib/inflate.internal.h @@ -3,9 +3,7 @@ #include "third_party/zlib/inftrees.internal.h" #include "third_party/zlib/macros.internal.h" #include "third_party/zlib/zlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ /* WARNING: this file should *not* be used by applications. It is part of the implementation of the compression library and is @@ -130,5 +128,4 @@ struct inflate_state { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_INFLATE_H_ */ diff --git a/third_party/zlib/inftrees.c b/third_party/zlib/inftrees.c index e08f2cb00..7d4fa3559 100644 --- a/third_party/zlib/inftrees.c +++ b/third_party/zlib/inftrees.c @@ -1,4 +1,3 @@ -// clang-format off /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8 -*-│ │vi: set net ft=c ts=4 sts=4 sw=4 fenc=utf-8 :vi│ ╚─────────────────────────────────────────────────────────────────────────────*/ @@ -13,7 +12,6 @@ asm(".ident\t\"\\n\\n\ zlib 1.2.13 (zlib License)\\n\ Copyright 1995-2022 Jean-loup Gailly and Mark Adler\\n\ Invented 1990 Phillip Walter Katz\""); -// clang-format off #define MAXBITS 15 diff --git a/third_party/zlib/inftrees.internal.h b/third_party/zlib/inftrees.internal.h index e772e6221..b254aa899 100644 --- a/third_party/zlib/inftrees.internal.h +++ b/third_party/zlib/inftrees.internal.h @@ -2,9 +2,7 @@ #define COSMOPOLITAN_THIRD_PARTY_ZLIB_INFTREES_INTERNAL_H_ #include "third_party/zlib/macros.internal.h" #include "third_party/zlib/zutil.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ /* inftrees.h -- header to use inftrees.c * Copyright (C) 1995-2005, 2010 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -69,5 +67,4 @@ int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, unsigned FAR *bits, unsigned short FAR *work)); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_INFTREES_INTERNAL_H_ */ diff --git a/third_party/zlib/insert_string.inc b/third_party/zlib/insert_string.inc index cb4a4486a..537bdbaca 100644 --- a/third_party/zlib/insert_string.inc +++ b/third_party/zlib/insert_string.inc @@ -1,4 +1,3 @@ -// clang-format off /* insert_string.h * * Copyright 2019 The Chromium Authors @@ -19,7 +18,6 @@ #include "third_party/zlib/cpu_features.internal.h" -// clang-format off #if defined(CRC32_SIMD_SSE42_PCLMUL) #include "third_party/intel/smmintrin.internal.h" /* Required to make MSVC bot build pass. */ diff --git a/third_party/zlib/internal.h b/third_party/zlib/internal.h index 34d383dde..3e68a827c 100644 --- a/third_party/zlib/internal.h +++ b/third_party/zlib/internal.h @@ -7,7 +7,6 @@ #define Z_CRC32_SSE42_MINIMUM_LENGTH 64 #define Z_CRC32_SSE42_CHUNKSIZE_MASK 15 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define zmemzero bzero @@ -27,5 +26,4 @@ void *zcalloc(void *, uInt, uInt); void zcfree(void *, void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_INTERNAL_H_ */ diff --git a/third_party/zlib/macros.internal.h b/third_party/zlib/macros.internal.h index 458b9eb3c..752c125b9 100644 --- a/third_party/zlib/macros.internal.h +++ b/third_party/zlib/macros.internal.h @@ -1,8 +1,6 @@ #ifndef COSMOPOLITAN_THIRD_PARTY_ZLIB_MACROS_INTERNAL_H_ #define COSMOPOLITAN_THIRD_PARTY_ZLIB_MACROS_INTERNAL_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -/* clang-format off */ #ifndef OF /* function prototypes */ # ifdef STDC @@ -100,5 +98,4 @@ COSMOPOLITAN_C_START_ #define z_off_t long COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_MACROS_INTERNAL_H_ */ diff --git a/third_party/zlib/slide_hash_simd.inc b/third_party/zlib/slide_hash_simd.inc index e4d19158f..90ee3c626 100644 --- a/third_party/zlib/slide_hash_simd.inc +++ b/third_party/zlib/slide_hash_simd.inc @@ -1,4 +1,3 @@ -// clang-format off /* slide_hash_simd.h * * Copyright 2022 The Chromium Authors diff --git a/third_party/zlib/trees.c b/third_party/zlib/trees.c index 5ba990198..31e316fd1 100644 --- a/third_party/zlib/trees.c +++ b/third_party/zlib/trees.c @@ -11,7 +11,6 @@ #include "libc/temp.h" #include "libc/str/str.h" #include "third_party/zlib/deflate.internal.h" -// clang-format off /* * ALGORITHM diff --git a/third_party/zlib/trees.inc b/third_party/zlib/trees.inc index 956692b61..4f24b0eeb 100644 --- a/third_party/zlib/trees.inc +++ b/third_party/zlib/trees.inc @@ -1,4 +1,3 @@ -// clang-format off local const ct_data static_ltree[L_CODES+2] = { {{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, diff --git a/third_party/zlib/uncompr.c b/third_party/zlib/uncompr.c index 3f3f3e22e..41ab3c8e3 100644 --- a/third_party/zlib/uncompr.c +++ b/third_party/zlib/uncompr.c @@ -9,7 +9,6 @@ #include "third_party/zlib/internal.h" #include "third_party/zlib/macros.internal.h" #include "third_party/zlib/zlib.h" -// clang-format off /* @(#) $Id$ */ diff --git a/third_party/zlib/zconf.h b/third_party/zlib/zconf.h index 1976ea610..3351fe91a 100644 --- a/third_party/zlib/zconf.h +++ b/third_party/zlib/zconf.h @@ -162,7 +162,6 @@ #define zlibCompileFlags _Cz_zlibCompileFlags #define zlibVersion _Cz_zlibVersion -#if !(__ASSEMBLER__ + __LINKER__ + 0) typedef unsigned char Byte; typedef unsigned int uInt; /* 16 bits or more */ @@ -179,5 +178,4 @@ typedef uint32_t z_crc_t; typedef int64_t z_off64_t; typedef size_t z_size_t; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_ZCONF_H_ */ diff --git a/third_party/zlib/zlib.h b/third_party/zlib/zlib.h index e28e08414..a9fb8cff1 100644 --- a/third_party/zlib/zlib.h +++ b/third_party/zlib/zlib.h @@ -137,7 +137,6 @@ /* The deflate compression method (the only one supported in this version) */ #define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef voidpf (*alloc_func)(voidpf opaque, uInt items, uInt size); @@ -1751,5 +1750,4 @@ int gzvprintf(gzFile file, const char *format, va_list va); void inflate_fast_chunk(z_streamp strm, unsigned start); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_THIRD_PARTY_ZLIB_ZLIB_H_ */ diff --git a/third_party/zlib/zutil.c b/third_party/zlib/zutil.c index 68ac61c83..826657508 100644 --- a/third_party/zlib/zutil.c +++ b/third_party/zlib/zutil.c @@ -10,7 +10,6 @@ #include "libc/mem/mem.h" #include "third_party/zlib/internal.h" #include "third_party/zlib/zutil.internal.h" -// clang-format off #pragma GCC diagnostic ignored "-Wimplicit-int" diff --git a/third_party/zlib/zutil.internal.h b/third_party/zlib/zutil.internal.h index 2417f749c..2e67adf66 100644 --- a/third_party/zlib/zutil.internal.h +++ b/third_party/zlib/zutil.internal.h @@ -28,7 +28,6 @@ #define HAVE_MEMCPY #endif -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #ifndef local @@ -135,5 +134,4 @@ typedef unsigned long ulg; #endif COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* ZUTIL_H */ diff --git a/third_party/zstd/lib/common/allocations.h b/third_party/zstd/lib/common/allocations.h index 952ca518f..3cb8cd00f 100644 --- a/third_party/zstd/lib/common/allocations.h +++ b/third_party/zstd/lib/common/allocations.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/bits.h b/third_party/zstd/lib/common/bits.h index 18b1af37a..4f89125e1 100644 --- a/third_party/zstd/lib/common/bits.h +++ b/third_party/zstd/lib/common/bits.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/bitstream.h b/third_party/zstd/lib/common/bitstream.h index 6e085fc4b..792b253a4 100644 --- a/third_party/zstd/lib/common/bitstream.h +++ b/third_party/zstd/lib/common/bitstream.h @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * bitstream * Part of FSE library diff --git a/third_party/zstd/lib/common/compiler.h b/third_party/zstd/lib/common/compiler.h index cbc046010..f4b6aec75 100644 --- a/third_party/zstd/lib/common/compiler.h +++ b/third_party/zstd/lib/common/compiler.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/cpu.h b/third_party/zstd/lib/common/cpu.h index 7a1b008c7..43ad3d624 100644 --- a/third_party/zstd/lib/common/cpu.h +++ b/third_party/zstd/lib/common/cpu.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/debug.c b/third_party/zstd/lib/common/debug.c index ee5a4de72..816dfd4bd 100644 --- a/third_party/zstd/lib/common/debug.c +++ b/third_party/zstd/lib/common/debug.c @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * debug * Part of FSE library diff --git a/third_party/zstd/lib/common/debug.h b/third_party/zstd/lib/common/debug.h index ce8653f41..b702256b6 100644 --- a/third_party/zstd/lib/common/debug.h +++ b/third_party/zstd/lib/common/debug.h @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * debug * Part of FSE library diff --git a/third_party/zstd/lib/common/entropy_common.c b/third_party/zstd/lib/common/entropy_common.c index 276c2474b..4b735faa1 100644 --- a/third_party/zstd/lib/common/entropy_common.c +++ b/third_party/zstd/lib/common/entropy_common.c @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * Common functions of New Generation Entropy library * Copyright (c) Meta Platforms, Inc. and affiliates. diff --git a/third_party/zstd/lib/common/error_private.c b/third_party/zstd/lib/common/error_private.c index 1de279027..dc571c81a 100644 --- a/third_party/zstd/lib/common/error_private.c +++ b/third_party/zstd/lib/common/error_private.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/error_private.h b/third_party/zstd/lib/common/error_private.h index c820c330e..775bee557 100644 --- a/third_party/zstd/lib/common/error_private.h +++ b/third_party/zstd/lib/common/error_private.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/fse.h b/third_party/zstd/lib/common/fse.h index 0b2c2c304..17caa616e 100644 --- a/third_party/zstd/lib/common/fse.h +++ b/third_party/zstd/lib/common/fse.h @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * FSE : Finite State Entropy codec * Public Prototypes declaration diff --git a/third_party/zstd/lib/common/fse_decompress.c b/third_party/zstd/lib/common/fse_decompress.c index f61a3b602..1251306db 100644 --- a/third_party/zstd/lib/common/fse_decompress.c +++ b/third_party/zstd/lib/common/fse_decompress.c @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * FSE : Finite State Entropy decoder * Copyright (c) Meta Platforms, Inc. and affiliates. diff --git a/third_party/zstd/lib/common/huf.h b/third_party/zstd/lib/common/huf.h index abe7d18e4..3592cbfb4 100644 --- a/third_party/zstd/lib/common/huf.h +++ b/third_party/zstd/lib/common/huf.h @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * huff0 huffman codec, * part of Finite State Entropy library diff --git a/third_party/zstd/lib/common/mem.h b/third_party/zstd/lib/common/mem.h index 77ea3d250..246a154b8 100644 --- a/third_party/zstd/lib/common/mem.h +++ b/third_party/zstd/lib/common/mem.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/pool.c b/third_party/zstd/lib/common/pool.c index 59d9370a3..f2c53aef1 100644 --- a/third_party/zstd/lib/common/pool.c +++ b/third_party/zstd/lib/common/pool.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/pool.h b/third_party/zstd/lib/common/pool.h index beb173409..ef33663c8 100644 --- a/third_party/zstd/lib/common/pool.h +++ b/third_party/zstd/lib/common/pool.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/portability_macros.h b/third_party/zstd/lib/common/portability_macros.h index cf419d471..4931a6dd3 100644 --- a/third_party/zstd/lib/common/portability_macros.h +++ b/third_party/zstd/lib/common/portability_macros.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/threading.c b/third_party/zstd/lib/common/threading.c index bb956e1e5..a428c91d5 100644 --- a/third_party/zstd/lib/common/threading.c +++ b/third_party/zstd/lib/common/threading.c @@ -1,4 +1,3 @@ -// clang-format off /** * Copyright (c) 2016 Tino Reichardt * All rights reserved. diff --git a/third_party/zstd/lib/common/threading.h b/third_party/zstd/lib/common/threading.h index c339a5254..ec3b93a4c 100644 --- a/third_party/zstd/lib/common/threading.h +++ b/third_party/zstd/lib/common/threading.h @@ -1,4 +1,3 @@ -// clang-format off /** * Copyright (c) 2016 Tino Reichardt * All rights reserved. diff --git a/third_party/zstd/lib/common/xxhash.c b/third_party/zstd/lib/common/xxhash.c index cd6c7c998..9e355a511 100644 --- a/third_party/zstd/lib/common/xxhash.c +++ b/third_party/zstd/lib/common/xxhash.c @@ -1,4 +1,3 @@ -// clang-format off /* * xxHash - Fast Hash algorithm * Copyright (c) Meta Platforms, Inc. and affiliates. diff --git a/third_party/zstd/lib/common/xxhash.h b/third_party/zstd/lib/common/xxhash.h index f31e8b3aa..6a4ea347b 100644 --- a/third_party/zstd/lib/common/xxhash.h +++ b/third_party/zstd/lib/common/xxhash.h @@ -1,4 +1,3 @@ -// clang-format off /* * xxHash - Fast Hash algorithm * Copyright (c) Meta Platforms, Inc. and affiliates. diff --git a/third_party/zstd/lib/common/zstd_common.c b/third_party/zstd/lib/common/zstd_common.c index ac1dad872..f4ce9b41c 100644 --- a/third_party/zstd/lib/common/zstd_common.c +++ b/third_party/zstd/lib/common/zstd_common.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/zstd_deps.h b/third_party/zstd/lib/common/zstd_deps.h index bde8505f4..c2f3fe9fc 100644 --- a/third_party/zstd/lib/common/zstd_deps.h +++ b/third_party/zstd/lib/common/zstd_deps.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/zstd_internal.h b/third_party/zstd/lib/common/zstd_internal.h index 27ff9fdce..4b150e0dc 100644 --- a/third_party/zstd/lib/common/zstd_internal.h +++ b/third_party/zstd/lib/common/zstd_internal.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/common/zstd_trace.h b/third_party/zstd/lib/common/zstd_trace.h index 04b7ac68c..ddf9c6383 100644 --- a/third_party/zstd/lib/common/zstd_trace.h +++ b/third_party/zstd/lib/common/zstd_trace.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/clevels.h b/third_party/zstd/lib/compress/clevels.h index 05614b811..04f7c1520 100644 --- a/third_party/zstd/lib/compress/clevels.h +++ b/third_party/zstd/lib/compress/clevels.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/fse_compress.c b/third_party/zstd/lib/compress/fse_compress.c index 285ac6885..7aea787f3 100644 --- a/third_party/zstd/lib/compress/fse_compress.c +++ b/third_party/zstd/lib/compress/fse_compress.c @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * FSE : Finite State Entropy encoder * Copyright (c) Meta Platforms, Inc. and affiliates. diff --git a/third_party/zstd/lib/compress/hist.c b/third_party/zstd/lib/compress/hist.c index 6440f2be3..100ed77a4 100644 --- a/third_party/zstd/lib/compress/hist.c +++ b/third_party/zstd/lib/compress/hist.c @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * hist : Histogram functions * part of Finite State Entropy project diff --git a/third_party/zstd/lib/compress/hist.h b/third_party/zstd/lib/compress/hist.h index ef25cb270..9ad932533 100644 --- a/third_party/zstd/lib/compress/hist.h +++ b/third_party/zstd/lib/compress/hist.h @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * hist : Histogram functions * part of Finite State Entropy project diff --git a/third_party/zstd/lib/compress/huf_compress.c b/third_party/zstd/lib/compress/huf_compress.c index b370fe18e..25d526cee 100644 --- a/third_party/zstd/lib/compress/huf_compress.c +++ b/third_party/zstd/lib/compress/huf_compress.c @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * Huffman encoder, part of New Generation Entropy library * Copyright (c) Meta Platforms, Inc. and affiliates. diff --git a/third_party/zstd/lib/compress/zstd_compress.c b/third_party/zstd/lib/compress/zstd_compress.c index d9360d8b0..360919773 100644 --- a/third_party/zstd/lib/compress/zstd_compress.c +++ b/third_party/zstd/lib/compress/zstd_compress.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_compress_internal.h b/third_party/zstd/lib/compress/zstd_compress_internal.h index b68694a3a..376b4003f 100644 --- a/third_party/zstd/lib/compress/zstd_compress_internal.h +++ b/third_party/zstd/lib/compress/zstd_compress_internal.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_compress_literals.c b/third_party/zstd/lib/compress/zstd_compress_literals.c index f96fd297d..9ef10f6d7 100644 --- a/third_party/zstd/lib/compress/zstd_compress_literals.c +++ b/third_party/zstd/lib/compress/zstd_compress_literals.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_compress_literals.h b/third_party/zstd/lib/compress/zstd_compress_literals.h index 96764c983..d4d6e9c70 100644 --- a/third_party/zstd/lib/compress/zstd_compress_literals.h +++ b/third_party/zstd/lib/compress/zstd_compress_literals.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_compress_sequences.c b/third_party/zstd/lib/compress/zstd_compress_sequences.c index 695a00874..a55e0a859 100644 --- a/third_party/zstd/lib/compress/zstd_compress_sequences.c +++ b/third_party/zstd/lib/compress/zstd_compress_sequences.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_compress_sequences.h b/third_party/zstd/lib/compress/zstd_compress_sequences.h index 2707d2f71..605d7c154 100644 --- a/third_party/zstd/lib/compress/zstd_compress_sequences.h +++ b/third_party/zstd/lib/compress/zstd_compress_sequences.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_compress_superblock.c b/third_party/zstd/lib/compress/zstd_compress_superblock.c index 785143b19..74b5cd9ac 100644 --- a/third_party/zstd/lib/compress/zstd_compress_superblock.c +++ b/third_party/zstd/lib/compress/zstd_compress_superblock.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_compress_superblock.h b/third_party/zstd/lib/compress/zstd_compress_superblock.h index e047ebd79..c47532c44 100644 --- a/third_party/zstd/lib/compress/zstd_compress_superblock.h +++ b/third_party/zstd/lib/compress/zstd_compress_superblock.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_cwksp.h b/third_party/zstd/lib/compress/zstd_cwksp.h index e2a542b87..0872811e6 100644 --- a/third_party/zstd/lib/compress/zstd_cwksp.h +++ b/third_party/zstd/lib/compress/zstd_cwksp.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_double_fast.c b/third_party/zstd/lib/compress/zstd_double_fast.c index b18048faa..1cabf457b 100644 --- a/third_party/zstd/lib/compress/zstd_double_fast.c +++ b/third_party/zstd/lib/compress/zstd_double_fast.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_double_fast.h b/third_party/zstd/lib/compress/zstd_double_fast.h index 44ce99ff2..08699e020 100644 --- a/third_party/zstd/lib/compress/zstd_double_fast.h +++ b/third_party/zstd/lib/compress/zstd_double_fast.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_fast.c b/third_party/zstd/lib/compress/zstd_fast.c index 9af32be82..d3cc7cb5e 100644 --- a/third_party/zstd/lib/compress/zstd_fast.c +++ b/third_party/zstd/lib/compress/zstd_fast.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_fast.h b/third_party/zstd/lib/compress/zstd_fast.h index 9ab65629f..715460fed 100644 --- a/third_party/zstd/lib/compress/zstd_fast.h +++ b/third_party/zstd/lib/compress/zstd_fast.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_lazy.c b/third_party/zstd/lib/compress/zstd_lazy.c index a9dabd41f..6f56e1140 100644 --- a/third_party/zstd/lib/compress/zstd_lazy.c +++ b/third_party/zstd/lib/compress/zstd_lazy.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_lazy.h b/third_party/zstd/lib/compress/zstd_lazy.h index 505ac04c1..9eef38c29 100644 --- a/third_party/zstd/lib/compress/zstd_lazy.h +++ b/third_party/zstd/lib/compress/zstd_lazy.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_ldm.c b/third_party/zstd/lib/compress/zstd_ldm.c index 2e1df4242..8e799f998 100644 --- a/third_party/zstd/lib/compress/zstd_ldm.c +++ b/third_party/zstd/lib/compress/zstd_ldm.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_ldm.h b/third_party/zstd/lib/compress/zstd_ldm.h index 42870ff08..b1d426d38 100644 --- a/third_party/zstd/lib/compress/zstd_ldm.h +++ b/third_party/zstd/lib/compress/zstd_ldm.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_ldm_geartab.h b/third_party/zstd/lib/compress/zstd_ldm_geartab.h index c3a0a90fc..c52ce9960 100644 --- a/third_party/zstd/lib/compress/zstd_ldm_geartab.h +++ b/third_party/zstd/lib/compress/zstd_ldm_geartab.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_opt.c b/third_party/zstd/lib/compress/zstd_opt.c index da8ef8818..f477f290b 100644 --- a/third_party/zstd/lib/compress/zstd_opt.c +++ b/third_party/zstd/lib/compress/zstd_opt.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstd_opt.h b/third_party/zstd/lib/compress/zstd_opt.h index 91621b911..61be3cdab 100644 --- a/third_party/zstd/lib/compress/zstd_opt.h +++ b/third_party/zstd/lib/compress/zstd_opt.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstdmt_compress.c b/third_party/zstd/lib/compress/zstdmt_compress.c index 51632d108..6d15654f4 100644 --- a/third_party/zstd/lib/compress/zstdmt_compress.c +++ b/third_party/zstd/lib/compress/zstdmt_compress.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/compress/zstdmt_compress.h b/third_party/zstd/lib/compress/zstdmt_compress.h index 807945ac4..e997b157b 100644 --- a/third_party/zstd/lib/compress/zstdmt_compress.h +++ b/third_party/zstd/lib/compress/zstdmt_compress.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/decompress/huf_decompress.c b/third_party/zstd/lib/decompress/huf_decompress.c index 7571442d9..91827e0c7 100644 --- a/third_party/zstd/lib/decompress/huf_decompress.c +++ b/third_party/zstd/lib/decompress/huf_decompress.c @@ -1,4 +1,3 @@ -// clang-format off /* ****************************************************************** * huff0 huffman decoder, * part of Finite State Entropy library diff --git a/third_party/zstd/lib/decompress/huf_decompress_amd64.S b/third_party/zstd/lib/decompress/huf_decompress_amd64.S index 6befbe5a9..7390d3ad8 100644 --- a/third_party/zstd/lib/decompress/huf_decompress_amd64.S +++ b/third_party/zstd/lib/decompress/huf_decompress_amd64.S @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/decompress/zstd_ddict.c b/third_party/zstd/lib/decompress/zstd_ddict.c index 68c05aea2..9ad2dcfe4 100644 --- a/third_party/zstd/lib/decompress/zstd_ddict.c +++ b/third_party/zstd/lib/decompress/zstd_ddict.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/decompress/zstd_ddict.h b/third_party/zstd/lib/decompress/zstd_ddict.h index 19c0694a4..fe2e178b3 100644 --- a/third_party/zstd/lib/decompress/zstd_ddict.h +++ b/third_party/zstd/lib/decompress/zstd_ddict.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/decompress/zstd_decompress.c b/third_party/zstd/lib/decompress/zstd_decompress.c index 61e6f0acf..70a9544f0 100644 --- a/third_party/zstd/lib/decompress/zstd_decompress.c +++ b/third_party/zstd/lib/decompress/zstd_decompress.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/decompress/zstd_decompress_block.c b/third_party/zstd/lib/decompress/zstd_decompress_block.c index ac7bca566..a2bb14751 100644 --- a/third_party/zstd/lib/decompress/zstd_decompress_block.c +++ b/third_party/zstd/lib/decompress/zstd_decompress_block.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/decompress/zstd_decompress_block.h b/third_party/zstd/lib/decompress/zstd_decompress_block.h index fdc90274b..a2c3614cd 100644 --- a/third_party/zstd/lib/decompress/zstd_decompress_block.h +++ b/third_party/zstd/lib/decompress/zstd_decompress_block.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/decompress/zstd_decompress_internal.h b/third_party/zstd/lib/decompress/zstd_decompress_internal.h index c2372926a..91b93f727 100644 --- a/third_party/zstd/lib/decompress/zstd_decompress_internal.h +++ b/third_party/zstd/lib/decompress/zstd_decompress_internal.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/deprecated/zbuff.h b/third_party/zstd/lib/deprecated/zbuff.h index 1b4e596a3..6e1ceabbc 100644 --- a/third_party/zstd/lib/deprecated/zbuff.h +++ b/third_party/zstd/lib/deprecated/zbuff.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/deprecated/zbuff_common.c b/third_party/zstd/lib/deprecated/zbuff_common.c index 6ac62991c..8bda2a2ee 100644 --- a/third_party/zstd/lib/deprecated/zbuff_common.c +++ b/third_party/zstd/lib/deprecated/zbuff_common.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/deprecated/zbuff_compress.c b/third_party/zstd/lib/deprecated/zbuff_compress.c index 4a7fea984..626d3721a 100644 --- a/third_party/zstd/lib/deprecated/zbuff_compress.c +++ b/third_party/zstd/lib/deprecated/zbuff_compress.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/deprecated/zbuff_decompress.c b/third_party/zstd/lib/deprecated/zbuff_decompress.c index 24c6ec8ba..8320c9ed6 100644 --- a/third_party/zstd/lib/deprecated/zbuff_decompress.c +++ b/third_party/zstd/lib/deprecated/zbuff_decompress.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/dictBuilder/cover.c b/third_party/zstd/lib/dictBuilder/cover.c index 43582c85a..da4f1e2ba 100644 --- a/third_party/zstd/lib/dictBuilder/cover.c +++ b/third_party/zstd/lib/dictBuilder/cover.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/dictBuilder/cover.h b/third_party/zstd/lib/dictBuilder/cover.h index 512d216c7..a5148b0eb 100644 --- a/third_party/zstd/lib/dictBuilder/cover.h +++ b/third_party/zstd/lib/dictBuilder/cover.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/dictBuilder/divsufsort.c b/third_party/zstd/lib/dictBuilder/divsufsort.c index 390f1a5fd..6bc12f66c 100644 --- a/third_party/zstd/lib/dictBuilder/divsufsort.c +++ b/third_party/zstd/lib/dictBuilder/divsufsort.c @@ -1,4 +1,3 @@ -// clang-format off /* * divsufsort.c for libdivsufsort-lite * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved. diff --git a/third_party/zstd/lib/dictBuilder/divsufsort.h b/third_party/zstd/lib/dictBuilder/divsufsort.h index bf40083c3..5440994af 100644 --- a/third_party/zstd/lib/dictBuilder/divsufsort.h +++ b/third_party/zstd/lib/dictBuilder/divsufsort.h @@ -1,4 +1,3 @@ -// clang-format off /* * divsufsort.h for libdivsufsort-lite * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved. diff --git a/third_party/zstd/lib/dictBuilder/fastcover.c b/third_party/zstd/lib/dictBuilder/fastcover.c index 1d29d1f56..877ce5392 100644 --- a/third_party/zstd/lib/dictBuilder/fastcover.c +++ b/third_party/zstd/lib/dictBuilder/fastcover.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/lib/dictBuilder/zdict.c b/third_party/zstd/lib/dictBuilder/zdict.c index 68a2e9eda..eafcb3578 100644 --- a/third_party/zstd/lib/dictBuilder/zdict.c +++ b/third_party/zstd/lib/dictBuilder/zdict.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/benchfn.c b/third_party/zstd/programs/benchfn.c index 2e39df3fa..d70d67e05 100644 --- a/third_party/zstd/programs/benchfn.c +++ b/third_party/zstd/programs/benchfn.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/benchfn.h b/third_party/zstd/programs/benchfn.h index 16d998070..bf1dce2d3 100644 --- a/third_party/zstd/programs/benchfn.h +++ b/third_party/zstd/programs/benchfn.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/benchzstd.c b/third_party/zstd/programs/benchzstd.c index d40f94cb8..aae5761dc 100644 --- a/third_party/zstd/programs/benchzstd.c +++ b/third_party/zstd/programs/benchzstd.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/benchzstd.h b/third_party/zstd/programs/benchzstd.h index 2716cb054..13e5d7daa 100644 --- a/third_party/zstd/programs/benchzstd.h +++ b/third_party/zstd/programs/benchzstd.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/datagen.c b/third_party/zstd/programs/datagen.c index a8aac7a38..63e9d90bf 100644 --- a/third_party/zstd/programs/datagen.c +++ b/third_party/zstd/programs/datagen.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/datagen.h b/third_party/zstd/programs/datagen.h index ec270b3df..62b7412d4 100644 --- a/third_party/zstd/programs/datagen.h +++ b/third_party/zstd/programs/datagen.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/dibio.c b/third_party/zstd/programs/dibio.c index 1adf66b41..4a50d072b 100644 --- a/third_party/zstd/programs/dibio.c +++ b/third_party/zstd/programs/dibio.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/dibio.h b/third_party/zstd/programs/dibio.h index 475310612..1fafca33f 100644 --- a/third_party/zstd/programs/dibio.h +++ b/third_party/zstd/programs/dibio.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/fileio.c b/third_party/zstd/programs/fileio.c index dc47ad54a..22c264b8f 100644 --- a/third_party/zstd/programs/fileio.c +++ b/third_party/zstd/programs/fileio.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/fileio.h b/third_party/zstd/programs/fileio.h index e77fce4a9..5aa17773a 100644 --- a/third_party/zstd/programs/fileio.h +++ b/third_party/zstd/programs/fileio.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/fileio_asyncio.c b/third_party/zstd/programs/fileio_asyncio.c index 5296c6948..7630b2f17 100644 --- a/third_party/zstd/programs/fileio_asyncio.c +++ b/third_party/zstd/programs/fileio_asyncio.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/fileio_asyncio.h b/third_party/zstd/programs/fileio_asyncio.h index 5de1410a9..870b432cb 100644 --- a/third_party/zstd/programs/fileio_asyncio.h +++ b/third_party/zstd/programs/fileio_asyncio.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/fileio_common.h b/third_party/zstd/programs/fileio_common.h index 0b04859ff..601f6ec3d 100644 --- a/third_party/zstd/programs/fileio_common.h +++ b/third_party/zstd/programs/fileio_common.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/fileio_types.h b/third_party/zstd/programs/fileio_types.h index f163d2571..d00ec28d9 100644 --- a/third_party/zstd/programs/fileio_types.h +++ b/third_party/zstd/programs/fileio_types.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/platform.h b/third_party/zstd/programs/platform.h index 3a570034e..3e3c9f07a 100644 --- a/third_party/zstd/programs/platform.h +++ b/third_party/zstd/programs/platform.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/timefn.c b/third_party/zstd/programs/timefn.c index b64c53750..7b4b47871 100644 --- a/third_party/zstd/programs/timefn.c +++ b/third_party/zstd/programs/timefn.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/timefn.h b/third_party/zstd/programs/timefn.h index 9c271dad2..baa4d730e 100644 --- a/third_party/zstd/programs/timefn.h +++ b/third_party/zstd/programs/timefn.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/util.c b/third_party/zstd/programs/util.c index a77944505..2bf785640 100644 --- a/third_party/zstd/programs/util.c +++ b/third_party/zstd/programs/util.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/util.h b/third_party/zstd/programs/util.h index 88c9dace0..d7a7a0ee8 100644 --- a/third_party/zstd/programs/util.h +++ b/third_party/zstd/programs/util.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/zstdcli.c b/third_party/zstd/programs/zstdcli.c index e6dbfd095..d1559ad87 100644 --- a/third_party/zstd/programs/zstdcli.c +++ b/third_party/zstd/programs/zstdcli.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/zstdcli_trace.c b/third_party/zstd/programs/zstdcli_trace.c index ec9ccfb41..b430c2220 100644 --- a/third_party/zstd/programs/zstdcli_trace.c +++ b/third_party/zstd/programs/zstdcli_trace.c @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/zstdcli_trace.h b/third_party/zstd/programs/zstdcli_trace.h index 7d8a83026..9c135d3ca 100644 --- a/third_party/zstd/programs/zstdcli_trace.h +++ b/third_party/zstd/programs/zstdcli_trace.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/programs/zstdgrep b/third_party/zstd/programs/zstdgrep index e1abfc5e1..61efaa947 100755 --- a/third_party/zstd/programs/zstdgrep +++ b/third_party/zstd/programs/zstdgrep @@ -1,4 +1,3 @@ -// clang-format off #!/bin/sh # # Copyright (c) 2003 Thomas Klausner. diff --git a/third_party/zstd/zdict.h b/third_party/zstd/zdict.h index fb4fcbc57..70a2727ac 100644 --- a/third_party/zstd/zdict.h +++ b/third_party/zstd/zdict.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/zstd.h b/third_party/zstd/zstd.h index a487872c5..9afaef6ad 100644 --- a/third_party/zstd/zstd.h +++ b/third_party/zstd/zstd.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/third_party/zstd/zstd_errors.h b/third_party/zstd/zstd_errors.h index 1e7b8472f..74bde993f 100644 --- a/third_party/zstd/zstd_errors.h +++ b/third_party/zstd/zstd_errors.h @@ -1,4 +1,3 @@ -// clang-format off /* * Copyright (c) Meta Platforms, Inc. and affiliates. * All rights reserved. diff --git a/tool/args/args.h b/tool/args/args.h index 7b9a2cf3d..38ef14f06 100644 --- a/tool/args/args.h +++ b/tool/args/args.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_TOOL_ARGS_ARGS_H_ #define COSMOPOLITAN_TOOL_ARGS_ARGS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int LoadZipArgs(int *, char ***); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_ARGS_ARGS_H_ */ diff --git a/tool/build/apelink.c b/tool/build/apelink.c index 65ccb2e00..d27ddf5a0 100644 --- a/tool/build/apelink.c +++ b/tool/build/apelink.c @@ -28,7 +28,7 @@ #include "libc/elf/struct/phdr.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/macho.internal.h" #include "libc/macros.internal.h" diff --git a/tool/build/ar.c b/tool/build/ar.c index 422546695..fd9c89e61 100644 --- a/tool/build/ar.c +++ b/tool/build/ar.c @@ -29,7 +29,7 @@ #include "libc/fmt/itoa.h" #include "libc/fmt/libgen.h" #include "libc/fmt/magnumstrs.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsr.h" #include "libc/limits.h" #include "libc/macros.internal.h" diff --git a/tool/build/assimilate.c b/tool/build/assimilate.c index ba153d9a5..9e945a2cb 100644 --- a/tool/build/assimilate.c +++ b/tool/build/assimilate.c @@ -24,7 +24,7 @@ #include "libc/elf/struct/ehdr.h" #include "libc/errno.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/macho.internal.h" #include "libc/macros.internal.h" diff --git a/tool/build/compile.c b/tool/build/compile.c index 973849623..41599cfb2 100644 --- a/tool/build/compile.c +++ b/tool/build/compile.c @@ -32,7 +32,7 @@ #include "libc/fmt/itoa.h" #include "libc/fmt/libgen.h" #include "libc/fmt/magnumstrs.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/safemacros.internal.h" #include "libc/limits.h" #include "libc/log/appendresourcereport.internal.h" diff --git a/tool/build/elf2pe.c b/tool/build/elf2pe.c index 849a6cfac..cf882ccfe 100644 --- a/tool/build/elf2pe.c +++ b/tool/build/elf2pe.c @@ -25,7 +25,7 @@ #include "libc/elf/struct/shdr.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/describeflags.internal.h" #include "libc/intrin/dll.h" #include "libc/limits.h" diff --git a/tool/build/fixupobj.c b/tool/build/fixupobj.c index 55fc66821..e3a27ac9b 100644 --- a/tool/build/fixupobj.c +++ b/tool/build/fixupobj.c @@ -29,7 +29,7 @@ #include "libc/errno.h" #include "libc/fmt/itoa.h" #include "libc/fmt/magnumstrs.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/log/log.h" #include "libc/macros.internal.h" diff --git a/tool/build/lib/asmdown.h b/tool/build/lib/asmdown.h index aa413b632..56d324042 100644 --- a/tool/build/lib/asmdown.h +++ b/tool/build/lib/asmdown.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_ASMDOWN_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_ASMDOWN_H_ #include "tool/build/lib/javadown.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Asmdown { @@ -20,5 +19,4 @@ struct Asmdown *ParseAsmdown(const char *, size_t); void FreeAsmdown(struct Asmdown *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_ASMDOWN_H_ */ diff --git a/tool/build/lib/buffer.h b/tool/build/lib/buffer.h index 134c4a0ef..244778c58 100644 --- a/tool/build/lib/buffer.h +++ b/tool/build/lib/buffer.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_BUFFER_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_BUFFER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Buffer { @@ -16,5 +15,4 @@ int AppendFmt(struct Buffer *, const char *, ...); ssize_t WriteBuffer(struct Buffer *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_BUFFER_H_ */ diff --git a/tool/build/lib/case.h b/tool/build/lib/case.h index 6d393fcd6..8c4fcc1b3 100644 --- a/tool/build/lib/case.h +++ b/tool/build/lib/case.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_CASE_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_CASE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) #define CASE(OP, CODE) \ case OP: \ @@ -12,5 +11,4 @@ CODE; \ return -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_CASE_H_ */ diff --git a/tool/build/lib/demangle.h b/tool/build/lib/demangle.h index f19b0a0aa..0340a9646 100644 --- a/tool/build/lib/demangle.h +++ b/tool/build/lib/demangle.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_DEMANGLE_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_DEMANGLE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *Demangle(char *, const char *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_DEMANGLE_H_ */ diff --git a/tool/build/lib/elfwriter.h b/tool/build/lib/elfwriter.h index 5bed297be..871481a96 100644 --- a/tool/build/lib/elfwriter.h +++ b/tool/build/lib/elfwriter.h @@ -6,7 +6,6 @@ #include "libc/elf/struct/shdr.h" #include "libc/elf/struct/sym.h" #include "tool/build/lib/interner.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct ElfWriterSyms { @@ -77,5 +76,4 @@ void elfwriter_zip(struct ElfWriter *, const char *, const char *, size_t, struct timespec, struct timespec, bool); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_ELFWRITER_H_ */ diff --git a/tool/build/lib/elfwriter_zip.c b/tool/build/lib/elfwriter_zip.c index ea4829bfe..c03c07f95 100644 --- a/tool/build/lib/elfwriter_zip.c +++ b/tool/build/lib/elfwriter_zip.c @@ -19,6 +19,7 @@ #include "libc/dos.internal.h" #include "libc/elf/def.h" #include "libc/fmt/wintime.internal.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/log/check.h" #include "libc/mem/gc.h" diff --git a/tool/build/lib/eztls.h b/tool/build/lib/eztls.h index 9e65734b2..c6982531a 100644 --- a/tool/build/lib/eztls.h +++ b/tool/build/lib/eztls.h @@ -3,7 +3,6 @@ #include "third_party/mbedtls/ctr_drbg.h" #include "third_party/mbedtls/ssl.h" #include "third_party/mbedtls/x509_crt.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct EzTlsBio { @@ -41,5 +40,4 @@ forceinline void SetupPresharedKeySsl(int endpoint, char psk[32]) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_EZTLS_H_ */ diff --git a/tool/build/lib/getargs.h b/tool/build/lib/getargs.h index d1a00518c..8c67c0af6 100644 --- a/tool/build/lib/getargs.h +++ b/tool/build/lib/getargs.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_GETARGS_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_GETARGS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct GetArgs { @@ -16,5 +15,4 @@ const char *getargs_next(struct GetArgs *); void getargs_destroy(struct GetArgs *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_GETARGS_H_ */ diff --git a/tool/build/lib/interner.h b/tool/build/lib/interner.h index 8bd63472a..9bb915e0b 100644 --- a/tool/build/lib/interner.h +++ b/tool/build/lib/interner.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_INTERNER_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_INTERNER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Interner { @@ -17,5 +16,4 @@ size_t intern(struct Interner *, const char *) paramsnonnull(); bool isinterned(struct Interner *, const char *) paramsnonnull(); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_INTERNER_H_ */ diff --git a/tool/build/lib/javadown.h b/tool/build/lib/javadown.h index 41fc62612..ed6edbee1 100644 --- a/tool/build/lib/javadown.h +++ b/tool/build/lib/javadown.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_JAVADOWN_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_JAVADOWN_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct JavadownTag { @@ -24,5 +23,4 @@ struct Javadown *ParseJavadown(const char *, size_t); void FreeJavadown(struct Javadown *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_JAVADOWN_H_ */ diff --git a/tool/build/lib/lib.h b/tool/build/lib/lib.h index 3bb1e531c..a7d305c00 100644 --- a/tool/build/lib/lib.h +++ b/tool/build/lib/lib.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_LIB_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_LIB_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ bool ParseSupportVector(char *, int *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_LIB_H_ */ diff --git a/tool/build/lib/panel.h b/tool/build/lib/panel.h index d0e48660c..f1ce5b8ea 100644 --- a/tool/build/lib/panel.h +++ b/tool/build/lib/panel.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_PANEL_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_PANEL_H_ #include "tool/build/lib/buffer.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Panel { @@ -17,5 +16,4 @@ ssize_t PrintPanels(int, long, struct Panel *, long, long); void PrintMessageBox(int, const char *, long, long); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_PANEL_H_ */ diff --git a/tool/build/lib/psk.h b/tool/build/lib/psk.h index 1f06ecade..b9affe340 100644 --- a/tool/build/lib/psk.h +++ b/tool/build/lib/psk.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_PSK_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_PSK_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *GetRunitPsk(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_PSK_H_ */ diff --git a/tool/build/lib/stripcomponents.h b/tool/build/lib/stripcomponents.h index 32bed1326..0d731fdaf 100644 --- a/tool/build/lib/stripcomponents.h +++ b/tool/build/lib/stripcomponents.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_STRIPCOMPONENTS_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_STRIPCOMPONENTS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *StripComponents(const char *, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_STRIPCOMPONENTS_H_ */ diff --git a/tool/build/mkdeps.c b/tool/build/mkdeps.c index 2507702c4..7c2f33ed1 100644 --- a/tool/build/mkdeps.c +++ b/tool/build/mkdeps.c @@ -21,7 +21,7 @@ #include "libc/errno.h" #include "libc/fmt/libgen.h" #include "libc/fmt/magnumstrs.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/kprintf.h" #include "libc/limits.h" #include "libc/macros.internal.h" diff --git a/tool/build/pecheck.c b/tool/build/pecheck.c index f9fb831c3..1f58a008c 100644 --- a/tool/build/pecheck.c +++ b/tool/build/pecheck.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/nt/struct/imageimportbyname.internal.h" #include "libc/nt/struct/imageimportdescriptor.internal.h" diff --git a/tool/build/pledge.c b/tool/build/pledge.c index 58f0968f7..12a218943 100644 --- a/tool/build/pledge.c +++ b/tool/build/pledge.c @@ -37,7 +37,7 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/promises.internal.h" #include "libc/intrin/safemacros.internal.h" diff --git a/tool/build/runit.c b/tool/build/runit.c index 13b12ffc1..2655279b3 100644 --- a/tool/build/runit.c +++ b/tool/build/runit.c @@ -26,7 +26,7 @@ #include "libc/dns/dns.h" #include "libc/errno.h" #include "libc/fmt/libgen.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/safemacros.internal.h" #include "libc/limits.h" diff --git a/tool/build/runitd.c b/tool/build/runitd.c index abae4c4d2..6fce63920 100644 --- a/tool/build/runitd.c +++ b/tool/build/runitd.c @@ -30,7 +30,7 @@ #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" #include "libc/fmt/libgen.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/kprintf.h" #include "libc/log/appendresourcereport.internal.h" #include "libc/log/check.h" diff --git a/tool/build/zipcopy.c b/tool/build/zipcopy.c index 7d50c4e27..94bc57abb 100644 --- a/tool/build/zipcopy.c +++ b/tool/build/zipcopy.c @@ -23,9 +23,11 @@ #include "libc/elf/struct/shdr.h" #include "libc/errno.h" #include "libc/fmt/magnumstrs.internal.h" +#include "libc/serialize.h" #include "libc/limits.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" +#include "libc/stdio/sysparam.h" #include "libc/str/str.h" #include "libc/sysv/consts/map.h" #include "libc/sysv/consts/o.h" diff --git a/tool/build/zipobj.c b/tool/build/zipobj.c index 7d09a9300..c4767cb77 100644 --- a/tool/build/zipobj.c +++ b/tool/build/zipobj.c @@ -29,6 +29,7 @@ #include "libc/mem/gc.internal.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" +#include "libc/str/str.h" #include "libc/sysv/consts/clock.h" #include "libc/sysv/consts/ex.h" #include "libc/sysv/consts/exit.h" diff --git a/tool/curl/cmd.h b/tool/curl/cmd.h index 041aad1c4..0b5587760 100644 --- a/tool/curl/cmd.h +++ b/tool/curl/cmd.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_TOOL_CURL_CMD_H_ #define COSMOPOLITAN_TOOL_CURL_CMD_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int _curl(int, char *[]); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_CURL_CMD_H_ */ diff --git a/tool/decode/ar.c b/tool/decode/ar.c index 3481d5a98..7adcb19db 100644 --- a/tool/decode/ar.c +++ b/tool/decode/ar.c @@ -19,7 +19,7 @@ #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/log/check.h" #include "libc/log/log.h" #include "libc/mem/mem.h" diff --git a/tool/decode/elf.c b/tool/decode/elf.c index bb445bd06..df03bf086 100644 --- a/tool/decode/elf.c +++ b/tool/decode/elf.c @@ -26,7 +26,7 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/fmt/libgen.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/safemacros.internal.h" #include "libc/log/check.h" #include "libc/log/log.h" diff --git a/tool/decode/lib/asmcodegen.h b/tool/decode/lib/asmcodegen.h index 7c0b10521..fef30fd94 100644 --- a/tool/decode/lib/asmcodegen.h +++ b/tool/decode/lib/asmcodegen.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_TOOL_DECODE_LIB_ASMCODEGEN_H_ #include "libc/stdio/stdio.h" #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define COLUMN_WIDTH 24 @@ -24,5 +23,4 @@ char *tabpad(const char *s, unsigned width) __wur; void show(const char *directive, const char *value, const char *comment); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_ASMCODEGEN_H_ */ diff --git a/tool/decode/lib/bitabuilder.c b/tool/decode/lib/bitabuilder.c index c0b412701..6729efb80 100644 --- a/tool/decode/lib/bitabuilder.c +++ b/tool/decode/lib/bitabuilder.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "tool/decode/lib/bitabuilder.h" #include "libc/assert.h" -#include "libc/intrin/bits.h" #include "libc/limits.h" #include "libc/log/check.h" #include "libc/macros.internal.h" diff --git a/tool/decode/lib/bitabuilder.h b/tool/decode/lib/bitabuilder.h index 7ca471ee6..b77022d59 100644 --- a/tool/decode/lib/bitabuilder.h +++ b/tool/decode/lib/bitabuilder.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_BITABUILDER_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_BITABUILDER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct FILE; @@ -11,5 +10,4 @@ bool bitabuilder_fwrite(const struct BitaBuilder *, struct FILE *); void bitabuilder_free(struct BitaBuilder **); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_BITABUILDER_H_ */ diff --git a/tool/decode/lib/disassemblehex.h b/tool/decode/lib/disassemblehex.h index 746c5ad60..eb8224077 100644 --- a/tool/decode/lib/disassemblehex.h +++ b/tool/decode/lib/disassemblehex.h @@ -3,11 +3,9 @@ #define kDisassembleHexColumns 8 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void disassemblehex(uint8_t *data, size_t size, FILE *f); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_DISASSEMBLEHEX_H_ */ diff --git a/tool/decode/lib/elfidnames.h b/tool/decode/lib/elfidnames.h index cda30649c..d7a0998b0 100644 --- a/tool/decode/lib/elfidnames.h +++ b/tool/decode/lib/elfidnames.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_ELFIDNAMES_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_ELFIDNAMES_H_ #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct IdName kElfTypeNames[]; @@ -20,5 +19,4 @@ extern const struct IdName kElfSpecialSectionNames[]; extern const struct IdName kElfNexgen32eRelocationNames[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_ELFIDNAMES_H_ */ diff --git a/tool/decode/lib/flagger.h b/tool/decode/lib/flagger.h index 22039864a..dbf335aba 100644 --- a/tool/decode/lib/flagger.h +++ b/tool/decode/lib/flagger.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_FLAGGER_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_FLAGGER_H_ #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ char *RecreateFlags(const struct IdName *, unsigned long) __wur; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_FLAGGER_H_ */ diff --git a/tool/decode/lib/idname.h b/tool/decode/lib/idname.h index 09d74f062..f2dcb4891 100644 --- a/tool/decode/lib/idname.h +++ b/tool/decode/lib/idname.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_IDNAME_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_IDNAME_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct IdName { @@ -11,5 +10,4 @@ struct IdName { const char *findnamebyid(const struct IdName *names, unsigned long id); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_IDNAME_H_ */ diff --git a/tool/decode/lib/machoidnames.h b/tool/decode/lib/machoidnames.h index b7290c5fa..82a559608 100644 --- a/tool/decode/lib/machoidnames.h +++ b/tool/decode/lib/machoidnames.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_MACHOIDNAMES_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_MACHOIDNAMES_H_ #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct IdName kMachoArchitectures[]; @@ -14,5 +13,4 @@ extern const struct IdName kMachoLoadCommandNames[]; extern const struct IdName kMachoVmProtNames[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_MACHOIDNAMES_H_ */ diff --git a/tool/decode/lib/ntfileflagnames.h b/tool/decode/lib/ntfileflagnames.h index fc72de348..764985c69 100644 --- a/tool/decode/lib/ntfileflagnames.h +++ b/tool/decode/lib/ntfileflagnames.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_NTFILEFLAGNAMES_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_NTFILEFLAGNAMES_H_ #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct IdName kNtFileFlagNames[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_NTFILEFLAGNAMES_H_ */ diff --git a/tool/decode/lib/peidnames.h b/tool/decode/lib/peidnames.h index f20771af5..67171edf8 100644 --- a/tool/decode/lib/peidnames.h +++ b/tool/decode/lib/peidnames.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_PEIDNAMES_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_PEIDNAMES_H_ #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct IdName kNtImageFileMachineNames[]; @@ -14,5 +13,4 @@ extern const struct IdName kNtImageDirectoryEntryNames[]; extern const struct IdName kNtPeSectionNames[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_PEIDNAMES_H_ */ diff --git a/tool/decode/lib/socknames.h b/tool/decode/lib/socknames.h index b50ad4c68..5581ca814 100644 --- a/tool/decode/lib/socknames.h +++ b/tool/decode/lib/socknames.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_SOCKNAMES_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_SOCKNAMES_H_ #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct IdName kAddressFamilyNames[]; @@ -10,5 +9,4 @@ extern const struct IdName kAddrInfoFlagNames[]; extern const struct IdName kProtocolNames[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_SOCKNAMES_H_ */ diff --git a/tool/decode/lib/titlegen.h b/tool/decode/lib/titlegen.h index d8a6f8a8e..59bba78bd 100644 --- a/tool/decode/lib/titlegen.h +++ b/tool/decode/lib/titlegen.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_TITLEGEN_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_TITLEGEN_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Modeline { @@ -14,5 +13,4 @@ void showtitle(const char *brand, const char *tool, const char *title, const char *description, const struct Modeline *modeline); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_TITLEGEN_H_ */ diff --git a/tool/decode/lib/x86idnames.h b/tool/decode/lib/x86idnames.h index ceb9929bf..c7a95c183 100644 --- a/tool/decode/lib/x86idnames.h +++ b/tool/decode/lib/x86idnames.h @@ -1,12 +1,10 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_X86IDNAMES_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_X86IDNAMES_H_ #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct IdName kX86MarchNames[]; extern const struct IdName kX86GradeNames[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_X86IDNAMES_H_ */ diff --git a/tool/decode/lib/xederrors.h b/tool/decode/lib/xederrors.h index 13bb3069f..00b1a7835 100644 --- a/tool/decode/lib/xederrors.h +++ b/tool/decode/lib/xederrors.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_XEDERRORS_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_XEDERRORS_H_ #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct IdName kXedErrorIdNames[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_XEDERRORS_H_ */ diff --git a/tool/decode/lib/zipnames.h b/tool/decode/lib/zipnames.h index beab9d1dc..4b8291612 100644 --- a/tool/decode/lib/zipnames.h +++ b/tool/decode/lib/zipnames.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_ZIPNAMES_H_ #define COSMOPOLITAN_TOOL_DECODE_LIB_ZIPNAMES_H_ #include "tool/decode/lib/idname.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const struct IdName kZipCompressionNames[]; @@ -11,5 +10,4 @@ extern const struct IdName kZipOsNames[]; extern const struct IdName kZipEraNames[]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_ZIPNAMES_H_ */ diff --git a/tool/decode/pe2.c b/tool/decode/pe2.c index 5f8fa9526..4b1dba587 100644 --- a/tool/decode/pe2.c +++ b/tool/decode/pe2.c @@ -20,7 +20,7 @@ #include "libc/calls/struct/stat.h" #include "libc/fmt/conv.h" #include "libc/fmt/libgen.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/safemacros.internal.h" #include "libc/mem/gc.h" #include "libc/mem/gc.internal.h" diff --git a/tool/decode/x86opinfo.c b/tool/decode/x86opinfo.c index 4e91453fa..69be00ca4 100644 --- a/tool/decode/x86opinfo.c +++ b/tool/decode/x86opinfo.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/errno.h" -#include "libc/intrin/bits.h" #include "libc/macros.internal.h" #include "libc/runtime/runtime.h" #include "libc/stdio/stdio.h" diff --git a/tool/decode/zip.c b/tool/decode/zip.c index adc17f740..6ccda9589 100644 --- a/tool/decode/zip.c +++ b/tool/decode/zip.c @@ -20,7 +20,7 @@ #include "libc/calls/struct/stat.h" #include "libc/fmt/libgen.h" #include "libc/fmt/wintime.internal.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/safemacros.internal.h" #include "libc/log/check.h" diff --git a/tool/lambda/lib/blc.h b/tool/lambda/lib/blc.h index c31be44f2..04dff5873 100644 --- a/tool/lambda/lib/blc.h +++ b/tool/lambda/lib/blc.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_LAMBDA_LIB_BLC_H_ #define COSMOPOLITAN_TOOL_LAMBDA_LIB_BLC_H_ #include "libc/stdio/stdio.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define BUILTINS 4 @@ -61,5 +60,4 @@ void PrintVar(int, FILE *); void *Calloc(size_t, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_LAMBDA_LIB_BLC_H_ */ diff --git a/tool/net/lfinger.h b/tool/net/lfinger.h index 95bc64fc3..bce0fd809 100644 --- a/tool/net/lfinger.h +++ b/tool/net/lfinger.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_TOOL_NET_LFINGER_H_ #define COSMOPOLITAN_TOOL_NET_LFINGER_H_ #include "third_party/lua/lauxlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int LuaFinger(lua_State *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_NET_LFINGER_H_ */ diff --git a/tool/net/lfuncs.c b/tool/net/lfuncs.c index f525e6f19..1d31c07a7 100644 --- a/tool/net/lfuncs.c +++ b/tool/net/lfuncs.c @@ -26,7 +26,7 @@ #include "libc/errno.h" #include "libc/fmt/itoa.h" #include "libc/fmt/leb128.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsf.h" #include "libc/intrin/bsr.h" #include "libc/intrin/popcnt.h" @@ -606,16 +606,16 @@ int LuaEncodeLatin1(lua_State *L) { } dontinline int LuaBase32Impl(lua_State *L, - char *B32(const char *, size_t, const char *, size_t, size_t *)) { + char *B32(const char *, size_t, const char *, + size_t, size_t *)) { char *p; - size_t sl, al; // source/output and alphabet lengths + size_t sl, al; // source/output and alphabet lengths const char *s = luaL_checklstring(L, 1, &sl); // use an empty string, as EncodeBase32 provides a default value const char *a = luaL_optlstring(L, 2, "", &al); if (!IS2POW(al) || al > 128 || al == 1) return luaL_error(L, "alphabet length is not a power of 2 in range 2..128"); - if (!(p = B32(s, sl, a, al, &sl))) - return luaL_error(L, "out of memory"); + if (!(p = B32(s, sl, a, al, &sl))) return luaL_error(L, "out of memory"); lua_pushlstring(L, p, sl); free(p); return 1; diff --git a/tool/net/lfuncs.h b/tool/net/lfuncs.h index 47687aa0d..d44c9433b 100644 --- a/tool/net/lfuncs.h +++ b/tool/net/lfuncs.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_TOOL_NET_LFUNCS_H_ #include "net/http/url.h" #include "third_party/lua/lua.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int LuaMaxmind(lua_State *); @@ -96,5 +95,4 @@ void LuaPushUrlView(lua_State *, struct UrlView *); char *FormatUnixHttpDateTime(char *, int64_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_NET_LFUNCS_H_ */ diff --git a/tool/net/ljson.c b/tool/net/ljson.c index 0d10b7bca..bf684f48a 100644 --- a/tool/net/ljson.c +++ b/tool/net/ljson.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "tool/net/ljson.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/likely.h" #include "libc/log/check.h" #include "libc/log/log.h" diff --git a/tool/net/ljson.h b/tool/net/ljson.h index 582c121bf..61b01e257 100644 --- a/tool/net/ljson.h +++ b/tool/net/ljson.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_NET_LJSON_H_ #define COSMOPOLITAN_TOOL_NET_LJSON_H_ #include "third_party/lua/lauxlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct DecodeJson { @@ -12,5 +11,4 @@ struct DecodeJson { struct DecodeJson DecodeJson(struct lua_State *, const char *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_NET_LJSON_H_ */ diff --git a/tool/net/lpath.h b/tool/net/lpath.h index 040df1e67..6e00ac1ae 100644 --- a/tool/net/lpath.h +++ b/tool/net/lpath.h @@ -1,11 +1,9 @@ #ifndef COSMOPOLITAN_TOOL_NET_LPATH_H_ #define COSMOPOLITAN_TOOL_NET_LPATH_H_ #include "third_party/lua/lauxlib.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int LuaPath(lua_State *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_NET_LPATH_H_ */ diff --git a/tool/net/luacheck.h b/tool/net/luacheck.h index 533ecbe1a..5ad6519c2 100644 --- a/tool/net/luacheck.h +++ b/tool/net/luacheck.h @@ -4,7 +4,6 @@ #include "libc/mem/mem.h" #include "third_party/lua/cosmo.h" #include "third_party/lua/lua.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define AssertLuaStackIsAt(L, level) \ @@ -19,5 +18,4 @@ COSMOPOLITAN_C_START_ } while (0) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_NET_LUACHECK_H_ */ diff --git a/tool/net/redbean.c b/tool/net/redbean.c index f7f934bf8..ba81e61b7 100644 --- a/tool/net/redbean.c +++ b/tool/net/redbean.c @@ -40,7 +40,7 @@ #include "libc/fmt/itoa.h" #include "libc/fmt/wintime.internal.h" #include "libc/intrin/atomic.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/intrin/bsr.h" #include "libc/intrin/likely.h" #include "libc/intrin/nomultics.internal.h" diff --git a/tool/plinko/lib/char.h b/tool/plinko/lib/char.h index d287ee4a9..d32757b93 100644 --- a/tool/plinko/lib/char.h +++ b/tool/plinko/lib/char.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_PLINKO_LIB_CHAR_H_ #define COSMOPOLITAN_TOOL_PLINKO_LIB_CHAR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ static inline pureconst bool IsC0(int c) { @@ -39,5 +38,4 @@ int GetMonospaceCharacterWidth(int) pureconst; bool IsWide(int) pureconst; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_CHAR_H_ */ diff --git a/tool/plinko/lib/config.h b/tool/plinko/lib/config.h index 109823f73..4e3582504 100644 --- a/tool/plinko/lib/config.h +++ b/tool/plinko/lib/config.h @@ -21,7 +21,6 @@ // not so large that we're drowning in virtual memory pages! #define TERM 0x20000 -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #if IsModeDbg() @@ -34,5 +33,4 @@ COSMOPOLITAN_C_START_ #define DWBITS (sizeof(dword) * CHAR_BIT) COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_CONFIG_H_ */ diff --git a/tool/plinko/lib/cons.h b/tool/plinko/lib/cons.h index 2484a770d..031bd836a 100644 --- a/tool/plinko/lib/cons.h +++ b/tool/plinko/lib/cons.h @@ -4,7 +4,6 @@ #include "tool/plinko/lib/error.h" #include "tool/plinko/lib/plinko.h" #include "tool/plinko/lib/types.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ forceinline void Set(int i, dword t) { @@ -64,5 +63,4 @@ int ShareCons(int, int); int ShareList(int, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_CONS_H_ */ diff --git a/tool/plinko/lib/error.h b/tool/plinko/lib/error.h index fb05e48f2..e46b791aa 100644 --- a/tool/plinko/lib/error.h +++ b/tool/plinko/lib/error.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_PLINKO_LIB_ERROR_H_ #define COSMOPOLITAN_TOOL_PLINKO_LIB_ERROR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void Raise(int) relegated wontreturn; @@ -10,5 +9,4 @@ void StackOverflow(void) relegated wontreturn; void React(int, int, int) relegated wontreturn; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_ERROR_H_ */ diff --git a/tool/plinko/lib/gc.h b/tool/plinko/lib/gc.h index 14c50e06a..5fce4dd52 100644 --- a/tool/plinko/lib/gc.h +++ b/tool/plinko/lib/gc.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_PLINKO_LIB_GC_H_ #define COSMOPOLITAN_TOOL_PLINKO_LIB_GC_H_ #include "tool/plinko/lib/types.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Gc { @@ -30,5 +29,4 @@ forceinline void Mark(struct Gc *G, int x) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_GC_H_ */ diff --git a/tool/plinko/lib/histo.h b/tool/plinko/lib/histo.h index acbd5960e..ddced887c 100644 --- a/tool/plinko/lib/histo.h +++ b/tool/plinko/lib/histo.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_TOOL_PLINKO_LIB_HISTO_H_ #include "libc/intrin/bsr.h" #include "libc/macros.internal.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define HISTO(H, X) \ @@ -16,5 +15,4 @@ void PrintHistogram(int, const char *, const long *, size_t); long GetLongSum(const long *, size_t); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_HISTO_H_ */ diff --git a/tool/plinko/lib/index.h b/tool/plinko/lib/index.h index 2da6d5de4..ee9f74499 100644 --- a/tool/plinko/lib/index.h +++ b/tool/plinko/lib/index.h @@ -3,7 +3,6 @@ #include "tool/plinko/lib/error.h" #include "tool/plinko/lib/plinko.h" #include "tool/plinko/lib/stack.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ forceinline nosideeffect int Head(int x) { @@ -131,5 +130,4 @@ static inline nosideeffect int Cddddr(int X) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_INDEX_H_ */ diff --git a/tool/plinko/lib/ktpenc.h b/tool/plinko/lib/ktpenc.h index 3c8a1d366..d81bc3652 100644 --- a/tool/plinko/lib/ktpenc.h +++ b/tool/plinko/lib/ktpenc.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_TOOL_PLINKO_LIB_KTPENC_H_ #define COSMOPOLITAN_TOOL_PLINKO_LIB_KTPENC_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern const short kTpEnc[25]; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_KTPENC_H_ */ diff --git a/tool/plinko/lib/plinko.h b/tool/plinko/lib/plinko.h index e94708ded..4ba9089d6 100644 --- a/tool/plinko/lib/plinko.h +++ b/tool/plinko/lib/plinko.h @@ -5,7 +5,6 @@ #include "libc/runtime/runtime.h" #include "tool/plinko/lib/config.h" #include "tool/plinko/lib/types.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define LO(x) (int)(x) @@ -333,5 +332,4 @@ static inline int Keep(int x, int y) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_PLINKO_H_ */ diff --git a/tool/plinko/lib/print.h b/tool/plinko/lib/print.h index 195406864..2e01f5224 100644 --- a/tool/plinko/lib/print.h +++ b/tool/plinko/lib/print.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_PLINKO_LIB_PRINT_H_ #define COSMOPOLITAN_TOOL_PLINKO_LIB_PRINT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int Print(int, int); @@ -27,5 +26,4 @@ void PrintNewline(int); void PrintTree(int, int, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_PRINT_H_ */ diff --git a/tool/plinko/lib/printf.h b/tool/plinko/lib/printf.h index cdea08d88..f4c40a413 100644 --- a/tool/plinko/lib/printf.h +++ b/tool/plinko/lib/printf.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_PLINKO_LIB_PRINTF_H_ #define COSMOPOLITAN_TOOL_PLINKO_LIB_PRINTF_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int Printf(const char *, ...); @@ -10,5 +9,4 @@ int Vfprintf(const char *, va_list, int); int Vfnprintf(const char *, va_list, int, int); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_PRINTF_H_ */ diff --git a/tool/plinko/lib/stack.h b/tool/plinko/lib/stack.h index 1a34f6fd2..ce73fce7d 100644 --- a/tool/plinko/lib/stack.h +++ b/tool/plinko/lib/stack.h @@ -4,7 +4,6 @@ #include "libc/stdckdint.h" #include "tool/plinko/lib/error.h" #include "tool/plinko/lib/plinko.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define SetFrame(r, x) \ @@ -45,5 +44,4 @@ forceinline void Repush(int x) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_STACK_H_ */ diff --git a/tool/plinko/lib/trace.h b/tool/plinko/lib/trace.h index f6f735bde..63cc21cc8 100644 --- a/tool/plinko/lib/trace.h +++ b/tool/plinko/lib/trace.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_PLINKO_LIB_TRACE_H_ #define COSMOPOLITAN_TOOL_PLINKO_LIB_TRACE_H_ #include "libc/str/str.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ #define START_TRACE \ @@ -36,5 +35,4 @@ COSMOPOLITAN_C_START_ void EnableTracing(void); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_TRACE_H_ */ diff --git a/tool/plinko/lib/tree.h b/tool/plinko/lib/tree.h index d64dd547f..59eff794b 100644 --- a/tool/plinko/lib/tree.h +++ b/tool/plinko/lib/tree.h @@ -2,7 +2,6 @@ #define COSMOPOLITAN_TOOL_PLINKO_LIB_TREE_H_ #include "tool/plinko/lib/cons.h" #include "tool/plinko/lib/plinko.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ int PutTree(int, int, int); @@ -43,5 +42,4 @@ forceinline int Bkn(int N) { } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_TREE_H_ */ diff --git a/tool/plinko/lib/types.h b/tool/plinko/lib/types.h index 693da8614..abf2905f4 100644 --- a/tool/plinko/lib/types.h +++ b/tool/plinko/lib/types.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_PLINKO_LIB_TYPES_H_ #define COSMOPOLITAN_TOOL_PLINKO_LIB_TYPES_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef unsigned long dword; @@ -11,5 +10,4 @@ struct qword { }; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_PLINKO_LIB_TYPES_H_ */ diff --git a/tool/scripts/fix-third-party.py b/tool/scripts/fix-third-party.py index 686a5bc8b..071f353ef 100755 --- a/tool/scripts/fix-third-party.py +++ b/tool/scripts/fix-third-party.py @@ -50,8 +50,6 @@ def FixThirdParty(path): start = 0 res = [] - if not code.startswith('// clang-format off\n'): - res.append('// clang-format off\n') for m in re.finditer(r'(?:/[/*] MISSING )?#\s*include\s*"([^"]+)"(?: \*/)?', code): end, newstart = m.span() res.append(code[start:end]) diff --git a/tool/viz/cpuid.c b/tool/viz/cpuid.c index e0e3cc0d3..ce8f5d33b 100644 --- a/tool/viz/cpuid.c +++ b/tool/viz/cpuid.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/intrin/kprintf.h" #include "libc/log/color.internal.h" #include "libc/mem/gc.h" diff --git a/tool/viz/lib/bilinearscale.h b/tool/viz/lib/bilinearscale.h index c8bd7b4d4..dc7b99af5 100644 --- a/tool/viz/lib/bilinearscale.h +++ b/tool/viz/lib/bilinearscale.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_BILINEARSCALE_H_ #define COSMOPOLITAN_TOOL_VIZ_LIB_BILINEARSCALE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *BilinearScale(long dcw, long dyw, long dxw, @@ -10,5 +9,4 @@ void *BilinearScale(long dcw, long dyw, long dxw, double); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_BILINEARSCALE_H_ */ diff --git a/tool/viz/lib/convolution.h b/tool/viz/lib/convolution.h index 21291dfd5..1ba84efb0 100644 --- a/tool/viz/lib/convolution.h +++ b/tool/viz/lib/convolution.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_CONVOLUTION_H_ #define COSMOPOLITAN_TOOL_VIZ_LIB_CONVOLUTION_H_ #include "dsp/core/q.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /* clang-format off */ #define CONVROUND(X) ((int)rint(X)) @@ -63,5 +62,4 @@ unsigned *convoindex(unsigned, unsigned, unsigned) mallocesque; -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_CONVOLUTION_H_ */ diff --git a/tool/viz/lib/convolve.h b/tool/viz/lib/convolve.h index 3c55a5b8e..16ec08e77 100644 --- a/tool/viz/lib/convolve.h +++ b/tool/viz/lib/convolve.h @@ -4,7 +4,6 @@ #include "libc/mem/mem.h" #include "libc/str/str.h" #include "tool/viz/lib/graphic.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef float convolve_t __attribute__((__vector_size__(16))); @@ -42,5 +41,4 @@ forceinline void convolve(unsigned yn, unsigned xn, ttyrgb_m128 img[yn][xn], } COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_CONVOLVE_H_ */ diff --git a/tool/viz/lib/formatstringtable-assembly.c b/tool/viz/lib/formatstringtable-assembly.c index 9a96a283d..971e97648 100644 --- a/tool/viz/lib/formatstringtable-assembly.c +++ b/tool/viz/lib/formatstringtable-assembly.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" #include "libc/intrin/safemacros.internal.h" #include "libc/mem/gc.internal.h" #include "libc/str/str.h" diff --git a/tool/viz/lib/formatstringtable-testlib.h b/tool/viz/lib/formatstringtable-testlib.h index 389efc131..b4eb037c6 100644 --- a/tool/viz/lib/formatstringtable-testlib.h +++ b/tool/viz/lib/formatstringtable-testlib.h @@ -4,7 +4,6 @@ #include "libc/str/str.h" #include "libc/testlib/testlib.h" #include "tool/viz/lib/formatstringtable.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) /** * Tests matrix contains expected content w/ string compare. @@ -64,5 +63,4 @@ void testlib_showerror_expect_matrixeq(int, const char *, const char *, char *, char *, const char *, ...); -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_FORMATSTRINGTABLE_TESTLIB_H_ */ diff --git a/tool/viz/lib/formatstringtable.h b/tool/viz/lib/formatstringtable.h index c03890fc8..ccaaea1f7 100644 --- a/tool/viz/lib/formatstringtable.h +++ b/tool/viz/lib/formatstringtable.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_FORMATSTRINGTABLE_H_ #define COSMOPOLITAN_TOOL_VIZ_LIB_FORMATSTRINGTABLE_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ typedef void *StringTableFormatter(long yn, long xn, const char *const[yn][xn], @@ -44,5 +43,4 @@ char *StringifyMatrixShort(long yn, long xn, const short[yn][xn], const char *) mallocesque; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_FORMATSTRINGTABLE_H_ */ diff --git a/tool/viz/lib/graphic.h b/tool/viz/lib/graphic.h index 832f82097..235c3822a 100644 --- a/tool/viz/lib/graphic.h +++ b/tool/viz/lib/graphic.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_GRAPHIC_H_ #define COSMOPOLITAN_TOOL_VIZ_LIB_GRAPHIC_H_ #include "dsp/tty/quant.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct Graphic { @@ -45,5 +44,4 @@ void WriteToFrameBuffer(size_t dyn, size_t dxn, unsigned char dst[dyn][dxn][4], size_t yn, size_t xn); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_GRAPHIC_H_ */ diff --git a/tool/viz/lib/halfblit.h b/tool/viz/lib/halfblit.h index 5d66a34be..66e72d733 100644 --- a/tool/viz/lib/halfblit.h +++ b/tool/viz/lib/halfblit.h @@ -1,10 +1,8 @@ #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_HALFBLIT_H_ #define COSMOPOLITAN_TOOL_VIZ_LIB_HALFBLIT_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ void *halfblit(size_t, void *); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_HALFBLIT_H_ */ diff --git a/tool/viz/lib/knobs.h b/tool/viz/lib/knobs.h index 270f8ce29..72b52e455 100644 --- a/tool/viz/lib/knobs.h +++ b/tool/viz/lib/knobs.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_KNOBS_H_ #define COSMOPOLITAN_TOOL_VIZ_LIB_KNOBS_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ extern bool pf1_; @@ -17,5 +16,4 @@ extern bool pf11_; extern bool pf12_; COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_KNOBS_H_ */ diff --git a/tool/viz/lib/perlin3.c b/tool/viz/lib/perlin3.c index 136936630..27a64fc20 100644 --- a/tool/viz/lib/perlin3.c +++ b/tool/viz/lib/perlin3.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/intrin/bits.h" #include "libc/macros.internal.h" #include "libc/math.h" #include "tool/viz/lib/graphic.h" diff --git a/tool/viz/lib/stringbuilder.h b/tool/viz/lib/stringbuilder.h index 1d67ba899..4f8b0a5e7 100644 --- a/tool/viz/lib/stringbuilder.h +++ b/tool/viz/lib/stringbuilder.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_STRINGBUILDER_H_ #define COSMOPOLITAN_TOOL_VIZ_LIB_STRINGBUILDER_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct StringBuilder { @@ -17,5 +16,4 @@ char *FreeStringBuilder(struct StringBuilder *) mallocesque returnsnonnull paramsnonnull(); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_STRINGBUILDER_H_ */ diff --git a/tool/viz/lib/ycbcr.h b/tool/viz/lib/ycbcr.h index 57d3b2c76..de4738c88 100644 --- a/tool/viz/lib/ycbcr.h +++ b/tool/viz/lib/ycbcr.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_YCBCR_H_ #define COSMOPOLITAN_TOOL_VIZ_LIB_YCBCR_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ struct YCbCr; @@ -30,5 +29,4 @@ void *YCbCr2RgbScale(long dyn, long dxn, unsigned char[restrict 3][dyn][dxn], double, double, double, double, struct YCbCr **); COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_VIZ_LIB_YCBCR_H_ */ diff --git a/tool/viz/maxmind.c b/tool/viz/maxmind.c index a7e901ffa..f8ac745e6 100644 --- a/tool/viz/maxmind.c +++ b/tool/viz/maxmind.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/intrin/bits.h" +#include "libc/serialize.h" #include "libc/log/check.h" #include "libc/log/log.h" #include "libc/mem/gc.internal.h" @@ -27,10 +27,8 @@ #include "net/http/ip.h" #include "third_party/maxmind/maxminddb.h" -#define PATH(...) \ - (const char *const[]) { \ - __VA_ARGS__, 0 \ - } +#define PATH(...) \ + (const char *const[]) { __VA_ARGS__, 0 } MMDB_s *ipdb, *asdb; diff --git a/tool/viz/memzoom.c b/tool/viz/memzoom.c index e2f25ff23..acafb99e7 100644 --- a/tool/viz/memzoom.c +++ b/tool/viz/memzoom.c @@ -29,7 +29,6 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" #include "libc/intrin/bsf.h" #include "libc/intrin/bsr.h" #include "libc/intrin/hilbert.h" diff --git a/tool/viz/printansi.c b/tool/viz/printansi.c index 8e26c8885..fe6c76fcf 100644 --- a/tool/viz/printansi.c +++ b/tool/viz/printansi.c @@ -29,7 +29,6 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/conv.h" -#include "libc/intrin/bits.h" #include "libc/intrin/safemacros.internal.h" #include "libc/limits.h" #include "libc/log/check.h" diff --git a/tool/viz/printvideo.c b/tool/viz/printvideo.c index d72b5a767..d39db0b53 100644 --- a/tool/viz/printvideo.c +++ b/tool/viz/printvideo.c @@ -42,7 +42,6 @@ #include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/fmt/itoa.h" -#include "libc/intrin/bits.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/safemacros.internal.h" #include "libc/intrin/xchg.internal.h"