????

Merge branch 'master' of www.grammaticalframework.org:/usr/local/www/GF

5 files changed, 6 insertions, 22 deletions

diff --git a/src/compiler/GF/System/Catch.hs b/src/compiler/GF/System/Catch.hs
index f69934af5..11fae1a7b 100644
--- a/src/compiler/GF/System/Catch.hs
+++ b/src/compiler/GF/System/Catch.hs
@@ -1,13 +1,7 @@
--- | Isolate backwards incompatible library changes to 'catch' and 'try'
-{-# LANGUAGE CPP #-}
+-- | Backwards compatible 'catch' and 'try'
 module GF.System.Catch where
 import qualified System.IO.Error as S
 
 -- ** Backwards compatible try and catch
-#if MIN_VERSION_base(4,4,0)
 catch = S.catchIOError
 try = S.tryIOError
-#else
-catch = S.catch
-try = S.try
-#endif
diff --git a/src/compiler/GF/System/Concurrency.hs b/src/compiler/GF/System/Concurrency.hs
index 41f318c7a..514eab649 100644
--- a/src/compiler/GF/System/Concurrency.hs
+++ b/src/compiler/GF/System/Concurrency.hs
@@ -1,7 +1,6 @@
-{-# LANGUAGE CPP,ForeignFunctionInterface #-}
+{-# LANGUAGE ForeignFunctionInterface #-}
 -- | A variant of 'Control.Concurrent.setNumCapabilities' that automatically
--- detects the number of processors in the system, and is available
--- even when compiling with GHC<7.6.
+-- detects the number of processors in the system.
 module GF.System.Concurrency(
   -- * Controlling parallelism
   setNumCapabilities,getNumberOfProcessors) where
@@ -16,13 +15,8 @@ import Foreign.C.Types(CInt(..))
 -- hasn't already been set with @+RTS -N/n/ -RTS@.
 setNumCapabilities opt_n =
   do n <- maybe getNumberOfProcessors return opt_n
-#if MIN_VERSION_base(4,6,0)
      C.setNumCapabilities n
      return True
-#else
-     n_now <- C.getNumCapabilities
-     return (n==n_now)
-#endif
 
 -- | Returns the number of processors in the system.
 getNumberOfProcessors = fmap fromEnum c_getNumberOfProcessors
diff --git a/src/runtime/c/configure.ac b/src/runtime/c/configure.ac
index 2af9016de..f52479a5b 100644
--- a/src/runtime/c/configure.ac
+++ b/src/runtime/c/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT(Portable Grammar Format library, 0.1.pre, 
-		 https://code.google.com/p/grammatical-framework/, 
+AC_INIT(Portable Grammar Format library, 0.1-pre, 
+		 http://www.grammaticalframework.org/, 
 		 libpgf)
 AC_PREREQ(2.58)
 
diff --git a/src/runtime/c/setup.sh b/src/runtime/c/setup.sh
index fdc8f7aec..fdc8f7aec 100644..100755
--- a/src/runtime/c/setup.sh
+++ b/src/runtime/c/setup.sh
diff --git a/src/runtime/haskell/PGF/Optimize.hs b/src/runtime/haskell/PGF/Optimize.hs
index 45b4311a5..8739c8665 100644
--- a/src/runtime/haskell/PGF/Optimize.hs
+++ b/src/runtime/haskell/PGF/Optimize.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, BangPatterns #-}
+{-# LANGUAGE BangPatterns #-}
 module PGF.Optimize
              ( optimizePGF
              , updateProductionIndices
@@ -11,11 +11,7 @@ import PGF.Macros
 import Data.List (mapAccumL)
 import Data.Array.IArray
 import Data.Array.MArray
-#if MIN_VERSION_base(4,6,0)
 import Data.Array.Unsafe as U(unsafeFreeze)
-#else
-import Data.Array.ST as U(unsafeFreeze)
-#endif
 import Data.Array.ST
 import Data.Array.Unboxed
 import qualified Data.Map as Map