[commit: packages/unix] master: Remove obsolete windows-related #ifdefs (944b05c)

git at git.haskell.org git at git.haskell.org
Tue Apr 19 21:37:49 UTC 2016


Repository : ssh://git@git.haskell.org/unix

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/944b05c4aa35378db18cee4fcd4e1f02e67ce645/unix

>---------------------------------------------------------------

commit 944b05c4aa35378db18cee4fcd4e1f02e67ce645
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Jan 30 22:38:28 2016 +0100

    Remove obsolete windows-related #ifdefs
    
    We haven't properly supported Windows for some time now, and we wouldn't
    have any way to test anyway, since GHC doesn't support Cygwin anymore
    either.


>---------------------------------------------------------------

944b05c4aa35378db18cee4fcd4e1f02e67ce645
 System/Posix/Signals.hsc | 5 -----
 cbits/HsUnix.c           | 6 ++----
 include/HsUnix.h         | 4 +---
 unix.cabal               | 2 +-
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/System/Posix/Signals.hsc b/System/Posix/Signals.hsc
index d4c6d51..9119190 100644
--- a/System/Posix/Signals.hsc
+++ b/System/Posix/Signals.hsc
@@ -86,9 +86,7 @@ module System.Posix.Signals (
 
   -- * Waiting for signals
   getPendingSignals,
-#ifndef cygwin32_HOST_OS
   awaitSignal,
-#endif
 
 #ifdef __GLASGOW_HASKELL__
   -- * The @NOCLDSTOP@ flag
@@ -575,8 +573,6 @@ getPendingSignals = do
    throwErrnoIfMinus1_ "getPendingSignals" (c_sigpending p)
   return (SignalSet fp)
 
-#ifndef cygwin32_HOST_OS
-
 -- | @awaitSignal iset@ suspends execution until an interrupt is received.
 -- If @iset@ is @Just s@, @awaitSignal@ calls @sigsuspend@, installing
 -- @s@ as the new signal mask before suspending execution; otherwise, it
@@ -605,7 +601,6 @@ awaitSignal maybe_sigset = do
 
 foreign import ccall unsafe "sigsuspend"
   c_sigsuspend :: Ptr CSigset -> IO CInt
-#endif
 
 #ifdef __HUGS__
 foreign import ccall unsafe "sigdelset"
diff --git a/cbits/HsUnix.c b/cbits/HsUnix.c
index fb63b45..49f90e8 100644
--- a/cbits/HsUnix.c
+++ b/cbits/HsUnix.c
@@ -69,18 +69,16 @@ int __hsunix_unlockpt(int fd)
 // push a SVR4 STREAMS module; do nothing if STREAMS not available
 int __hsunix_push_module(int fd, const char *module)
 {
-#if defined(I_PUSH) && !defined(__CYGWIN__) && !defined(HAVE_DEV_PTC)
+#if defined(I_PUSH) && !defined(HAVE_DEV_PTC)
     return ioctl(fd, I_PUSH, module);
 #else
     return 0;
 #endif
 }
 
-#if !defined(__MINGW32__)
 int __hscore_mkstemp(char *filetemplate) {
     return (mkstemp(filetemplate));
 }
-#endif
 
 #if HAVE_MKSTEMPS
 int __hscore_mkstemps(char *filetemplate, int suffixlen) {
@@ -95,7 +93,7 @@ char *__hscore_mkdtemp(char *filetemplate) {
 #endif
 
 
-#if !defined(__MINGW32__) && !defined(irix_HOST_OS)
+#if !defined(irix_HOST_OS)
 int __hscore_getrlimit(int resource, struct rlimit *rlim) {
     return (getrlimit(resource, rlim));
 }
diff --git a/include/HsUnix.h b/include/HsUnix.h
index 8b468b7..e276726 100644
--- a/include/HsUnix.h
+++ b/include/HsUnix.h
@@ -143,9 +143,7 @@ int __hsunix_unlockpt(int fd);
 // push a SVR4 STREAMS module; do nothing if STREAMS not available
 int __hsunix_push_module(int fd, const char *module);
 
-#if !defined(__MINGW32__)
 int __hscore_mkstemp(char *filetemplate);
-#endif
 
 #if HAVE_MKSTEMPS
 int __hscore_mkstemps(char *filetemplate, int suffixlen);
@@ -155,7 +153,7 @@ int __hscore_mkstemps(char *filetemplate, int suffixlen);
 char *__hscore_mkdtemp(char *filetemplate);
 #endif
 
-#if !defined(__MINGW32__) && !defined(irix_HOST_OS)
+#if !defined(irix_HOST_OS)
 int __hscore_getrlimit(int resource, struct rlimit *rlim);
 int __hscore_setrlimit(int resource, struct rlimit *rlim);
 #endif
diff --git a/unix.cabal b/unix.cabal
index e4a2aee..0ae2772 100644
--- a/unix.cabal
+++ b/unix.cabal
@@ -17,7 +17,7 @@ description:
     Operating System Interface for Computing Environments -
     IEEE Std. 1003.1).
     .
-    The package is not supported under Windows (except under Cygwin).
+    The package is not supported under Windows.
 
 extra-source-files:
     changelog.md



More information about the ghc-commits mailing list