--- a/gameServer/NetRoutines.hs	Thu Sep 03 10:02:50 2009 +0000
+++ b/gameServer/NetRoutines.hs	Fri Sep 04 07:04:27 2009 +0000
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, PatternSignatures #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 module NetRoutines where
 
 import Network
@@ -7,11 +7,7 @@
 import Control.Concurrent
 import Control.Concurrent.Chan
 import Control.Concurrent.STM
-#if defined(NEW_EXCEPTIONS)
-import qualified Control.OldException as Exception
-#else
 import qualified Control.Exception as Exception
-#endif
 import Data.Time
 -----------------------------
 import CoreTypes
@@ -21,7 +17,7 @@
 acceptLoop :: Socket -> Chan CoreMessage -> Int -> IO ()
 acceptLoop servSock coreChan clientCounter = do
 	Exception.handle
-		(\(_ :: Exception.Exception) -> putStrLn "exception on connect") $
+		(\(_ :: Exception.IOException) -> putStrLn "exception on connect") $
 		do
 		(socket, sockAddr) <- Network.Socket.accept servSock