diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-11-07 01:35:04 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-11-07 01:35:04 +0000 |
commit | b57910379e9a0fa1c6985840bbbe19b30595e361 (patch) | |
tree | 9bf68210227e7cc5022fdefaa8510313b651e709 /time/time.h | |
parent | 2c6fe0bd3b270fc644dd4c773f2d47b93f404efe (diff) | |
download | glibc-b57910379e9a0fa1c6985840bbbe19b30595e361.tar.gz glibc-b57910379e9a0fa1c6985840bbbe19b30595e361.tar.xz glibc-b57910379e9a0fa1c6985840bbbe19b30595e361.zip |
update from 961105, second try cvs/libc-961107
Diffstat (limited to 'time/time.h')
-rw-r--r-- | time/time.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/time/time.h b/time/time.h index de7214ac52..935de80c7a 100644 --- a/time/time.h +++ b/time/time.h @@ -153,7 +153,7 @@ extern time_t __mktime_internal __P ((struct tm *__tp, extern size_t strftime __P ((char *__s, size_t __maxsize, __const char *__format, __const struct tm *__tp)); -#ifdef __USE_MISC +#ifdef __USE_XOPEN /* Parse S according to FORMAT and store binary time information in TP. The return value is a pointer to the first unparsed character in S. */ extern char *strptime __P ((__const char *__s, __const char *__fmt, @@ -232,10 +232,12 @@ extern long int __tzname_max __P ((void)); extern void tzset __P ((void)); #endif -#ifdef __USE_SVID +#if defined(__USE_SVID) || defined(__USE_XOPEN) extern int daylight; extern long int timezone; +#endif +#ifdef __USE_SVID /* Set the system time to *WHEN. This call is restricted to the superuser. */ extern int stime __P ((__const time_t *__when)); |