Skip to content

Commit bdea7d4

Browse files
bgamarihasufell
authored andcommitted
System.Posix.Terminal.PosixString: Fix imports in HAVE_OPENPTY path
This appears to have broken with the `os-string` split of `filepath-1.5`.
1 parent 7db23ec commit bdea7d4

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

System/Posix/Terminal/PosixString.hsc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,18 @@ module System.Posix.Terminal.PosixString (
7272
import Foreign
7373
import System.Posix.Types
7474
import System.Posix.Terminal.Common
75+
7576
#ifndef HAVE_OPENPTY
76-
import qualified System.OsPath.Data.ByteString.Short as SBS
77-
import System.Posix.IO.ByteString (defaultFileFlags, openFd, noctty, OpenMode(ReadWrite))
7877
import Data.ByteString.Char8 as B ( pack, )
79-
import qualified System.OsPath.Data.ByteString.Short as BC
78+
import System.Posix.IO.ByteString (defaultFileFlags, openFd, noctty, OpenMode(ReadWrite))
8079
import System.OsString.Internal.Types (PosixString(..))
80+
#if MIN_VERSION_filepath(1,5,0)
81+
import qualified System.OsString.Data.ByteString.Short as SBS
82+
import qualified System.OsString.Data.ByteString.Short as BC
83+
#else
84+
import qualified System.OsPath.Data.ByteString.Short as SBS
85+
import qualified System.OsPath.Data.ByteString.Short as BC
86+
#endif
8187
#endif
8288

8389
import Foreign.C hiding (

cabal.project.wasm32-wasi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ package unix
55

66
write-ghc-environment-files: always
77

8-
allow-newer: all:base, all:filepath
8+
allow-newer: all:base

0 commit comments

Comments
 (0)