Massive merge from trunk.

1 files changed, 17 insertions, 13 deletions

diff --git a/libc/signal/sigorset.c b/libc/signal/sigorset.c
index 017f3ba06..ffabf3704 100644
--- a/libc/signal/sigorset.c
+++ b/libc/signal/sigorset.c
@@ -2,19 +2,19 @@
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include <errno.h>
 #define __USE_GNU
@@ -23,13 +23,17 @@
 #include <stddef.h>
 
 /* Combine sets LEFT and RIGHT by logical OR and place result in DEST.  */
-int sigorset (sigset_t *dest, const sigset_t *left, const sigset_t *right)
+int
+sigorset (dest, left, right)
+     sigset_t *dest;
+     const sigset_t *left;
+     const sigset_t *right;
 {
-    if (dest == NULL || left == NULL || right == NULL)
+  if (dest == NULL || left == NULL || right == NULL)
     {
-	__set_errno (EINVAL);
-	return -1;
+      __set_errno (EINVAL);
+      return -1;
     }
 
-    return __sigorset (dest, left, right);
+  return __sigorset (dest, left, right);
 }