From a7b76a4eb3910bf937f95e618aec6a4780806c2a Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sat, 1 Dec 2007 13:49:45 +0000 Subject: [PATCH] * include/cygwin/time.h (daylight): Declare as extern symbol referring _daylight variable. (timezone): Only define if __timezonefunc__ is undefined. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/include/cygwin/time.h | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 5936bdfc3..375bbbf0c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2007-12-01 Corinna Vinschen + + * include/cygwin/time.h (daylight): Declare as extern symbol referring + _daylight variable. + (timezone): Only define if __timezonefunc__ is undefined. + 2007-12-01 Corinna Vinschen Brian Dessent diff --git a/winsup/cygwin/include/cygwin/time.h b/winsup/cygwin/include/cygwin/time.h index 50ec87dac..c51f48388 100644 --- a/winsup/cygwin/include/cygwin/time.h +++ b/winsup/cygwin/include/cygwin/time.h @@ -25,11 +25,13 @@ time_t __cdecl timegm (struct tm *); #define TIMER_RELTIME 0 /* For compatibility with HP/UX, Solaris, others? */ #ifndef __STRICT_ANSI__ -# ifndef daylight -# define daylight _daylight -# endif +extern int daylight __asm__ ("__daylight"); + +#ifndef __timezonefunc__ extern long timezone __asm__ ("__timezone"); +#endif +#endif #endif /*__STRICT_ANSI__*/