diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-01-24 02:23:54 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-01-24 02:23:54 +0000 |
| commit | 9d187dd4ad11f857386881db032d7e71ad26f47c (patch) | |
| tree | dacaae8468e5cf69ffda0ef4b299472f429add8a /string/string.h | |
| parent | 8d57beeab10d2afd72e2e3bc6b1ad4695b791955 (diff) | |
update from main archive 970122cvs/libc-970124
1997-01-23 Paul Eggert <eggert@twinsun.com>
* mktime.c (mktime): Invoke __tzset, not __tzset_internal, to set tz,
so that tzname is set as POSIX requires.
Fri Jan 24 02:49:18 1997 Ulrich Drepper <drepper@cygnus.com>
* dirent/dirent.h: Declare readdir_r also when __USE_POSIX.
* grp/grp.h: Declare *_r functions also when __USE_POSIX.
* pwd/pwd.h: Likewise.
* time/time.h: Likewise.
* posix/unistd.h: Declare ttyname_r also when __USE_POSIX.
* string/string.h: Declare strtok_r also when __USE_POSIX.
* stdio-common/bug7.c: Use tmpnam to generate names for test files.
* stdio-common/tmpnam.c: Update copyright.
* stdio-common/tmpnam_r.c: Likewise.
* sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h: Protect
against multiple inclusion. Include <termbits.h>.
* sysdeps/unix/sysv/linux/sys/kernel_termios.h: Likewise.
* sysdeps/unix/sysv/linux/net/if.h: Update according to recent
kernel headers. Patch by Philip Blundell <pjb27@cam.ac.uk>.
Thu Jan 23 17:42:00 1997 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/sparc/clone.S: Correct author attribution.
* sysdeps/unix/sysv/linux/net/if_arp (MAX_ADDR_LEN): Add definition.
Thu Jan 23 14:20:34 1997 Ulrich Drepper <drepper@cygnus.com>
* time/tzfile.c (__tzfile_read): Don't allow arbitrary files to be
read when running a setuid program.
Diffstat (limited to 'string/string.h')
| -rw-r--r-- | string/string.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/string/string.h b/string/string.h index 4560f612b5..99fb2d83aa 100644 --- a/string/string.h +++ b/string/string.h @@ -138,12 +138,14 @@ extern char *strstr __P ((__const char *__haystack, __const char *__needle)); /* Divide S into tokens separated by characters in DELIM. */ extern char *strtok __P ((char *__s, __const char *__delim)); -#ifdef __USE_GNU +#if defined __USE_POSIX || defined __USE_REENTRANT /* Divide S into tokens separated by characters in DELIM. Information passed between calls are stored in SAVE_PTR. */ extern char *strtok_r __P ((char *__s, __const char *__delim, char **__save_ptr)); +#endif +#ifdef __USE_GNU /* Find the first occurrence of NEEDLE in HAYSTACK. NEEDLE is NEEDLELEN bytes long; HAYSTACK is HAYSTACKLEN bytes long. */ |