[commit: unix] master: Fix Solaris breakage (I hope) (06edcfa)
Simon Marlow
marlowsd at gmail.com
Mon Nov 28 13:05:09 CET 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/unix
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/06edcfac35646d8d4735de62dd14efcb7735ff0d
>---------------------------------------------------------------
commit 06edcfac35646d8d4735de62dd14efcb7735ff0d
Author: Simon Marlow <marlowsd at gmail.com>
Date: Mon Nov 28 09:35:36 2011 +0000
Fix Solaris breakage (I hope)
>---------------------------------------------------------------
System/Posix/Terminal.hsc | 1 +
System/Posix/Terminal/ByteString.hsc | 4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/System/Posix/Terminal.hsc b/System/Posix/Terminal.hsc
index 5657662..b00c6d6 100644
--- a/System/Posix/Terminal.hsc
+++ b/System/Posix/Terminal.hsc
@@ -77,6 +77,7 @@ import Foreign
import Foreign.C
import System.Posix.Terminal.Common
import System.Posix.Types
+import System.Posix.IO
#if __GLASGOW_HASKELL__ > 700
import System.Posix.Internals (withFilePath, peekFilePath)
diff --git a/System/Posix/Terminal/ByteString.hsc b/System/Posix/Terminal/ByteString.hsc
index a75c37a..1b1845c 100644
--- a/System/Posix/Terminal/ByteString.hsc
+++ b/System/Posix/Terminal/ByteString.hsc
@@ -76,6 +76,8 @@ module System.Posix.Terminal.ByteString (
import Foreign
import System.Posix.Types
import System.Posix.Terminal.Common
+import System.Posix.IO.ByteString
+import Data.ByteString.Char8 as B
import Foreign.C hiding (
throwErrnoPath,
@@ -153,7 +155,7 @@ foreign import ccall unsafe "openpty"
-> IO CInt
#else
openPseudoTerminal = do
- (Fd master) <- openFd "/dev/ptmx" ReadWrite Nothing
+ (Fd master) <- openFd (B.pack "/dev/ptmx") ReadWrite Nothing
defaultFileFlags{noctty=True}
throwErrnoIfMinus1_ "openPseudoTerminal" (c_grantpt master)
throwErrnoIfMinus1_ "openPseudoTerminal" (c_unlockpt master)
More information about the Cvs-libraries
mailing list