--- Libc/Libc-391.5.22/include/signal.h
+++ Libc/Libc-262/include/signal.h
@@ -3,20 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -58,56 +57,41 @@
 #ifndef _USER_SIGNAL_H
 #define _USER_SIGNAL_H
 
-#include <_types.h>
+#include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/signal.h>
 
-#ifndef _PTHREAD_T
-typedef __darwin_pthread_t	pthread_t;
-#define _PTHREAD_T
-#endif
-
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE)
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 extern __const char *__const sys_signame[NSIG];
 extern __const char *__const sys_siglist[NSIG];
 #endif
 
 __BEGIN_DECLS
-int	raise(int);
-__END_DECLS
-
+int	raise __P((int));
 #ifndef	_ANSI_SOURCE
-__BEGIN_DECLS
-void	(*bsd_signal(int, void (*)(int)))(int);
-int	kill(pid_t, int);
-int	killpg(pid_t, int);
-int	pthread_kill(pthread_t, int);
-int	pthread_sigmask(int, const sigset_t *, sigset_t *);
-int	sigaction(int, const struct sigaction * __restrict,
-	    struct sigaction * __restrict);
-int	sigaddset(sigset_t *, int);
-int	sigaltstack(const stack_t * __restrict, stack_t * __restrict);
-int	sigdelset(sigset_t *, int);
-int	sigemptyset(sigset_t *);
-int	sigfillset(sigset_t *);
-int	sighold(int);
-int	sigignore(int);
-int	siginterrupt(int, int);
-int	sigismember(const sigset_t *, int);
-int	sigpause(int);
-int	sigpending(sigset_t *);
-int	sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict);
-int	sigrelse(int);
-void    (*sigset(int, void (*)(int)))(int); 
-int	sigsuspend(const sigset_t *);
-int	sigwait(const sigset_t * __restrict, int * __restrict);
-#ifndef _POSIX_C_SOURCE
-void	psignal(unsigned int, const char *);
-int	sigblock(int);
-int	sigreturn(struct sigcontext *);
-int	sigsetmask(int);
-int	sigvec(int, struct sigvec *, struct sigvec *);
-#endif	/* !_POSIX_C_SOURCE */
+int	kill __P((pid_t, int));
+int	sigaction __P((int, const struct sigaction *, struct sigaction *));
+int	sigaddset __P((sigset_t *, int));
+int	sigdelset __P((sigset_t *, int));
+int	sigemptyset __P((sigset_t *));
+int	sigfillset __P((sigset_t *));
+int	sigismember __P((const sigset_t *, int));
+int	sigpending __P((sigset_t *));
+int	sigprocmask __P((int, const sigset_t *, sigset_t *));
+int	sigsuspend __P((const sigset_t *));
+#ifndef _POSIX_SOURCE
+int	killpg __P((pid_t, int));
+int	sigblock __P((int));
+int	siginterrupt __P((int, int));
+int	sighold __P((int));
+int	sigrelse __P((int));
+int	sigpause __P((int));
+int	sigreturn __P((struct sigcontext *));
+int	sigsetmask __P((int));
+int	sigvec __P((int, struct sigvec *, struct sigvec *));
+void	psignal __P((unsigned int, const char *));
+#endif	/* !_POSIX_SOURCE */
+#endif	/* !_ANSI_SOURCE */
 __END_DECLS
 
 /* List definitions after function declarations, or Reiser cpp gets upset. */
@@ -116,6 +100,5 @@
 #define	sigemptyset(set)	(*(set) = 0, 0)
 #define	sigfillset(set)		(*(set) = ~(sigset_t)0, 0)
 #define	sigismember(set, signo)	((*(set) & (1 << ((signo) - 1))) != 0)
-#endif	/* !_ANSI_SOURCE */
 
 #endif	/* !_USER_SIGNAL_H */