diff options
author | Andrew Kaster <akaster@serenityos.org> | 2023-01-07 10:54:01 -0700 |
---|---|---|
committer | Andrew Kaster <andrewdkaster@gmail.com> | 2023-01-21 10:43:59 -0700 |
commit | 046c23f567a17758d762a33bdf04bacbfd088f9f (patch) | |
tree | de4b843e57acae2bfef860852094263522f1e94c | |
parent | d4ef2e226cf0680d0921b9ec534ea830d1cd9aa7 (diff) | |
download | serenity-046c23f567a17758d762a33bdf04bacbfd088f9f.zip |
Kernel+LibC: Move LibC/signal_numbers.h to Kernel/API/POSIX
Make Userland and Tests users just include signal.h, and move Kernel
users to the new API file.
-rw-r--r-- | Kernel/API/POSIX/signal.h | 1 | ||||
-rw-r--r-- | Kernel/API/POSIX/signal_numbers.h (renamed from Userland/Libraries/LibC/signal_numbers.h) | 0 | ||||
-rw-r--r-- | Kernel/Process.h | 1 | ||||
-rw-r--r-- | Kernel/TTY/MasterPTY.cpp | 2 | ||||
-rw-r--r-- | Kernel/TTY/TTY.cpp | 2 | ||||
-rw-r--r-- | Kernel/Thread.cpp | 2 | ||||
-rw-r--r-- | Kernel/Thread.h | 2 | ||||
-rw-r--r-- | Tests/Kernel/TestKernelAlarm.cpp | 1 | ||||
-rw-r--r-- | Userland/Libraries/LibC/signal.h | 1 | ||||
-rw-r--r-- | Userland/Libraries/LibCoredump/Reader.cpp | 2 | ||||
-rw-r--r-- | Userland/Utilities/tt.cpp | 2 |
11 files changed, 7 insertions, 9 deletions
diff --git a/Kernel/API/POSIX/signal.h b/Kernel/API/POSIX/signal.h index 4d9d680520..72ec996f24 100644 --- a/Kernel/API/POSIX/signal.h +++ b/Kernel/API/POSIX/signal.h @@ -6,6 +6,7 @@ #pragma once +#include <Kernel/API/POSIX/signal_numbers.h> #include <Kernel/API/POSIX/sys/types.h> #ifdef __cplusplus diff --git a/Userland/Libraries/LibC/signal_numbers.h b/Kernel/API/POSIX/signal_numbers.h index 17ee5bd9d4..17ee5bd9d4 100644 --- a/Userland/Libraries/LibC/signal_numbers.h +++ b/Kernel/API/POSIX/signal_numbers.h diff --git a/Kernel/Process.h b/Kernel/Process.h index acdc1dcbc3..72f65b004c 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -38,7 +38,6 @@ #include <Kernel/Thread.h> #include <Kernel/UnixTypes.h> #include <LibC/elf.h> -#include <LibC/signal_numbers.h> namespace Kernel { diff --git a/Kernel/TTY/MasterPTY.cpp b/Kernel/TTY/MasterPTY.cpp index f8b9447540..5c4253a061 100644 --- a/Kernel/TTY/MasterPTY.cpp +++ b/Kernel/TTY/MasterPTY.cpp @@ -5,13 +5,13 @@ */ #include <Kernel/API/POSIX/errno.h> +#include <Kernel/API/POSIX/signal_numbers.h> #include <Kernel/Debug.h> #include <Kernel/InterruptDisabler.h> #include <Kernel/Process.h> #include <Kernel/TTY/MasterPTY.h> #include <Kernel/TTY/PTYMultiplexer.h> #include <Kernel/TTY/SlavePTY.h> -#include <LibC/signal_numbers.h> #include <LibC/sys/ioctl_numbers.h> namespace Kernel { diff --git a/Kernel/TTY/TTY.cpp b/Kernel/TTY/TTY.cpp index 25b6d71fc0..59c2b47981 100644 --- a/Kernel/TTY/TTY.cpp +++ b/Kernel/TTY/TTY.cpp @@ -8,11 +8,11 @@ #include <AK/ScopeGuard.h> #include <AK/StringView.h> #include <Kernel/API/POSIX/errno.h> +#include <Kernel/API/POSIX/signal_numbers.h> #include <Kernel/Debug.h> #include <Kernel/InterruptDisabler.h> #include <Kernel/Process.h> #include <Kernel/TTY/TTY.h> -#include <LibC/signal_numbers.h> #include <LibC/sys/ioctl_numbers.h> #define TTYDEFCHARS #include <LibC/sys/ttydefaults.h> diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp index f7fcf51fbd..3f892fad61 100644 --- a/Kernel/Thread.cpp +++ b/Kernel/Thread.cpp @@ -9,6 +9,7 @@ #include <AK/StringBuilder.h> #include <AK/TemporaryChange.h> #include <AK/Time.h> +#include <Kernel/API/POSIX/signal_numbers.h> #include <Kernel/Arch/SmapDisabler.h> #include <Kernel/Arch/TrapFrame.h> #include <Kernel/Debug.h> @@ -29,7 +30,6 @@ #include <Kernel/ThreadTracer.h> #include <Kernel/TimerQueue.h> #include <Kernel/kstdio.h> -#include <LibC/signal_numbers.h> namespace Kernel { diff --git a/Kernel/Thread.h b/Kernel/Thread.h index 0bbbf4a16a..b8b2a55e1e 100644 --- a/Kernel/Thread.h +++ b/Kernel/Thread.h @@ -16,6 +16,7 @@ #include <AK/Variant.h> #include <AK/Vector.h> #include <Kernel/API/POSIX/sched.h> +#include <Kernel/API/POSIX/signal_numbers.h> #include <Kernel/Arch/RegisterState.h> #include <Kernel/Arch/ThreadRegisters.h> #include <Kernel/Debug.h> @@ -31,7 +32,6 @@ #include <Kernel/Memory/VirtualRange.h> #include <Kernel/UnixTypes.h> #include <LibC/fd_set.h> -#include <LibC/signal_numbers.h> namespace Kernel { diff --git a/Tests/Kernel/TestKernelAlarm.cpp b/Tests/Kernel/TestKernelAlarm.cpp index 3d4fae0b1a..843d8ecaf8 100644 --- a/Tests/Kernel/TestKernelAlarm.cpp +++ b/Tests/Kernel/TestKernelAlarm.cpp @@ -9,7 +9,6 @@ #include <LibCore/ElapsedTimer.h> #include <LibTest/TestCase.h> #include <signal.h> -#include <signal_numbers.h> #include <unistd.h> class SuccessContext { diff --git a/Userland/Libraries/LibC/signal.h b/Userland/Libraries/LibC/signal.h index 87012a41a3..4aa0048733 100644 --- a/Userland/Libraries/LibC/signal.h +++ b/Userland/Libraries/LibC/signal.h @@ -9,7 +9,6 @@ #include <Kernel/API/POSIX/signal.h> #include <Kernel/API/POSIX/ucontext.h> #include <bits/sighow.h> -#include <signal_numbers.h> #include <sys/cdefs.h> #include <sys/types.h> diff --git a/Userland/Libraries/LibCoredump/Reader.cpp b/Userland/Libraries/LibCoredump/Reader.cpp index 9fd13b2b6a..a6cc8bc24e 100644 --- a/Userland/Libraries/LibCoredump/Reader.cpp +++ b/Userland/Libraries/LibCoredump/Reader.cpp @@ -13,7 +13,7 @@ #include <LibCompress/Gzip.h> #include <LibCore/File.h> #include <LibCoredump/Reader.h> -#include <signal_numbers.h> +#include <signal.h> #include <string.h> #include <unistd.h> diff --git a/Userland/Utilities/tt.cpp b/Userland/Utilities/tt.cpp index e645b4da85..9e74ce7f7b 100644 --- a/Userland/Utilities/tt.cpp +++ b/Userland/Utilities/tt.cpp @@ -8,7 +8,7 @@ #include <LibMain/Main.h> #include <errno.h> #include <pthread.h> -#include <signal_numbers.h> +#include <signal.h> #include <stdio.h> #include <string.h> #include <sys/mman.h> |