summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/abort.c2
-rw-r--r--sysdeps/generic/socketbits.h33
-rw-r--r--sysdeps/libm-ieee754/e_sinhl.c4
-rw-r--r--sysdeps/mach/hurd/vdprintf.c2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/ioperm.c4
-rw-r--r--sysdeps/unix/sysv/linux/net/route.h2
-rw-r--r--sysdeps/unix/sysv/linux/socketbits.h6
-rw-r--r--sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/socket.S2
-rw-r--r--sysdeps/unix/sysv/linux/usleep.c6
10 files changed, 37 insertions, 26 deletions
diff --git a/sysdeps/generic/abort.c b/sysdeps/generic/abort.c
index 14c182b411..c1969f4d1f 100644
--- a/sysdeps/generic/abort.c
+++ b/sysdeps/generic/abort.c
@@ -74,7 +74,7 @@ abort (void)
       /* This stage is special: we must allow repeated calls of
 	 `abort' when a user defined handler for SIGABRT is installed.
 	 This is risky since the `raise' implementation might also
-	 fail but I don't see another possiblity.  */
+	 fail but I don't see another possibility.  */
       int save_stage = stage;
 
       stage = 0;
diff --git a/sysdeps/generic/socketbits.h b/sysdeps/generic/socketbits.h
index 770f011ffb..db1a0ac7ee 100644
--- a/sysdeps/generic/socketbits.h
+++ b/sysdeps/generic/socketbits.h
@@ -1,21 +1,21 @@
 /* System-specific socket constants and types.  Generic/4.3 BSD version.
-Copyright (C) 1991, 92, 94, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1991, 92, 94, 95, 96, 97 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
-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.
+   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.
 
-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.
+   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.
 
-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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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.  */
 
 #ifndef	_SOCKETBITS_H
 
@@ -33,12 +33,17 @@ enum __socket_type
 {
   SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
 				   byte streams.  */
+#define SOCK_STREAM SOCK_STREAM
   SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
 				   of fixed maximum length.  */
+#define SOCK_DGRAM SOCK_DGRAM
   SOCK_RAW = 3,			/* Raw protocol interface.  */
+#define SOCK_RAW SOCK_RAW
   SOCK_RDM = 4,			/* Reliably-delivered messages.  */
+#define SOCK_RDM SOCK_RDM
   SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
 				   datagrams of fixed maximum length.  */
+#define SOCK_SEQPACKET SOCK_SEQPACKET
 };
 
 /* Protocol families.  */
diff --git a/sysdeps/libm-ieee754/e_sinhl.c b/sysdeps/libm-ieee754/e_sinhl.c
index 2d98562f94..f9ccc6fa90 100644
--- a/sysdeps/libm-ieee754/e_sinhl.c
+++ b/sysdeps/libm-ieee754/e_sinhl.c
@@ -77,7 +77,7 @@ static long double one = 1.0, shuge = 1.0e4931L;
 	if (ix < 0x400c || (ix == 0x400c && i0 < 0xb17217f7))
 		return h*__ieee754_expl(fabsl(x));
 
-    /* |x| in [log(maxdouble), overflowthresold] */
+    /* |x| in [log(maxdouble), overflowthreshold] */
 	if (ix<0x400c || (ix == 0x400c && (i0 < 0xb174ddc0
 					   || (i0 == 0xb174ddc0
 					       && i1 <= 0x31aec0ea)))) {
@@ -86,6 +86,6 @@ static long double one = 1.0, shuge = 1.0e4931L;
 	    return t*w;
 	}
 
-    /* |x| > overflowthresold, sinhl(x) overflow */
+    /* |x| > overflowthreshold, sinhl(x) overflow */
 	return x*shuge;
 }
diff --git a/sysdeps/mach/hurd/vdprintf.c b/sysdeps/mach/hurd/vdprintf.c
index e14c295f3e..bf70de69a3 100644
--- a/sysdeps/mach/hurd/vdprintf.c
+++ b/sysdeps/mach/hurd/vdprintf.c
@@ -33,7 +33,7 @@ vdprintf (int d, const char *format, va_list arg)
   struct hurd_fd *fd;
 
   HURD_CRITICAL_BEGIN;
-  fd = _hurd_fd_get (fd);
+  fd = _hurd_fd_get (d);
   HURD_CRITICAL_END;
 
   if (!fd)
diff --git a/sysdeps/unix/sysv/linux/alpha/ioperm.c b/sysdeps/unix/sysv/linux/alpha/ioperm.c
index 488265a069..b39f39a0d7 100644
--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
+++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
@@ -67,8 +67,8 @@
 #define CIA_DENSE_MEM		(0xfffffc8600000000UL)
 
 #define T2_IO_BASE		(0xfffffc03a0000000UL)
-#define T2_SPARSE_BASE		(0xfffffc0200000000UL)
-#define T2_DENSE_BASE		(0xfffffc03c0000000UL)
+#define T2_SPARSE_MEM		(0xfffffc0200000000UL)
+#define T2_DENSE_MEM		(0xfffffc03c0000000UL)
 
 typedef enum {
   IOSYS_UNKNOWN, IOSYS_JENSEN, IOSYS_APECS, IOSYS_CIA, IOSYS_T2
diff --git a/sysdeps/unix/sysv/linux/net/route.h b/sysdeps/unix/sysv/linux/net/route.h
index 531b069d12..d60a3cabb5 100644
--- a/sysdeps/unix/sysv/linux/net/route.h
+++ b/sysdeps/unix/sysv/linux/net/route.h
@@ -77,7 +77,7 @@ struct rtentry
 #define RTF_NEXTHOP	0x8000		/* Non gateway route with nexthop.  */
 
 
-#define RTF_MAGIC	0x10000		/* Route added/deleted authomatically,
+#define RTF_MAGIC	0x10000		/* Route added/deleted automatically,
 					   when interface changes its state. */
 
 #define RTCF_VALVE	0x00200000
diff --git a/sysdeps/unix/sysv/linux/socketbits.h b/sysdeps/unix/sysv/linux/socketbits.h
index 3bb92ab733..e9c88758e5 100644
--- a/sysdeps/unix/sysv/linux/socketbits.h
+++ b/sysdeps/unix/sysv/linux/socketbits.h
@@ -33,15 +33,21 @@ enum __socket_type
 {
   SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
 				   byte streams.  */
+#define SOCK_STREAM SOCK_STREAM
   SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
 				   of fixed maximum length.  */
+#define SOCK_DGRAM SOCK_DGRAM
   SOCK_RAW = 3,			/* Raw protocol interface.  */
+#define SOCK_RAW SOCK_RAW
   SOCK_RDM = 4,			/* Reliably-delivered messages.  */
+#define SOCK_RDM SOCK_RDM
   SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
 				   datagrams of fixed maximum length.  */
+#define SOCK_SEQPACKET SOCK_SEQPACKET
   SOCK_PACKET = 10		/* Linux specific way of getting packets
 				   at the dev level.  For writing rarp and
 				   other similar things on the user level. */
+#define SOCK_PACKET SOCK_PACKET
 };
 
 /* Protocol families.  */
diff --git a/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S b/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S
index d0fe760270..4fea850ee3 100644
--- a/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S
+++ b/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S
@@ -99,7 +99,7 @@ ___syy:
 	ld	[%fp + REGWIN_SZ + 4],%o1         /* Load subcode */
 	ld      [%fp + REGWIN_SZ + 8],%o2         /* pointer to sigcontext */
 	call	%o4
-	ld      [%fp + REGWIN_SZ + 12],%o3        /* Address where signal ocurred */
+	ld      [%fp + REGWIN_SZ + 12],%o3        /* Address where signal occurred */
 
 	/* handler returned, restore state */
 	tst	%l0
diff --git a/sysdeps/unix/sysv/linux/sparc/socket.S b/sysdeps/unix/sysv/linux/sparc/socket.S
index f8075201db..24aba3fc74 100644
--- a/sysdeps/unix/sysv/linux/sparc/socket.S
+++ b/sysdeps/unix/sysv/linux/sparc/socket.S
@@ -24,7 +24,7 @@
 #define P2(a, b) a##b
 
 	.text
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
diff --git a/sysdeps/unix/sysv/linux/usleep.c b/sysdeps/unix/sysv/linux/usleep.c
index 9d36a90008..9265897053 100644
--- a/sysdeps/unix/sysv/linux/usleep.c
+++ b/sysdeps/unix/sysv/linux/usleep.c
@@ -1,5 +1,5 @@
 /* Implementation of the BSD usleep function using nanosleep.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,8 +24,8 @@
 void
 usleep (unsigned int useconds)
 {
-  struct timespec ts = { tv_sec: 0,
-			 tv_nsec: (long int) useconds * 1000ul };
+  struct timespec ts = { tv_sec: (long int) (useconds / 1000000),
+			 tv_nsec: (long int) (useconds % 1000000) * 1000ul };
 
   __nanosleep (&ts, NULL);
 }