From 80527ed56a560362e364d1cee0337d9bd2978b31 Mon Sep 17 00:00:00 2001
From: bumbread <thebumboni@gmail.com>
Date: Sun, 28 Aug 2022 10:13:15 +1100
Subject: [PATCH] reorganize files

---
 bake.cmd                                     |  2 +-
 src/ciabatta.c                               | 22 ++++++++++----------
 src/{_linux => os_linux}/linux_environment.c |  0
 src/{_linux => os_linux}/syscalls.asm        |  0
 src/{_win => os_win}/assert.c                |  0
 src/{_win => os_win}/chkstk.asm              |  0
 src/{_win => os_win}/cmdline.c               |  0
 src/{_win => os_win}/cookie.c                |  0
 src/{_win => os_win}/entry.c                 |  0
 src/{_win => os_win}/environment.c           |  0
 src/{_win => os_win}/heap.c                  |  0
 src/{_win => os_win}/signal.c                |  0
 src/{_win => os_win}/stdio.c                 |  0
 src/{_win => os_win}/threads.c               |  0
 src/{_win => os_win}/time.c                  |  0
 src/{_win => os_win}/win.h                   |  0
 16 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{_linux => os_linux}/linux_environment.c (100%)
 rename src/{_linux => os_linux}/syscalls.asm (100%)
 rename src/{_win => os_win}/assert.c (100%)
 rename src/{_win => os_win}/chkstk.asm (100%)
 rename src/{_win => os_win}/cmdline.c (100%)
 rename src/{_win => os_win}/cookie.c (100%)
 rename src/{_win => os_win}/entry.c (100%)
 rename src/{_win => os_win}/environment.c (100%)
 rename src/{_win => os_win}/heap.c (100%)
 rename src/{_win => os_win}/signal.c (100%)
 rename src/{_win => os_win}/stdio.c (100%)
 rename src/{_win => os_win}/threads.c (100%)
 rename src/{_win => os_win}/time.c (100%)
 rename src/{_win => os_win}/win.h (100%)

diff --git a/bake.cmd b/bake.cmd
index 7bc983c..5e191c0 100644
--- a/bake.cmd
+++ b/bake.cmd
@@ -6,7 +6,7 @@ windres -o utf8.obj utf8.rc
 ld -relocatable -o libwinsane.obj utf8.obj
 
 :: Compile chkstk
-nasm src\_win\chkstk.asm -ochkstk.o -fwin64
+nasm src\os_win\chkstk.asm -ochkstk.o -fwin64
 
 :: Compile the rest of the party
 clang -Wall src\ciabatta.c -o ciabatta.obj -c -DCIABATTA_WIN -I inc -I src\_win -nodefaultlibs -g -mfma
diff --git a/src/ciabatta.c b/src/ciabatta.c
index c38a1ab..2303b23 100644
--- a/src/ciabatta.c
+++ b/src/ciabatta.c
@@ -65,15 +65,15 @@
 
 // Windows stuff
 #if defined(CIABATTA_WIN)
-    #include "_win/win.h"
-    #include "_win/cookie.c"
-    #include "_win/assert.c"
-    #include "_win/cmdline.c"
-    #include "_win/entry.c"
-    #include "_win/environment.c"
-    #include "_win/heap.c"
-    #include "_win/signal.c"
-    #include "_win/stdio.c"
-    #include "_win/threads.c"
-    #include "_win/time.c"
+    #include "os_win/win.h"
+    #include "os_win/cookie.c"
+    #include "os_win/assert.c"
+    #include "os_win/cmdline.c"
+    #include "os_win/entry.c"
+    #include "os_win/environment.c"
+    #include "os_win/heap.c"
+    #include "os_win/signal.c"
+    #include "os_win/stdio.c"
+    #include "os_win/threads.c"
+    #include "os_win/time.c"
 #endif
diff --git a/src/_linux/linux_environment.c b/src/os_linux/linux_environment.c
similarity index 100%
rename from src/_linux/linux_environment.c
rename to src/os_linux/linux_environment.c
diff --git a/src/_linux/syscalls.asm b/src/os_linux/syscalls.asm
similarity index 100%
rename from src/_linux/syscalls.asm
rename to src/os_linux/syscalls.asm
diff --git a/src/_win/assert.c b/src/os_win/assert.c
similarity index 100%
rename from src/_win/assert.c
rename to src/os_win/assert.c
diff --git a/src/_win/chkstk.asm b/src/os_win/chkstk.asm
similarity index 100%
rename from src/_win/chkstk.asm
rename to src/os_win/chkstk.asm
diff --git a/src/_win/cmdline.c b/src/os_win/cmdline.c
similarity index 100%
rename from src/_win/cmdline.c
rename to src/os_win/cmdline.c
diff --git a/src/_win/cookie.c b/src/os_win/cookie.c
similarity index 100%
rename from src/_win/cookie.c
rename to src/os_win/cookie.c
diff --git a/src/_win/entry.c b/src/os_win/entry.c
similarity index 100%
rename from src/_win/entry.c
rename to src/os_win/entry.c
diff --git a/src/_win/environment.c b/src/os_win/environment.c
similarity index 100%
rename from src/_win/environment.c
rename to src/os_win/environment.c
diff --git a/src/_win/heap.c b/src/os_win/heap.c
similarity index 100%
rename from src/_win/heap.c
rename to src/os_win/heap.c
diff --git a/src/_win/signal.c b/src/os_win/signal.c
similarity index 100%
rename from src/_win/signal.c
rename to src/os_win/signal.c
diff --git a/src/_win/stdio.c b/src/os_win/stdio.c
similarity index 100%
rename from src/_win/stdio.c
rename to src/os_win/stdio.c
diff --git a/src/_win/threads.c b/src/os_win/threads.c
similarity index 100%
rename from src/_win/threads.c
rename to src/os_win/threads.c
diff --git a/src/_win/time.c b/src/os_win/time.c
similarity index 100%
rename from src/_win/time.c
rename to src/os_win/time.c
diff --git a/src/_win/win.h b/src/os_win/win.h
similarity index 100%
rename from src/_win/win.h
rename to src/os_win/win.h