summaryrefslogtreecommitdiff
path: root/src/runtime
diff options
context:
space:
mode:
authorKrasimir Angelov <kr.angelov@gmail.com>2017-08-18 21:27:40 +0200
committerKrasimir Angelov <kr.angelov@gmail.com>2017-08-18 21:27:40 +0200
commit0a3b822313cc664cef860b39ec74c21e0d00475b (patch)
tree5994c67ad1d79820d18451518265de5c91c60b30 /src/runtime
parent1f3c9d0b1736daa979e195bc07d971421768e4ad (diff)
parent0a0eaa01bcbe9574bb86a6470ca5139fbd32a9d3 (diff)
????
Merge branch 'master' of www.grammaticalframework.org:/usr/local/www/GF
Diffstat (limited to 'src/runtime')
-rw-r--r--src/runtime/c/configure.ac4
-rwxr-xr-x[-rw-r--r--]src/runtime/c/setup.sh0
-rw-r--r--src/runtime/haskell/PGF/Optimize.hs6
3 files changed, 3 insertions, 7 deletions
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