From 24195780df2a11334ead41dc1745e626391b8e06 Mon Sep 17 00:00:00 2001 From: dzaima Date: Sun, 20 Nov 2022 18:22:51 +0200 Subject: [PATCH] reorder headers to allow OpenBSD hack to function --- src/builtins/md2.c | 2 +- src/builtins/sysfn.c | 8 +++----- src/core/stuff.c | 2 +- src/jit/nvm_x86_64.c | 2 +- src/opt/mm_2buddy.c | 1 + src/opt/mm_buddy.c | 1 + src/singeli/c/cmp.c | 2 +- src/utils/file.c | 6 +++--- src/vm.c | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/builtins/md2.c b/src/builtins/md2.c index cb3b2373..8f95a029 100644 --- a/src/builtins/md2.c +++ b/src/builtins/md2.c @@ -1,8 +1,8 @@ -#include #include "../core.h" #include "../utils/talloc.h" #include "../utils/mut.h" #include "../builtins.h" +#include B md2BI_uc1(Md2* t, B o, B f, B g, B x) { return ((BMd2*)t)->uc1(t, o, f, g, x); } B md2BI_ucw(Md2* t, B o, B f, B g, B w, B x) { return ((BMd2*)t)->ucw(t, o, f, g, w, x); } diff --git a/src/builtins/sysfn.c b/src/builtins/sysfn.c index 52d5446c..0d44b4f9 100644 --- a/src/builtins/sysfn.c +++ b/src/builtins/sysfn.c @@ -1,8 +1,3 @@ -#include -#include -#include - - #include "../core.h" #include "../utils/hash.h" #include "../utils/calls.h" @@ -13,6 +8,9 @@ #include "../ns.h" #include "../nfns.h" +#include +#include +#include static bool eqStr(B w, u32* x) { if (isAtm(w) || RNK(w)!=1) return false; diff --git a/src/core/stuff.c b/src/core/stuff.c index f9e4fd47..cea7b1ed 100644 --- a/src/core/stuff.c +++ b/src/core/stuff.c @@ -1,9 +1,9 @@ -#include #include "../core.h" #include "../utils/mut.h" #include "../utils/utf.h" #include "../utils/talloc.h" #include "../builtins.h" +#include bool please_tail_call_err = true; diff --git a/src/jit/nvm_x86_64.c b/src/jit/nvm_x86_64.c index 1139b9a9..6308e3c4 100644 --- a/src/jit/nvm_x86_64.c +++ b/src/jit/nvm_x86_64.c @@ -1,4 +1,3 @@ -#include #include "../core.h" #include "../core/gstack.h" #include "../ns.h" @@ -6,6 +5,7 @@ #include "../utils/talloc.h" #include "../utils/wyhash.h" #include "../vm.h" +#include #ifndef USE_PERF #define USE_PERF 0 // enable writing symbols to /tmp/perf-.map diff --git a/src/opt/mm_2buddy.c b/src/opt/mm_2buddy.c index 0b52f37d..c0de4b92 100644 --- a/src/opt/mm_2buddy.c +++ b/src/opt/mm_2buddy.c @@ -1,3 +1,4 @@ +#include "../core.h" #if !NO_MMAP #include #endif diff --git a/src/opt/mm_buddy.c b/src/opt/mm_buddy.c index d01088f1..eacc8165 100644 --- a/src/opt/mm_buddy.c +++ b/src/opt/mm_buddy.c @@ -1,3 +1,4 @@ +#include "../core.h" #if !NO_MMAP #include #endif diff --git a/src/singeli/c/cmp.c b/src/singeli/c/cmp.c index fbc17bb1..01394540 100644 --- a/src/singeli/c/cmp.c +++ b/src/singeli/c/cmp.c @@ -1,6 +1,6 @@ -#include #include "../../core.h" #include "../../builtins.h" +#include extern bool please_tail_call_err; static NOINLINE void cmp_err() { if (please_tail_call_err) thrM("Invalid comparison"); } diff --git a/src/utils/file.c b/src/utils/file.c index d6708cf9..6fc24e6f 100644 --- a/src/utils/file.c +++ b/src/utils/file.c @@ -1,10 +1,10 @@ -#include -#include -#include #include "../core.h" #include "file.h" #include "talloc.h" #include "cstr.h" +#include +#include +#include FILE* file_open(B path, char* desc, char* mode) { // doesn't consume diff --git a/src/vm.c b/src/vm.c index 2a7b134f..59cdaca9 100644 --- a/src/vm.c +++ b/src/vm.c @@ -1,10 +1,10 @@ -#include #include "core.h" #include "vm.h" #include "ns.h" #include "utils/utf.h" #include "utils/talloc.h" #include "utils/interrupt.h" +#include #ifndef UNWIND_COMPILER // whether to hide stackframes of the compiler in compiling errors #define UNWIND_COMPILER 1