summaryrefslogtreecommitdiff
path: root/time/time.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-01-24 02:23:54 +0000
committerUlrich Drepper <drepper@redhat.com>1997-01-24 02:23:54 +0000
commit9d187dd4ad11f857386881db032d7e71ad26f47c (patch)
treedacaae8468e5cf69ffda0ef4b299472f429add8a /time/time.h
parent8d57beeab10d2afd72e2e3bc6b1ad4695b791955 (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 'time/time.h')
-rw-r--r--time/time.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/time/time.h b/time/time.h
index d12236fdf2..681b6007d8 100644
--- a/time/time.h
+++ b/time/time.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
@@ -171,7 +171,7 @@ extern struct tm *gmtime __P ((__const time_t *__timer));
of *TIMER in the local timezone. */
extern struct tm *localtime __P ((__const time_t *__timer));
-#ifdef __USE_REENTRANT
+#if defined __USE_POSIX || defined __USE_REENTRANT
/* Return the `struct tm' representation of *TIMER in UTC,
using *TP to store the result. */
extern struct tm *__gmtime_r __P ((__const time_t *__timer,
@@ -185,7 +185,7 @@ extern struct tm *__localtime_r __P ((__const time_t *__timer,
struct tm *__tp));
extern struct tm *localtime_r __P ((__const time_t *__timer,
struct tm *__tp));
-#endif /* reentrant */
+#endif /* POSIX or reentrant */
/* Compute the `struct tm' representation of *T,
offset OFFSET seconds east of UTC,
@@ -201,7 +201,7 @@ extern char *asctime __P ((__const struct tm *__tp));
/* Equivalent to `asctime (localtime (timer))'. */
extern char *ctime __P ((__const time_t *__timer));
-#ifdef __USE_REENTRANT
+#if defined __USE_POSIX || defined __USE_REENTRANT
/* Reentrant versions of the above functions. */
/* Return in BUF a string of the form "Day Mon dd hh:mm:ss yyyy\n"
@@ -211,7 +211,7 @@ extern char *asctime_r __P ((__const struct tm *__tp, char *__buf));
/* Equivalent to `asctime_r (localtime_r (timer, *TMP*), buf)'. */
extern char *ctime_r __P ((__const time_t *__timer, char *__buf));
-#endif /* reentrant */
+#endif /* POSIX or reentrant */
/* Defined in localtime.c. */