Skip to content

Commit aad5262

Browse files
committed
Revert "Fix #185 Don't depend on GHC.IO.* from base, from GHC 9.10"
This reverts commit 40f9124.
1 parent 7bd326a commit aad5262

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

ansi-terminal/ansi-terminal.cabal

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ Library
4141
Build-Depends: base >= 4.8.0.0 && < 5
4242
, ansi-terminal-types == 1.1.3
4343
, colour >= 2.1.0
44-
if impl(ghc >= 9.10)
45-
Build-Depends: ghc-internal >= 9.1001.0
4644
if os(windows)
4745
Hs-Source-Dirs: win
4846
Other-Modules: System.Console.ANSI.Windows.Foreign

ansi-terminal/win/System/Console/ANSI/Windows/Win32/Types.hs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,17 @@ import Foreign.C.String ( peekCWString )
4141
import Foreign.C.Types ( CChar, CInt (..), CShort (..), CWchar )
4242
import Foreign.Ptr ( Ptr, nullPtr )
4343
import Foreign.StablePtr ( StablePtr, freeStablePtr, newStablePtr )
44-
#if MIN_VERSION_base(4,20,0)
45-
import GHC.Internal.IO.Handle.Types ( Handle (..), Handle__ (..) )
46-
import GHC.Internal.IO.FD ( FD(..) ) -- A wrapper around an Int32
47-
#else
4844
import GHC.IO.Handle.Types ( Handle (..), Handle__ (..) )
4945
import GHC.IO.FD ( FD(..) ) -- A wrapper around an Int32
50-
#endif
5146
import Numeric ( showHex )
5247
import System.IO.Error ( ioeSetErrorString )
5348

5449
#if defined(__IO_MANAGER_WINIO__)
55-
#if MIN_VERSION_base(4,20,0)
56-
import GHC.Internal.IO.Exception
57-
( IOErrorType (InappropriateType), IOException (IOError), ioException )
58-
import GHC.Internal.IO.SubSystem ( (<!>) )
59-
import GHC.Internal.IO.Windows.Handle ( ConsoleHandle, Io, NativeHandle, toHANDLE )
60-
#else
6150
import GHC.IO.Exception
6251
( IOErrorType (InappropriateType), IOException (IOError), ioException )
6352
import GHC.IO.SubSystem ( (<!>) )
6453
import GHC.IO.Windows.Handle ( ConsoleHandle, Io, NativeHandle, toHANDLE )
6554
#endif
66-
#endif
6755

6856
type Addr = Ptr ()
6957
type BOOL = Bool

0 commit comments

Comments
 (0)