diff --git a/src/base/base.h b/src/base/base.h index 9ca2951..e884a43 100644 --- a/src/base/base.h +++ b/src/base/base.h @@ -9,7 +9,6 @@ extern "C" { #include "cptr.h" #include "optime.h" #include "type_system/type_system.h" -#include "kprint/kprint.h" #if __cplusplus } diff --git a/src/base/type_system/base_toString.c b/src/base/type_system/base_toString.c index 2d49c9c..ee6d5d6 100644 --- a/src/base/type_system/base_toString.c +++ b/src/base/type_system/base_toString.c @@ -1,6 +1,6 @@ #include "base_toString.h" #include "../cptr.h" -#include "../kprint/kprint_format.h" +#include "../../kprint/kprint_format.h" char* toString_int(int64 n){ int64 d=n; diff --git a/src/base/kprint/README.md b/src/kprint/README.md similarity index 100% rename from src/base/kprint/README.md rename to src/kprint/README.md diff --git a/src/base/kprint/kprint.c b/src/kprint/kprint.c similarity index 99% rename from src/base/kprint/kprint.c rename to src/kprint/kprint.c index 744fc74..28de177 100644 --- a/src/base/kprint/kprint.c +++ b/src/kprint/kprint.c @@ -1,5 +1,5 @@ -#include "../base.h" -#include "../../String/StringBuilder.h" +#include "../String/StringBuilder.h" +#include "kprint.h" ktId __typeFromFormat(kprint_format f){ ktId typeId=kprint_format_ktId(f); diff --git a/src/base/kprint/kprint.h b/src/kprint/kprint.h similarity index 98% rename from src/base/kprint/kprint.h rename to src/kprint/kprint.h index 3acdd2f..68d1d2e 100644 --- a/src/base/kprint/kprint.h +++ b/src/kprint/kprint.h @@ -4,7 +4,7 @@ extern "C" { #endif -#include "../errors.h" +#include "../base/errors.h" #include "kprint_colors.h" #include "kprint_format.h" diff --git a/src/base/kprint/kprint_colors.h b/src/kprint/kprint_colors.h similarity index 100% rename from src/base/kprint/kprint_colors.h rename to src/kprint/kprint_colors.h diff --git a/src/base/kprint/kprint_format.h b/src/kprint/kprint_format.h similarity index 95% rename from src/base/kprint/kprint_format.h rename to src/kprint/kprint_format.h index 9568ac9..0a275ea 100644 --- a/src/base/kprint/kprint_format.h +++ b/src/kprint/kprint_format.h @@ -4,8 +4,8 @@ extern "C" { #endif -#include "../std.h" -#include "../type_system/ktId.h" +#include "../base/std.h" +#include "../base/type_system/ktId.h" typedef enum kprint_dataFormat{ // 00000000 00000000 00000000 00000000 diff --git a/src/base/kprint/kprint_format.md b/src/kprint/kprint_format.md similarity index 100% rename from src/base/kprint/kprint_format.md rename to src/kprint/kprint_format.md diff --git a/tests/test_kprint_colors.c b/tests/test_kprint_colors.c index e23b8d9..487d8f3 100644 --- a/tests/test_kprint_colors.c +++ b/tests/test_kprint_colors.c @@ -1,4 +1,5 @@ #include "tests.h" +#include "../src/kprint/kprint.h" #if defined(_WIN32)|| defined(_WIN64) #include #endif