projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-04-24 16:31:37 by simonmar]
[ghc-base.git]
/
System
/
Time.hsc
diff --git
a/System/Time.hsc
b/System/Time.hsc
index
b281f6d
..
4db1d61
100644
(file)
--- a/
System/Time.hsc
+++ b/
System/Time.hsc
@@
-1,5
+1,5
@@
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---
+-- |
-- Module : System.Time
-- Copyright : (c) The University of Glasgow 2001
-- License : BSD-style (see the file libraries/core/LICENSE)
-- Module : System.Time
-- Copyright : (c) The University of Glasgow 2001
-- License : BSD-style (see the file libraries/core/LICENSE)
@@
-8,7
+8,7
@@
-- Stability : provisional
-- Portability : portable
--
-- Stability : provisional
-- Portability : portable
--
--- $Id: Time.hsc,v 1.10 2002/03/19 10:59:01 simonmar Exp $
+-- $Id: Time.hsc,v 1.12 2002/04/24 16:31:45 simonmar Exp $
--
-- The standard Time library.
--
--
-- The standard Time library.
--
@@
-317,7
+317,8
@@
gmtoff x = (#peek struct tm,tm_gmtoff) x
# define tzname _tzname
# endif
# ifndef mingw32_TARGET_OS
# define tzname _tzname
# endif
# ifndef mingw32_TARGET_OS
-foreign import ccall "&tzname" :: Ptr (Ptr CChar)
+foreign import ccall unsafe "&tzname" tzname :: Ptr (Ptr CChar)
+foreign import ccall unsafe "timezone" timezone :: Ptr CLong
# else
foreign import ccall unsafe "__hscore_timezone" timezone :: Ptr CLong
foreign import ccall unsafe "__hscore_tzname" tzname :: Ptr (Ptr CChar)
# else
foreign import ccall unsafe "__hscore_timezone" timezone :: Ptr CLong
foreign import ccall unsafe "__hscore_tzname" tzname :: Ptr (Ptr CChar)
@@
-331,7
+332,7
@@
zone x = do
# endif /* ! HAVE_TZNAME */
-- Get the offset in secs from UTC, if (struct tm) doesn't supply it. */
# endif /* ! HAVE_TZNAME */
-- Get the offset in secs from UTC, if (struct tm) doesn't supply it. */
-#if defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS)
+#if defined(mingw32_TARGET_OS)
#define timezone _timezone
#endif
#define timezone _timezone
#endif