[project @ 2005-04-07 23:36:48 by sof]

[haskell-directory.git] / System / Time.hsc

diff --git a/System/Time.hsc b/System/Time.hsc
index 6b59353..74293ee 100644 (file)
--- a/System/Time.hsc
+++ b/System/Time.hsc
@@ -104,7 +104,7 @@ module System.Time
 
 #ifdef __NHC__
 #include <time.h>
-#  ifdef __sun
+#  if defined(__sun) || defined(__CYGWIN32__)
 #    define HAVE_TZNAME 1
 #  else
 #    define HAVE_TM_ZONE 1
@@ -353,10 +353,10 @@ gmtoff x    = (#peek struct tm,tm_gmtoff) x
 
 #else /* ! HAVE_TM_ZONE */
 # if HAVE_TZNAME || defined(_WIN32)
-#  if cygwin32_TARGET_OS
+#  if cygwin32_HOST_OS
 #   define tzname _tzname
 #  endif
-#  ifndef mingw32_TARGET_OS
+#  ifndef mingw32_HOST_OS
 foreign import ccall unsafe "time.h &tzname" tzname :: Ptr (Ptr CChar)
 #  else
 foreign import ccall unsafe "__hscore_timezone" timezone :: Ptr CLong
@@ -381,7 +381,7 @@ gmtoff x = do
   return (-fromIntegral (realToInteger tz))
 # else /* ! HAVE_DECL_ALTZONE */
 
-#if !defined(mingw32_TARGET_OS)
+#if !defined(mingw32_HOST_OS)
 foreign import ccall "time.h &timezone" timezone :: Ptr CLong
 #endif
 
@@ -643,7 +643,6 @@ show2' x
  where x' = x `rem` 100
 
 show3 x = show (x `quot` 100) ++ show2 (x `rem` 100)
- where x' = x `rem` 1000
 
 to12 :: Int -> Int
 to12 h = let h' = h `mod` 12 in if h' == 0 then 12 else h'
@@ -745,7 +744,7 @@ foreign import ccall unsafe "time.h gettimeofday"
 
 #if HAVE_FTIME
 type CTimeB = ()
-#ifndef mingw32_TARGET_OS
+#ifndef mingw32_HOST_OS
 foreign import ccall unsafe "time.h ftime" ftime :: Ptr CTimeB -> IO CInt
 #else
 foreign import ccall unsafe "time.h ftime" ftime :: Ptr CTimeB -> IO ()