diff --git a/kernel-include/libkern/System b/kernel-include/libkern/System new file mode 120000 index 000000000..945c9b46d --- /dev/null +++ b/kernel-include/libkern/System @@ -0,0 +1 @@ +. \ No newline at end of file diff --git a/kernel-include/libkern/libkern b/kernel-include/libkern/libkern new file mode 120000 index 000000000..932b98b23 --- /dev/null +++ b/kernel-include/libkern/libkern @@ -0,0 +1 @@ +../../src/lkm/libkern/libkern/ \ No newline at end of file diff --git a/src/kernel/libsyscall/CMakeLists.txt b/src/kernel/libsyscall/CMakeLists.txt index d3f6b86ad..2b16963a5 100644 --- a/src/kernel/libsyscall/CMakeLists.txt +++ b/src/kernel/libsyscall/CMakeLists.txt @@ -10,6 +10,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/mach") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../iokit") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/os") include_directories("${CMAKE_SOURCE_DIR}/platform-include") +include_directories("${CMAKE_SOURCE_DIR}/kernel-include/libkern") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libc/include") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../duct/include") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/wrappers/libproc") diff --git a/src/kernel/libsyscall/mach/error_codes.c b/src/kernel/libsyscall/mach/error_codes.c index 93eaaaf38..085f468dc 100644 --- a/src/kernel/libsyscall/mach/error_codes.c +++ b/src/kernel/libsyscall/mach/error_codes.c @@ -64,7 +64,6 @@ #include #include "errorlib.h" -#ifndef DARLING #include "err_libkern.sub" #include "err_iokit.sub" #include "err_ipc.sub" @@ -72,10 +71,8 @@ #include "err_mach_ipc.sub" #include "err_server.sub" #include "err_us.sub" -#endif const struct error_system _mach_errors[err_max_system+1] = { -#ifndef DARLING /* 0; err_kern */ { errlib_count(err_os_sub), @@ -157,7 +154,6 @@ const struct error_system _mach_errors[err_max_system+1] = { /* 0x3a */ errorlib_system_null, /* 0x3b */ errorlib_system_null, /* 0x3c */ errorlib_system_null, /* 0x3d */ errorlib_system_null, /* 0x3e */ errorlib_system_null, /* 0x3f */ errorlib_system_null, -#endif }; // int error_system_count = errlib_count(_mach_errors);