From: Sascha Wildner <saw@online.de>
Date: Fri, 5 Feb 2010 15:00:19 +0000 (+0100)
Subject: Move the prototypes of pthread_kill() and pthread_sigmask() to <signal.h>.
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/ba47efebaed2f1fd9aed1b12d060c5c4c1941af8

Move the prototypes of pthread_kill() and pthread_sigmask() to <signal.h>.

In accordance with POSIX and like FreeBSD and NetBSD have it too.

In-discussion-with: Beket
---

diff --git a/include/pthread.h b/include/pthread.h
index bc393be91a..3abc41a3eb 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/include/pthread.h,v 1.20.2.4 2003/05/27 18:18:01 jdp Exp $
- * $DragonFly: src/include/pthread.h,v 1.10 2007/06/26 23:30:05 josepht Exp $
  */
 #ifndef _PTHREAD_H_
 #define _PTHREAD_H_
@@ -197,7 +196,6 @@ void		*pthread_getspecific(pthread_key_t);
 int		pthread_join(pthread_t, void **);
 int		pthread_key_create(pthread_key_t *, void (*) (void *));
 int		pthread_key_delete(pthread_key_t);
-int		pthread_kill(pthread_t, int);
 int		pthread_mutexattr_init(pthread_mutexattr_t *);
 int		pthread_mutexattr_destroy(pthread_mutexattr_t *);
 int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
@@ -230,7 +228,6 @@ int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
 int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
 pthread_t	pthread_self(void);
 int		pthread_setspecific(pthread_key_t, const void *);
-int		pthread_sigmask(int, const sigset_t *, sigset_t *);
 
 int		pthread_spin_destroy(pthread_spinlock_t *);
 int		pthread_spin_init(pthread_spinlock_t *, int);
diff --git a/include/signal.h b/include/signal.h
index 4a06482c34..8724548410 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -33,7 +33,6 @@
  *	@(#)signal.h	8.3 (Berkeley) 3/30/94
  *
  * $FreeBSD: src/include/signal.h,v 1.14 1999/10/02 19:33:23 marcel Exp $
- * $DragonFly: src/include/signal.h,v 1.5 2007/03/12 21:07:41 corecode Exp $
  */
 
 #ifndef _SIGNAL_H_
@@ -57,6 +56,9 @@ __BEGIN_DECLS
 int	raise (int);
 #ifndef	_ANSI_SOURCE
 int	kill (__pid_t, int);
+int	pthread_kill (pthread_t, int);
+int	pthread_sigmask (int, const sigset_t * __restrict,
+	    sigset_t * __restrict);
 int	sigaction (int, const struct sigaction *, struct sigaction *);
 int	sigaddset (sigset_t *, int);
 int	sigdelset (sigset_t *, int);