diff options
author | Yaakov Selkowitz <yselkowi@redhat.com> | 2016-03-15 01:23:09 +0300 |
---|---|---|
committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2016-03-18 05:09:10 +0300 |
commit | 43e5ee83fed23ecaf9826202c9ee6172fb7293d6 (patch) | |
tree | 55de77b928e7fc92fd24c33bf8554fc1a66bebc9 | |
parent | 6fe6a822ee64a63017a85bcc9006969e2d53a532 (diff) |
Feature test macros overhaul: time.h
Throughout, replace __STRICT_ANSI__ with the proper internal macros.
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
-rw-r--r-- | newlib/libc/include/time.h | 15 | ||||
-rw-r--r-- | winsup/cygwin/include/cygwin/time.h | 7 |
2 files changed, 17 insertions, 5 deletions
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h index b9d1f20aa..698ad6113 100644 --- a/newlib/libc/include/time.h +++ b/newlib/libc/include/time.h @@ -8,6 +8,7 @@ #define _TIME_H_ #include "_ansi.h" +#include <sys/cdefs.h> #include <sys/reent.h> #define __need_size_t @@ -76,11 +77,14 @@ _END_STD_C extern "C" { #endif -#ifndef __STRICT_ANSI__ +#if __XSI_VISIBLE char *_EXFUN(strptime, (const char *__restrict, const char *__restrict, struct tm *__restrict)); +#endif +#if __POSIX_VISIBLE _VOID _EXFUN(tzset, (_VOID)); +#endif _VOID _EXFUN(_tzset_r, (struct _reent *)); typedef struct __tzrule_struct @@ -106,6 +110,7 @@ __tzinfo_type *_EXFUN (__gettzinfo, (_VOID)); /* getdate functions */ #ifdef HAVE_GETDATE +#if __XSI_VISIBLE >= 4 #ifndef _REENT_ONLY #define getdate_err (*__getdate_err()) int *_EXFUN(__getdate_err,(_VOID)); @@ -121,21 +126,27 @@ struct tm * _EXFUN(getdate, (const char *)); 7 there is no line in the template that matches the input, 8 invalid input specification */ #endif /* !_REENT_ONLY */ +#endif /* __XSI_VISIBLE >= 4 */ +#if __GNU_VISIBLE /* getdate_r returns the error code as above */ int _EXFUN(getdate_r, (const char *, struct tm *)); +#endif /* __GNU_VISIBLE */ #endif /* HAVE_GETDATE */ /* defines for the opengroup specifications Derived from Issue 1 of the SVID. */ +#if __SVID_VISIBLE || __XSI_VISIBLE extern __IMPORT long _timezone; extern __IMPORT int _daylight; +#endif +#if __POSIX_VISIBLE extern __IMPORT char *_tzname[2]; /* POSIX defines the external tzname being defined in time.h */ #ifndef tzname #define tzname _tzname #endif -#endif /* !__STRICT_ANSI__ */ +#endif /* __POSIX_VISIBLE */ #ifdef __cplusplus } diff --git a/winsup/cygwin/include/cygwin/time.h b/winsup/cygwin/include/cygwin/time.h index 6a82ae657..1f8a98948 100644 --- a/winsup/cygwin/include/cygwin/time.h +++ b/winsup/cygwin/include/cygwin/time.h @@ -24,17 +24,18 @@ time_t __cdecl timegm (struct tm *); #define TIMER_RELTIME 0 /* For compatibility with HP/UX, Solaris, others? */ -#ifndef __STRICT_ANSI__ - +#if __SVID_VISIBLE extern int stime (const time_t *); +#endif +#if __SVID_VISIBLE || __XSI_VISIBLE extern int daylight __asm__ (_SYMSTR (_daylight)); #ifndef __timezonefunc__ extern long timezone __asm__ (_SYMSTR (_timezone)); #endif -#endif /*__STRICT_ANSI__*/ +#endif /* __SVID_VISIBLE || __XSI_VISIBLE */ #ifdef __cplusplus } |