From 817f516201964f5e9a84b74e8eaeaa2e7b4cda83 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Fri, 5 Feb 1999 14:34:05 +0000
Subject: [PATCH] [project @ 1999-02-05 14:34:02 by sof] 'errors' caught by
 -fwarn-type-defaults

---
 ghc/lib/concurrent/Merge.lhs |    1 +
 ghc/lib/misc/SocketPrim.lhs  |    6 +++---
 ghc/lib/std/CPUTime.lhs      |    2 +-
 ghc/lib/std/cbits/timezone.h |    4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ghc/lib/concurrent/Merge.lhs b/ghc/lib/concurrent/Merge.lhs
index 706f0e6..73cacc5 100644
--- a/ghc/lib/concurrent/Merge.lhs
+++ b/ghc/lib/concurrent/Merge.lhs
@@ -18,6 +18,7 @@ import Semaphore
 import PrelConc
 import PrelIOBase
 
+max_buff_size :: Int
 max_buff_size = 1
 
 mergeIO :: [a] -> [a] -> IO [a]
diff --git a/ghc/lib/misc/SocketPrim.lhs b/ghc/lib/misc/SocketPrim.lhs
index 93a6707..8c05fbe 100644
--- a/ghc/lib/misc/SocketPrim.lhs
+++ b/ghc/lib/misc/SocketPrim.lhs
@@ -368,7 +368,7 @@ accept sock@(MkSocket s family stype protocol status) = do
 	 show currentStatus))
    else do
      (ptr, sz) <- allocSockAddr family
-     int_star <- stToIO (newIntArray (0,1))
+     int_star <- stToIO (newIntArray ((0::Int),1))
      stToIO (writeIntArray int_star 0 sz)
      new_sock <- _ccall_ acceptSocket s ptr int_star
      case (new_sock::Int) of
@@ -511,7 +511,7 @@ getPeerName   :: Socket -> IO SockAddr
 
 getPeerName (MkSocket s family _ _ _) = do
  (ptr, a_sz) <- allocSockAddr family
- int_star <- stToIO (newIntArray (0,1))
+ int_star <- stToIO (newIntArray ((0::Int),1))
  stToIO (writeIntArray int_star 0 a_sz)
  status <- _ccall_ getPeerName s ptr int_star
  case (status::Int) of
@@ -524,7 +524,7 @@ getSocketName :: Socket -> IO SockAddr
 
 getSocketName (MkSocket s family _ _ _) = do
  (ptr, a_sz) <- allocSockAddr family
- int_star <- stToIO (newIntArray (0,1))
+ int_star <- stToIO (newIntArray ((0::Int),1))
  stToIO (writeIntArray int_star 0 a_sz)
  rc <- _ccall_ getSockName s ptr int_star
  case (rc::Int) of
diff --git a/ghc/lib/std/CPUTime.lhs b/ghc/lib/std/CPUTime.lhs
index e02a29e..a90c8ae 100644
--- a/ghc/lib/std/CPUTime.lhs
+++ b/ghc/lib/std/CPUTime.lhs
@@ -72,7 +72,7 @@ getCPUTime = do
 
 getCPUTime :: IO Integer
 getCPUTime = 
-    stToIO (newIntArray (0,3))		>>= \ marr ->
+    stToIO (newIntArray ((0::Int),3))	>>= \ marr ->
     stToIO (unsafeFreezeByteArray marr)	>>= \ barr@(ByteArray _ frozen#) ->
     _ccall_ getCPUTime barr		>>= \ ptr ->
     if (ptr::Addr) /= ``NULL'' then
diff --git a/ghc/lib/std/cbits/timezone.h b/ghc/lib/std/cbits/timezone.h
index 2bfe281..5050342 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.3 1998/12/02 13:28:01 simonm Exp $
+ * $Id: timezone.h,v 1.4 1999/02/05 14:34:05 sof Exp $
  *
  * Time-zone support header
  */
@@ -57,7 +57,9 @@ extern char *tzname[2];
 # endif /* ! HAVE_TZNAME */
 /* Get the offset in secs from UTC, if (struct tm) doesn't supply it. */
 
+#ifndef cygwin32_TARGET_OS
 extern TYPE_TIMEZONE timezone;
+#endif
 
 # if HAVE_ALTZONE
 extern time_t altzone;
-- 
1.7.10.4