[project @ 1999-09-12 14:26:32 by sof]

Let's try again - added get_ZONE(), which retrieves current
timezone string. Need to do this since cygwin doesn't initialise
its tzname[] properly (=> need to call tzset() explicitly.)

diff --git a/ghc/lib/std/cbits/stgio.h b/ghc/lib/std/cbits/stgio.h
index 9631807..ff0e82d 100644 (file)
--- a/ghc/lib/std/cbits/stgio.h
+++ b/ghc/lib/std/cbits/stgio.h
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: stgio.h,v 1.10 1999/02/04 12:13:16 sof Exp $
+ * $Id: stgio.h,v 1.11 1999/09/12 14:26:32 sof Exp $
  *
  * Helper code for GHC's IO subsystem.
  */
@@ -214,6 +214,7 @@ StgInt prim_SETZONE ( StgAddr, StgAddr );
 StgInt sizeof_word      ( void ); 
 StgInt sizeof_struct_tm        ( void );
 StgInt sizeof_time_t    ( void );
+char*  get_ZONE     ( StgAddr );
 
 /* toLocalTime.c */
 StgAddr toLocalTime (StgInt, StgByteArray, StgByteArray);

diff --git a/ghc/lib/std/cbits/timezone.c b/ghc/lib/std/cbits/timezone.c
index 1fdbcfe..b03f2df 100644 (file)
--- a/ghc/lib/std/cbits/timezone.c
+++ b/ghc/lib/std/cbits/timezone.c
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: timezone.c,v 1.3 1999/09/12 14:23:52 sof Exp $
+ * $Id: timezone.c,v 1.4 1999/09/12 14:26:32 sof Exp $
  *
  * Timezone Runtime Support
  */
@@ -40,6 +40,7 @@ get_ZONE (StgAddr x)
    * unless tzset() is called, so better do it here.
    */
   tzset();
+
 #endif
   return (ZONE(x));
 }