From 4ad7d95bac481ad2c29b5ba200adceb18cf1575a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 9 Aug 2014 20:18:05 +0200 Subject: [PATCH] Revert "Add sys/ucontext.h" This reverts commit 6ddf93bfbec1ecec76cf119c50327f93f6d4fef8. As pointed out by Ingo, those were moved to sugnal.h in the latest issue (issue 7) of the POSIX spec. Sorry! --- headers/posix/signal.h | 10 ++++++++++ headers/posix/sys/ucontext.h | 19 ------------------- headers/private/kernel/ksignal.h | 1 - headers/private/kernel/thread_types.h | 1 - 4 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 headers/posix/sys/ucontext.h diff --git a/headers/posix/signal.h b/headers/posix/signal.h index 6b9da3d6c5..d56cf2edfa 100644 --- a/headers/posix/signal.h +++ b/headers/posix/signal.h @@ -351,4 +351,14 @@ typedef struct vregs vregs; #include __HAIKU_ARCH_HEADER(signal.h) +typedef struct vregs mcontext_t; + +typedef struct __ucontext_t { + struct __ucontext_t* uc_link; + sigset_t uc_sigmask; + stack_t uc_stack; + mcontext_t uc_mcontext; +} ucontext_t; + + #endif /* _SIGNAL_H_ */ diff --git a/headers/posix/sys/ucontext.h b/headers/posix/sys/ucontext.h deleted file mode 100644 index 52ae543f82..0000000000 --- a/headers/posix/sys/ucontext.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2014, Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - */ -#ifndef _UCONTEXT_H_ -#define _UCONTEXT_H_ - - -typedef struct vregs mcontext_t; - -typedef struct __ucontext_t { - struct __ucontext_t* uc_link; - sigset_t uc_sigmask; - stack_t uc_stack; - mcontext_t uc_mcontext; -} ucontext_t; - - -#endif diff --git a/headers/private/kernel/ksignal.h b/headers/private/kernel/ksignal.h index 55d756df32..4727053c8d 100644 --- a/headers/private/kernel/ksignal.h +++ b/headers/private/kernel/ksignal.h @@ -17,7 +17,6 @@ #include #include #include -#include namespace BKernel { diff --git a/headers/private/kernel/thread_types.h b/headers/private/kernel/thread_types.h index ef2ba672c3..bfa1ad1004 100644 --- a/headers/private/kernel/thread_types.h +++ b/headers/private/kernel/thread_types.h @@ -25,7 +25,6 @@ #include #include #include -#include enum additional_thread_state {