From c467d17e7c0aa05e3087c462954ee942a479c197 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 4 Jul 2007 10:43:29 +0000 Subject: [PATCH] * times.cc: Define __timezonefunc__ before including time.h to protect definition of timezone function. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/times.cc | 1 + 2 files changed, 6 insertions(+) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 3707a8a51..1aa1eafba 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2007-07-04 Corinna Vinschen + + * times.cc: Define __timezonefunc__ before including time.h to protect + definition of timezone function. + 2007-07-04 Corinna Vinschen * include/cygwin/time.h: Switch to timezone variable by default. Add 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 #include #include