diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1996-10-02 01:40:17 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1996-10-02 01:40:17 +0000 |
| commit | a68b0d31a37a86785b3dbeeee3fad96ee71fadcd (patch) | |
| tree | 61537b1f028002a9e6e0f5354fced6128bda8b9c /sysdeps/generic | |
| parent | 2d07133b507b13d4a5ed6dc250f4345c8a26942a (diff) | |
| download | glibc-a68b0d31a37a86785b3dbeeee3fad96ee71fadcd.tar.gz glibc-a68b0d31a37a86785b3dbeeee3fad96ee71fadcd.tar.xz glibc-a68b0d31a37a86785b3dbeeee3fad96ee71fadcd.zip | |
update from main archive 961001
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/gnu/types.h | 1 | ||||
| -rw-r--r-- | sysdeps/generic/machine-gmon.h | 2 | ||||
| -rw-r--r-- | sysdeps/generic/pty.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/strtok.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/strtok_r.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/generic/gnu/types.h b/sysdeps/generic/gnu/types.h index 614252aaac..f42fb7f544 100644 --- a/sysdeps/generic/gnu/types.h +++ b/sysdeps/generic/gnu/types.h @@ -57,6 +57,7 @@ typedef long int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ +typedef long int __key_t; /* Type of an IPC key */ /* fd_set for select. */ diff --git a/sysdeps/generic/machine-gmon.h b/sysdeps/generic/machine-gmon.h index 43bf62d663..31f852dece 100644 --- a/sysdeps/generic/machine-gmon.h +++ b/sysdeps/generic/machine-gmon.h @@ -41,7 +41,7 @@ weak_alias (_mcount, mcount) static void mcount_internal (u_long frompc, u_long selfpc); #define _MCOUNT_DECL(frompc, selfpc) \ -static inline void mcount_internal (frompc, selfpc) +static inline void mcount_internal (u_long frompc, u_long selfpc) #define MCOUNT \ void _mcount (void) \ diff --git a/sysdeps/generic/pty.c b/sysdeps/generic/pty.c index 6995417d3a..8df8aba4ba 100644 --- a/sysdeps/generic/pty.c +++ b/sysdeps/generic/pty.c @@ -47,6 +47,7 @@ static char sccsid[] = "@(#)pty.c 8.1 (Berkeley) 6/4/93"; #include <string.h> #include <grp.h> #include <pty.h> +#include <utmp.h> int openpty(amaster, aslave, name, termp, winp) @@ -106,7 +107,6 @@ forkpty(amaster, name, termp, winp) struct termios *termp; struct winsize *winp; { - extern int login_tty __P ((int fd)); int master, slave, pid; if (openpty(&master, &slave, name, termp, winp) == -1) diff --git a/sysdeps/generic/strtok.c b/sysdeps/generic/strtok.c index cb30619a43..4f89efa6f0 100644 --- a/sysdeps/generic/strtok.c +++ b/sysdeps/generic/strtok.c @@ -53,7 +53,7 @@ strtok (s, delim) s = strpbrk (token, delim); if (s == NULL) /* This token finishes the string. */ - olds = NULL; + olds = strchr (token, '\0'); else { /* Terminate the token and make OLDS point past it. */ diff --git a/sysdeps/generic/strtok_r.c b/sysdeps/generic/strtok_r.c index 488d3eacfe..870fb274eb 100644 --- a/sysdeps/generic/strtok_r.c +++ b/sysdeps/generic/strtok_r.c @@ -54,7 +54,7 @@ strtok_r (s, delim, save_ptr) s = strpbrk (token, delim); if (s == NULL) /* This token finishes the string. */ - *save_ptr = NULL; + *save_ptr = strchr (token, '\0'); else { /* Terminate the token and make *SAVE_PTR point past it. */ |