From: lewie <unknown>
Date: Sat, 7 Apr 2001 14:58:44 +0000 (+0000)
Subject: [project @ 2001-04-07 14:58:44 by lewie]
X-Git-Tag: Approximately_9120_patches~2180
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b4926eb58375fd7bed82379dff88603b79dd1d03;hp=62cfe85aeb765dc11503b26daadf42de54298850;p=ghc-hetmet.git

[project @ 2001-04-07 14:58:44 by lewie]
Sigh... the moving of the structs..  `struct tm' is only in <time.h> on
RedHat 7.1/whatever-version-of-glibc-or-whatever-that-implies.  The following
patch works on RH 6.2, RH 7.0 and RH 7.1.  Your mileage shouldn't vary,
but you know how these things go..
---

diff --git a/ghc/lib/std/Time.hsc b/ghc/lib/std/Time.hsc
index 1ed8a11..d96db3e 100644
--- a/ghc/lib/std/Time.hsc
+++ b/ghc/lib/std/Time.hsc
@@ -3,7 +3,7 @@
 -- to compile on sparc-solaris.  Blargh.
 
 -- -----------------------------------------------------------------------------
--- $Id: Time.hsc,v 1.10 2001/02/28 00:01:03 qrczak Exp $
+-- $Id: Time.hsc,v 1.11 2001/04/07 14:58:44 lewie Exp $
 --
 -- (c) The University of Glasgow, 1995-2001
 --
@@ -100,7 +100,9 @@ module Time
 #  define POSIX_4D9 1
 #  include <sys/timers.h>
 # endif
-#elif defined(HAVE_TIME_H)
+#endif
+
+#if defined(HAVE_TIME_H)
 # include <time.h>
 #endif