* times.cc: Define __timezonefunc__ before including time.h to protect

	definition of timezone function.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3707a8a..1aa1eaf 100644 (file)
--- 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 5fb2cf9..336a649 100644 (file)
--- 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>