diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-07-04 10:43:29 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-07-04 10:43:29 +0000 |
| commit | c467d17e7c0aa05e3087c462954ee942a479c197 (patch) | |
| tree | 9e6ca3fb1cd03b78768e2ec36ff61a2a698fdd61 | |
| parent | 0d9cddc377a6594e2e970262491f3beeebd860dc (diff) | |
| download | cygnal-c467d17e7c0aa05e3087c462954ee942a479c197.tar.gz cygnal-c467d17e7c0aa05e3087c462954ee942a479c197.tar.bz2 cygnal-c467d17e7c0aa05e3087c462954ee942a479c197.zip | |
* times.cc: Define __timezonefunc__ before including time.h to protect
definition of timezone function.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/times.cc | 1 |
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> |