summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/times.cc1
2 files changed, 6 insertions, 0 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3707a8a51..1aa1eafba 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2007-07-04 Corinna Vinschen <corinna@vinschen.de>
+ * times.cc: Define __timezonefunc__ before including time.h to protect
+ definition of timezone function.
+
+2007-07-04 Corinna Vinschen <corinna@vinschen.de>
+
* include/cygwin/time.h: Switch to timezone variable by default. Add
comment.
diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
index 5fb2cf997..336a649da 100644
--- a/winsup/cygwin/times.cc
+++ b/winsup/cygwin/times.cc
@@ -10,6 +10,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
#include "winsup.h"
+#define __timezonefunc__
#include <time.h>
#include <sys/times.h>
#include <sys/timeb.h>