diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-01-25 02:36:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-01-25 02:36:37 +0000 |
| commit | 5b82669229ad4e39c6ba1467045a2d81d44b8ccc (patch) | |
| tree | ae62374b844b2c46f3db610c621aed0312a7039e /sysdeps/unix/sysv/linux | |
| parent | 9d187dd4ad11f857386881db032d7e71ad26f47c (diff) | |
| download | glibc-5b82669229ad4e39c6ba1467045a2d81d44b8ccc.tar.gz glibc-5b82669229ad4e39c6ba1467045a2d81d44b8ccc.tar.xz glibc-5b82669229ad4e39c6ba1467045a2d81d44b8ccc.zip | |
update from main archive 970124 cvs/libc-970125
Sat Jan 25 02:05:19 1997 Eirik Fuller <eirik@netcom.com> * sysdeps/unix/sysv/linux/alpha/ioperm.c: Rename T2_SPARSE_BASE and T2_DENSE_BASE to T2_SPARSE_MEM and T2_DENSE_MEM resp. Thu Jan 23 11:13:46 1997 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/usleep.c: Normalize the time specification. Fri Jan 24 14:33:45 1997 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/socketbits.h: Also make SOCK_* constants available as macros so that #ifdef works. * sysdeps/unix/sysv/linux/socketbits.h: Likewise. 1997-01-23 Paul Eggert <eggert@twinsun.com> * login/utmp_db.c, manual/time.texi, shlib-versions, sunrpc/rpc/svc.h, sunrpc/rpcsvc/sm_inter.x, sysdeps/generic/abort.c, sysdeps/libm-ieee754/e_sinhl.c, sysdeps/unix/sysv/linux/net/route.h, sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S: Spell fixes.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/ioperm.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/net/route.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/socketbits.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/socket.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/usleep.c | 6 |
6 files changed, 14 insertions, 8 deletions
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); } |