summaryrefslogtreecommitdiff
path: root/ghc/lib/std/cbits/timezone.h
diff options
context:
space:
mode:
authorrrt <unknown>2000-07-17 15:27:15 +0000
committerrrt <unknown>2000-07-17 15:27:15 +0000
commit11ca4ec6dd779bb62778a14ac85632356a1a01f2 (patch)
treecbef5ea1183278d9253270058838c13ea029e541 /ghc/lib/std/cbits/timezone.h
parente2b9618c869c3cb8e346f1426a84a7ad3bbd77df (diff)
downloadhaskell-11ca4ec6dd779bb62778a14ac85632356a1a01f2.tar.gz
[project @ 2000-07-17 15:27:15 by rrt]
Windows fixes and tidying up.
Diffstat (limited to 'ghc/lib/std/cbits/timezone.h')
-rw-r--r--ghc/lib/std/cbits/timezone.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/ghc/lib/std/cbits/timezone.h b/ghc/lib/std/cbits/timezone.h
index aa28ea69d1..f84c241fff 100644
--- a/ghc/lib/std/cbits/timezone.h
+++ b/ghc/lib/std/cbits/timezone.h
@@ -1,7 +1,7 @@
/*
* (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
*
- * $Id: timezone.h,v 1.9 1999/05/05 10:33:17 sof Exp $
+ * $Id: timezone.h,v 1.10 2000/07/17 15:27:15 rrt Exp $
*
* Time-zone support header
*/
@@ -79,15 +79,11 @@ extern char *tzname[2];
# endif /* ! HAVE_TZNAME */
/* Get the offset in secs from UTC, if (struct tm) doesn't supply it. */
-#ifdef mingw32_TARGET_OS
+#if defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS)
#define timezone _timezone
-#else
-# ifdef cygwin32_TARGET_OS
-# define timezone _timezone
-# endif
#endif
-#ifndef HAVE_TIMEZONE
+#if !defined(HAVE_TIMEZONE) && !defined(mingw32_TARGET_OS)
extern TYPE_TIMEZONE timezone;
#endif