aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/include/cygwin/time.h8
2 files changed, 11 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5936bdf..375bbbf 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,4 +1,10 @@
2007-12-01 Corinna Vinschen <corinna@vinschen.de>
+
+ * include/cygwin/time.h (daylight): Declare as extern symbol referring
+ _daylight variable.
+ (timezone): Only define if __timezonefunc__ is undefined.
+
+2007-12-01 Corinna Vinschen <corinna@vinschen.de>
Brian Dessent <brian@dessent.net>
* Makefile.in (OBSOLETE_FUNCTIONS): Add timezone.
diff --git a/winsup/cygwin/include/cygwin/time.h b/winsup/cygwin/include/cygwin/time.h
index 50ec87d..c51f483 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__*/