From b4ea4b8ca157f467a18f1255a0b6c4c0a39139f5 Mon Sep 17 00:00:00 2001 From: Nathan Giddings Date: Thu, 9 Nov 2023 21:19:13 -0600 Subject: [PATCH] Merged sighandler.h into sigaction.h --- include/Makefile.am | 2 +- include/types/sigaction.h | 3 ++- include/types/sighandler.h | 6 ------ 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 include/types/sighandler.h diff --git a/include/Makefile.am b/include/Makefile.am index a59e461..4aa1946 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,3 @@ nobase_include_HEADERS = types/status.h types/syscallid.h types/physaddr.h \ types/syscallarg.h sys/syscalls.h types/pid.h types/oid.h \ - types/sigaction.h types/sighandler.h \ No newline at end of file + types/sigaction.h \ No newline at end of file diff --git a/include/types/sigaction.h b/include/types/sigaction.h index 6ebb0e9..e8c5a32 100644 --- a/include/types/sigaction.h +++ b/include/types/sigaction.h @@ -2,7 +2,8 @@ #define QUARK_SIGACTION_H #include "types/pid.h" -#include "types/sighandler.h" + +typedef unsigned long (*signal_handler_t)(void*, void*); struct signal_action_t { diff --git a/include/types/sighandler.h b/include/types/sighandler.h deleted file mode 100644 index e94eea5..0000000 --- a/include/types/sighandler.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef QUARK_SIGHANDLER_H -#define QUARK_SIGHANDLER_H - -typedef unsigned long (*signal_handler_t)(void*, void*); - -#endif \ No newline at end of file