From 6e946a0e7fa0fefab56082b7a9e8864059c63042 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sat, 1 Dec 2007 13:49:50 +0000 Subject: * include/cygwin/time.h (daylight): Declare as extern symbol referring _daylight variable. (timezone): Only define if __timezonefunc__ is undefined. --- winsup/cygwin/ChangeLog | 11 +++++++++++ winsup/cygwin/include/cygwin/time.h | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index dcad1367400..674f7293654 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,14 @@ +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 + + * include/cygwin/time.h: Only define timezone 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 95665c90071..0550f0aa354 100644 --- a/winsup/cygwin/include/cygwin/time.h +++ b/winsup/cygwin/include/cygwin/time.h @@ -26,11 +26,12 @@ time_t 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 /*__STRICT_ANSI__*/ -- cgit v1.2.1