Conditional compilation for Binary Text (fixes #281)

fpco · May 25, 2015 · c13d84d · hvr · May 25, 2015 · snoyberg
1 parent 0e466c4
commit c13d84d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ide-backend-common/IdeSession/Util.hs b/ide-backend-common/IdeSession/Util.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE TemplateHaskell, ScopedTypeVariables, DeriveFunctor, DeriveGeneric, StandaloneDeriving, GeneralizedNewtypeDeriving #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module IdeSession.Util (
@@ -312,6 +313,7 @@ captureOutput act = do
   Orphans
 -------------------------------------------------------------------------------}
 
+#if !MIN_VERSION_text(1,2,1)
 instance Binary Text where
   get   = do units <- Bin.get
              Bin.readNWith (units * 2) $ \ptr ->
@@ -321,5 +323,6 @@ instance Binary Text where
              Bin.putBuilder $
                Bin.writeN (Text.lengthWord16 t * 2)
                           (\p -> Text.unsafeCopyToPtr t (castPtr p))
+#endif
 
 deriving instance Binary CPid
diff --git a/ide-backend-common/ide-backend-common.cabal b/ide-backend-common/ide-backend-common.cabal
@@ -1,5 +1,5 @@
 name:                 ide-backend-common
-version:              0.9.1.1
+version:              0.9.1.2
 synopsis:             Shared library used be ide-backend and ide-backend-server
 description:          Should not be used by end users
 license:              MIT
@@ -10,7 +10,7 @@ copyright:            (c) 2015 FP Complete
 category:             Development
 build-type:           Simple
 cabal-version:        >=1.10
-extra-source-files:   README.md
+extra-source-files:   README.md ChangeLog.md
 
 library
   exposed-modules:    IdeSession.Util