* sysdeps/generic/bits/sigthread.h: Clean up conditionals.

	Declare pthread_sigmask.

	* csu/version.c: Add 2000 to copyright years.
	Remove Emacs local variables section.

diff --git a/ChangeLog b/ChangeLog
index 50259d1..9772517 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-03-28  Roland McGrath  <roland@baalperazim.frob.com>
+
+       * sysdeps/generic/bits/sigthread.h: Clean up conditionals.
+       Declare pthread_sigmask.
+
+       * csu/version.c: Add 2000 to copyright years.
+       Remove Emacs local variables section.
+
 2000-03-23  Bruno Haible  <haible@clisp.cons.org>
 
        * iconv/gconv_int.h (__gconv_transform_ucs2little_internal,

diff --git a/bits/sigthread.h b/bits/sigthread.h
index de6f2dc..6e23a2c 100644 (file)
--- a/bits/sigthread.h
+++ b/bits/sigthread.h
@@ -1,5 +1,5 @@
-/* Signal handling function for threaded programs.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+/* Signal handling function for threaded programs.  Generic version.
+   Copyright (C) 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,8 +17,19 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef _SIGNAL_H
-# error "Never include this file directly.  Use <signal.h> instead"
+#ifndef _BITS_SIGTHREAD_H
+#define _BITS_SIGTHREAD_H      1
+
+#if !defined _SIGNAL_H && !defined _PTHREAD_H
+# error "Never include this file directly.  Use <pthread.h> instead"
 #endif
 
-/* There are none available in this configuration.  */
+/* Modify the signal mask for the calling thread.  The arguments have the
+   same meaning as for sigprocmask; in fact, this and sigprocmask might be
+   the same function.  We declare this the same on all platforms, since it
+   doesn't use any thread-related types.  */
+extern int pthread_sigmask (int __how, __const __sigset_t *__newmask,
+                           __sigset_t *__oldmask) __THROW;
+
+
+#endif /* bits/sigthread.h */

diff --git a/sysdeps/generic/bits/sigthread.h b/sysdeps/generic/bits/sigthread.h
index de6f2dc..6e23a2c 100644 (file)
--- a/sysdeps/generic/bits/sigthread.h
+++ b/sysdeps/generic/bits/sigthread.h
@@ -1,5 +1,5 @@
-/* Signal handling function for threaded programs.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+/* Signal handling function for threaded programs.  Generic version.
+   Copyright (C) 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,8 +17,19 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef _SIGNAL_H
-# error "Never include this file directly.  Use <signal.h> instead"
+#ifndef _BITS_SIGTHREAD_H
+#define _BITS_SIGTHREAD_H      1
+
+#if !defined _SIGNAL_H && !defined _PTHREAD_H
+# error "Never include this file directly.  Use <pthread.h> instead"
 #endif
 
-/* There are none available in this configuration.  */
+/* Modify the signal mask for the calling thread.  The arguments have the
+   same meaning as for sigprocmask; in fact, this and sigprocmask might be
+   the same function.  We declare this the same on all platforms, since it
+   doesn't use any thread-related types.  */
+extern int pthread_sigmask (int __how, __const __sigset_t *__newmask,
+                           __sigset_t *__oldmask) __THROW;
+
+
+#endif /* bits/sigthread.h */