diff options
author | David Terei <davidterei@gmail.com> | 2011-10-25 20:43:23 -0700 |
---|---|---|
committer | David Terei <davidterei@gmail.com> | 2011-10-25 21:40:50 -0700 |
commit | 378dd2968d07b3780a2944bf91e3228671b51868 (patch) | |
tree | 1ee340dc24967b112afb7d7bf2a065d3b2753238 /libraries/base/System | |
parent | c9dceb6d3b3ac855d97db8957dcf181658eaf7ae (diff) | |
download | haskell-378dd2968d07b3780a2944bf91e3228671b51868.tar.gz |
Update base for latest Safe Haskell.
Diffstat (limited to 'libraries/base/System')
-rw-r--r-- | libraries/base/System/CPUTime.hsc | 1 | ||||
-rw-r--r-- | libraries/base/System/Console/GetOpt.hs | 2 | ||||
-rw-r--r-- | libraries/base/System/Environment.hs | 1 | ||||
-rw-r--r-- | libraries/base/System/Exit.hs | 1 | ||||
-rw-r--r-- | libraries/base/System/IO.hs | 1 | ||||
-rw-r--r-- | libraries/base/System/IO/Error.hs | 1 | ||||
-rw-r--r-- | libraries/base/System/Info.hs | 1 | ||||
-rw-r--r-- | libraries/base/System/Mem.hs | 2 | ||||
-rw-r--r-- | libraries/base/System/Mem/StableName.hs | 1 | ||||
-rw-r--r-- | libraries/base/System/Mem/Weak.hs | 1 | ||||
-rw-r--r-- | libraries/base/System/Posix/Internals.hs | 1 | ||||
-rw-r--r-- | libraries/base/System/Posix/Internals.hs-boot | 1 | ||||
-rw-r--r-- | libraries/base/System/Timeout.hs | 1 |
13 files changed, 14 insertions, 1 deletions
diff --git a/libraries/base/System/CPUTime.hsc b/libraries/base/System/CPUTime.hsc index 61ce09fd05..0b56329f38 100644 --- a/libraries/base/System/CPUTime.hsc +++ b/libraries/base/System/CPUTime.hsc @@ -185,3 +185,4 @@ clockTicks = foreign import ccall unsafe sysconf :: CInt -> IO CLong #endif #endif /* __GLASGOW_HASKELL__ */ + diff --git a/libraries/base/System/Console/GetOpt.hs b/libraries/base/System/Console/GetOpt.hs index d5a32f395f..1ea082963d 100644 --- a/libraries/base/System/Console/GetOpt.hs +++ b/libraries/base/System/Console/GetOpt.hs @@ -1,4 +1,5 @@ {-# LANGUAGE Safe #-} + ----------------------------------------------------------------------------- -- | -- Module : System.Console.GetOpt @@ -392,3 +393,4 @@ processing to perform actions of the chosen monad, e.g. printing help or version messages, checking that file arguments exist, etc. -} + diff --git a/libraries/base/System/Environment.hs b/libraries/base/System/Environment.hs index e185575147..a9413d1416 100644 --- a/libraries/base/System/Environment.hs +++ b/libraries/base/System/Environment.hs @@ -336,3 +336,4 @@ divvy str = (xs,[]) -> (xs,[]) -- don't barf (like Posix.getEnvironment) (name,_:value) -> (name,value) #endif /* __GLASGOW_HASKELL__ */ + diff --git a/libraries/base/System/Exit.hs b/libraries/base/System/Exit.hs index 9a9ed00045..2f63024b18 100644 --- a/libraries/base/System/Exit.hs +++ b/libraries/base/System/Exit.hs @@ -92,3 +92,4 @@ exitFailure = exitWith (ExitFailure 1) -- successfully. exitSuccess :: IO a exitSuccess = exitWith ExitSuccess + diff --git a/libraries/base/System/IO.hs b/libraries/base/System/IO.hs index 768d557653..9cd96eb0ea 100644 --- a/libraries/base/System/IO.hs +++ b/libraries/base/System/IO.hs @@ -634,3 +634,4 @@ foreign import ccall "getpid" c_getpid :: IO Int -- It follows that an attempt to write to a file (using 'writeFile', for -- example) that was earlier opened by 'readFile' will usually result in -- failure with 'System.IO.Error.isAlreadyInUseError'. + diff --git a/libraries/base/System/IO/Error.hs b/libraries/base/System/IO/Error.hs index 1458d60bed..b1fb5ffbfa 100644 --- a/libraries/base/System/IO/Error.hs +++ b/libraries/base/System/IO/Error.hs @@ -475,3 +475,4 @@ catchIOError = New.catch catch :: IO a -> (IOError -> IO a) -> IO a catch = New.catch #endif /* !__HUGS__ */ + diff --git a/libraries/base/System/Info.hs b/libraries/base/System/Info.hs index 5fc816c080..c9f623d1ff 100644 --- a/libraries/base/System/Info.hs +++ b/libraries/base/System/Info.hs @@ -67,3 +67,4 @@ compilerVersionRaw = 0 -- ToDo #else #error Unknown compiler name #endif + diff --git a/libraries/base/System/Mem.hs b/libraries/base/System/Mem.hs index 67b80cc320..8e8a1bc2e0 100644 --- a/libraries/base/System/Mem.hs +++ b/libraries/base/System/Mem.hs @@ -1,6 +1,5 @@ {-# LANGUAGE Safe #-} {-# LANGUAGE CPP #-} - #ifdef __GLASGOW_HASKELL__ {-# LANGUAGE ForeignFunctionInterface #-} #endif @@ -37,3 +36,4 @@ foreign import ccall {-safe-} "performMajorGC" performGC :: IO () #ifdef __NHC__ import NHC.IOExtras (performGC) #endif + diff --git a/libraries/base/System/Mem/StableName.hs b/libraries/base/System/Mem/StableName.hs index 7d688e9aa8..8b8d690d8f 100644 --- a/libraries/base/System/Mem/StableName.hs +++ b/libraries/base/System/Mem/StableName.hs @@ -124,3 +124,4 @@ instance Eq (StableName a) where #include "Typeable.h" INSTANCE_TYPEABLE1(StableName,stableNameTc,"StableName") + diff --git a/libraries/base/System/Mem/Weak.hs b/libraries/base/System/Mem/Weak.hs index 8980a51b55..a2e6f72063 100644 --- a/libraries/base/System/Mem/Weak.hs +++ b/libraries/base/System/Mem/Weak.hs @@ -151,3 +151,4 @@ reachable if: * It is the value or finalizer of an object whose key is reachable. -} + diff --git a/libraries/base/System/Posix/Internals.hs b/libraries/base/System/Posix/Internals.hs index 632e69eb27..0f94c386e6 100644 --- a/libraries/base/System/Posix/Internals.hs +++ b/libraries/base/System/Posix/Internals.hs @@ -578,3 +578,4 @@ foreign import ccall unsafe "__hscore_bufsiz" dEFAULT_BUFFER_SIZE :: Int foreign import ccall unsafe "__hscore_seek_cur" sEEK_CUR :: CInt foreign import ccall unsafe "__hscore_seek_set" sEEK_SET :: CInt foreign import ccall unsafe "__hscore_seek_end" sEEK_END :: CInt + diff --git a/libraries/base/System/Posix/Internals.hs-boot b/libraries/base/System/Posix/Internals.hs-boot index ff4c4e8427..612269b844 100644 --- a/libraries/base/System/Posix/Internals.hs-boot +++ b/libraries/base/System/Posix/Internals.hs-boot @@ -6,3 +6,4 @@ import GHC.IO import GHC.Base puts :: String -> IO () + diff --git a/libraries/base/System/Timeout.hs b/libraries/base/System/Timeout.hs index d1cbbffc91..4114852694 100644 --- a/libraries/base/System/Timeout.hs +++ b/libraries/base/System/Timeout.hs @@ -92,3 +92,4 @@ timeout n f #else timeout n f = fmap Just f #endif /* !__GLASGOW_HASKELL__ */ + |