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 /dirent | |
| parent | 8d57beeab10d2afd72e2e3bc6b1ad4695b791955 (diff) | |
| download | glibc-9d187dd4ad11f857386881db032d7e71ad26f47c.tar.gz glibc-9d187dd4ad11f857386881db032d7e71ad26f47c.tar.xz glibc-9d187dd4ad11f857386881db032d7e71ad26f47c.zip | |
update from main archive 970122 cvs/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 'dirent')
| -rw-r--r-- | dirent/dirent.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dirent/dirent.h b/dirent/dirent.h index ac85b5f1c6..b5568b3c5a 100644 --- a/dirent/dirent.h +++ b/dirent/dirent.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 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 @@ -116,14 +116,14 @@ extern int closedir __P ((DIR *__dirp)); extern struct dirent *__readdir __P ((DIR *__dirp)); extern struct dirent *readdir __P ((DIR *__dirp)); -#ifdef __USE_REENTRANT +#if defined __USE_POSIX || defined __USE_REENTRANT /* Reentrant version of `readdir'. Return in RESULT a pointer to the next entry. */ extern int __readdir_r __P ((DIR *__dirp, struct dirent *entry, struct dirent **result)); extern int readdir_r __P ((DIR *__dirp, struct dirent *entry, struct dirent **result)); -#endif +#endif /* POSIX or reentrant */ /* Rewind DIRP to the beginning of the directory. */ extern void rewinddir __P ((DIR *__dirp)); |