File tree Expand file tree Collapse file tree 4 files changed +0
-53
lines changed Expand file tree Collapse file tree 4 files changed +0
-53
lines changed Original file line number Diff line number Diff line change @@ -680,18 +680,6 @@ awaitSignal maybe_sigset = do
680
680
foreign import ccall unsafe " sigsuspend"
681
681
c_sigsuspend :: Ptr CSigset -> IO CInt
682
682
683
- #if defined(darwin_HOST_OS) && __GLASGOW_HASKELL__ < 706
684
- -- see http://ghc.haskell.org/trac/ghc/ticket/7359#comment:3
685
- -- To be removed when support for GHC 7.4.x is dropped
686
- foreign import ccall unsafe " __hscore_sigdelset"
687
- c_sigdelset :: Ptr CSigset -> CInt -> IO CInt
688
-
689
- foreign import ccall unsafe " __hscore_sigfillset"
690
- c_sigfillset :: Ptr CSigset -> IO CInt
691
-
692
- foreign import ccall unsafe " __hscore_sigismember"
693
- c_sigismember :: Ptr CSigset -> CInt -> IO CInt
694
- #else
695
683
foreign import capi unsafe " signal.h sigdelset"
696
684
c_sigdelset :: Ptr CSigset -> CInt -> IO CInt
697
685
@@ -700,7 +688,6 @@ foreign import capi unsafe "signal.h sigfillset"
700
688
701
689
foreign import capi unsafe " signal.h sigismember"
702
690
c_sigismember :: Ptr CSigset -> CInt -> IO CInt
703
- #endif
704
691
705
692
foreign import ccall unsafe " sigpending"
706
693
c_sigpending :: Ptr CSigset -> IO CInt
Original file line number Diff line number Diff line change @@ -130,14 +130,8 @@ getSlaveTerminalName (Fd fd) = do
130
130
s <- throwErrnoIfNull " getSlaveTerminalName" (c_ptsname fd)
131
131
peekFilePath s
132
132
133
- # if __GLASGOW_HASKELL__ < 800
134
- -- see comment in cbits/HsUnix.c
135
- foreign import ccall unsafe " __hsunix_ptsname"
136
- c_ptsname :: CInt -> IO CString
137
- # else
138
133
foreign import capi unsafe " HsUnix.h ptsname"
139
134
c_ptsname :: CInt -> IO CString
140
- # endif
141
135
#else
142
136
getSlaveTerminalName _ =
143
137
ioError (errnoToIOError " getSlaveTerminalName" eNOSYS Nothing Nothing )
@@ -190,20 +184,11 @@ foreign import ccall unsafe "__hsunix_push_module"
190
184
c_push_module :: CInt -> CString -> IO CInt
191
185
192
186
#ifdef HAVE_PTSNAME
193
- # if __GLASGOW_HASKELL__ < 800
194
- -- see comment in cbits/HsUnix.c
195
- foreign import ccall unsafe " __hsunix_grantpt"
196
- c_grantpt :: CInt -> IO CInt
197
-
198
- foreign import ccall unsafe " __hsunix_unlockpt"
199
- c_unlockpt :: CInt -> IO CInt
200
- # else
201
187
foreign import capi unsafe " HsUnix.h grantpt"
202
188
c_grantpt :: CInt -> IO CInt
203
189
204
190
foreign import capi unsafe " HsUnix.h unlockpt"
205
191
c_unlockpt :: CInt -> IO CInt
206
- # endif
207
192
#else
208
193
c_grantpt :: CInt -> IO CInt
209
194
c_grantpt _ = return (fromIntegral 0 )
Original file line number Diff line number Diff line change @@ -138,14 +138,8 @@ getSlaveTerminalName (Fd fd) = do
138
138
s <- throwErrnoIfNull " getSlaveTerminalName" (c_ptsname fd)
139
139
peekFilePath s
140
140
141
- # if __GLASGOW_HASKELL__ < 800
142
- -- see comment in cbits/HsUnix.c
143
- foreign import ccall unsafe " __hsunix_ptsname"
144
- c_ptsname :: CInt -> IO CString
145
- # else
146
141
foreign import capi unsafe " HsUnix.h ptsname"
147
142
c_ptsname :: CInt -> IO CString
148
- # endif
149
143
#else
150
144
getSlaveTerminalName _ =
151
145
ioError (errnoToIOError " getSlaveTerminalName" eNOSYS Nothing Nothing )
@@ -198,20 +192,11 @@ foreign import ccall unsafe "__hsunix_push_module"
198
192
c_push_module :: CInt -> CString -> IO CInt
199
193
200
194
#if HAVE_PTSNAME
201
- # if __GLASGOW_HASKELL__ < 800
202
- -- see comment in cbits/HsUnix.c
203
- foreign import ccall unsafe " __hsunix_grantpt"
204
- c_grantpt :: CInt -> IO CInt
205
-
206
- foreign import ccall unsafe " __hsunix_unlockpt"
207
- c_unlockpt :: CInt -> IO CInt
208
- # else
209
195
foreign import capi unsafe " HsUnix.h grantpt"
210
196
c_grantpt :: CInt -> IO CInt
211
197
212
198
foreign import capi unsafe " HsUnix.h unlockpt"
213
199
c_unlockpt :: CInt -> IO CInt
214
- # endif
215
200
#else
216
201
c_grantpt :: CInt -> IO CInt
217
202
c_grantpt _ = return (fromIntegral (0 :: Int ))
Original file line number Diff line number Diff line change @@ -16,16 +16,6 @@ void *__hsunix_rtldNext (void) {return RTLD_NEXT;}
16
16
void * __hsunix_rtldDefault (void ) {return RTLD_DEFAULT ;}
17
17
#endif
18
18
19
- #if HAVE_PTSNAME && (__GLASGOW_HASKELL__ < 800 )
20
- // On Linux (and others), <stdlib.h> needs to be included while
21
- // `_XOPEN_SOURCE` is already defined. However, GHCs before GHC 8.0
22
- // didn't do that yet for CApiFFI, so we need this workaround here.
23
-
24
- char * __hsunix_ptsname (int fd ) { return ptsname (fd ); }
25
- int __hsunix_grantpt (int fd ) { return grantpt (fd ); }
26
- int __hsunix_unlockpt (int fd ) { return unlockpt (fd ); }
27
- #endif
28
-
29
19
// push a SVR4 STREAMS module; do nothing if STREAMS not available
30
20
int __hsunix_push_module (int fd , const char * module )
31
21
{
You can’t perform that action at this time.
0 commit comments