Fix string.h being auto included pretty much everywhere

zerocc2014 · Dec 24, 2018 · f6f54ad · f6f54ad
1 parent 557e86c
commit f6f54ad
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 4 deletions.
diff --git a/emu/cpu.h b/emu/cpu.h
@@ -5,9 +5,9 @@
 #include "misc.h"
 #include "emu/float80.h"
 #include "emu/memory.h"
-#include "emu/tlb.h"
 
 struct cpu_state;
+struct tlb;
 void cpu_run(struct cpu_state *cpu);
 int cpu_step32(struct cpu_state *cpu, struct tlb *tlb);
 int cpu_step16(struct cpu_state *cpu, struct tlb *tlb);

diff --git a/emu/fpu.c b/emu/fpu.c
@@ -1,8 +1,9 @@
 // I don't remember if the interpreter was supposed to use this in addition to the jit
+#include <math.h>
+#include <string.h>
 #include "emu/cpu.h"
 #include "emu/float80.h"
 #include "emu/fpu.h"
-#include <math.h>
 
 #define ST(i) cpu->fp[cpu->top + i]
 

diff --git a/emu/memory.h b/emu/memory.h
@@ -3,7 +3,6 @@
 
 #include <stdatomic.h>
 #include <unistd.h>
-#include <string.h>
 #include "util/list.h"
 #include "util/sync.h"
 #include "misc.h"

diff --git a/emu/modrm.h b/emu/modrm.h
@@ -4,6 +4,7 @@
 #include "debug.h"
 #include "misc.h"
 #include "emu/cpu.h"
+#include "emu/tlb.h"
 
 #undef DEFAULT_CHANNEL
 #define DEFAULT_CHANNEL instr

diff --git a/emu/tlb.h b/emu/tlb.h
@@ -1,6 +1,7 @@
 #ifndef TLB_H
 #define TLB_H
 
+#include <string.h>
 #include "emu/memory.h"
 #include "debug.h"
 

diff --git a/fs/fd.c b/fs/fd.c
@@ -1,4 +1,6 @@
 #include <stdlib.h>
+#include <string.h>
+#include "debug.h"
 #include "kernel/task.h"
 #include "kernel/errno.h"
 #include "kernel/resource.h"

diff --git a/fs/mem.c b/fs/mem.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include "kernel/errno.h"
 #include "kernel/random.h"
 #include "fs/mem.h"

diff --git a/fs/mount.c b/fs/mount.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <sys/stat.h>
 #include "kernel/calls.h"
 #include "kernel/fs.h"

diff --git a/fs/poll.c b/fs/poll.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <poll.h>
 #include "misc.h"
 #include "util/list.h"

diff --git a/fs/proc.c b/fs/proc.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <sys/stat.h>
 #include "kernel/calls.h"
 #include "kernel/fs.h"

diff --git a/fs/sock.c b/fs/sock.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include "kernel/calls.h"

diff --git a/jit/offsets.c b/jit/offsets.c
@@ -1,6 +1,7 @@
 #include "jit/jit.h"
 #include "jit/frame.h"
 #include "emu/cpu.h"
+#include "emu/tlb.h"
 
 void cpu() {
     OFFSET(CPU, cpu_state, eax);

diff --git a/kernel/poll.c b/kernel/poll.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include "debug.h"
 #include "kernel/fs.h"
 #include "fs/fd.h"

diff --git a/kernel/signal.c b/kernel/signal.c
@@ -1,4 +1,5 @@
 #include "debug.h"
+#include <string.h>
 #include <signal.h>
 #include "kernel/calls.h"
 #include "kernel/signal.h"

diff --git a/main.c b/main.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <string.h>
 #include "kernel/calls.h"
 #include "kernel/task.h"
 #include "xX_main_Xx.h"

diff --git a/xX_main_Xx.h b/xX_main_Xx.h
@@ -1,5 +1,6 @@
-#include <signal.h>
+#include <string.h>
 #include <unistd.h>
+#include <signal.h>
 #include "kernel/init.h"
 #include "kernel/fs.h"