[project @ 2004-09-15 13:51:00 by stolz]

- Remove configure tests for SIG{POLL,INFO,WINCH}:
  Testing via #ifdef SIGFOO should be sufficient.
- Change #if HAVE_SIGPOLL to #ifdef SIGPOLL
- Remove SIGINFO/WINCH from package base: they'll reappear in package unix
  in System/Posix/Signals.Exts.

diff --git a/System/Posix/Signals.hsc b/System/Posix/Signals.hsc
index e5a5532..db68d28 100644 (file)
--- a/System/Posix/Signals.hsc
+++ b/System/Posix/Signals.hsc
@@ -41,7 +41,7 @@ module System.Posix.Signals (
   backgroundWrite, sigTTOU,
   userDefinedSignal1, sigUSR1,
   userDefinedSignal2, sigUSR2,
-#if HAVE_SIGPOLL
+#ifdef SIGPOLL
   pollableEvent, sigPOLL,
 #endif
   profilingTimerExpired, sigPROF,
@@ -51,12 +51,6 @@ module System.Posix.Signals (
   virtualTimerExpired, sigVTALRM,
   cpuTimeLimitExceeded, sigXCPU,
   fileSizeLimitExceeded, sigXFSZ,
-#if HAVE_SIGINFO
-  infoEvent, sigINFO,
-#endif
-#if HAVE_SIGWINCH
-  windowChange, sigWINCH,
-#endif
 
   -- * Sending signals
   raiseSignal,
@@ -144,7 +138,7 @@ sigTTIN   = (#const SIGTTIN)   :: CInt
 sigTTOU   = (#const SIGTTOU)   :: CInt
 sigUSR1   = (#const SIGUSR1)   :: CInt
 sigUSR2   = (#const SIGUSR2)   :: CInt
-#if HAVE_SIGPOLL
+#ifdef SIGPOLL
 sigPOLL   = (#const SIGPOLL)   :: CInt
 #endif
 sigPROF   = (#const SIGPROF)   :: CInt
@@ -154,12 +148,6 @@ sigURG    = (#const SIGURG)    :: CInt
 sigVTALRM = (#const SIGVTALRM) :: CInt
 sigXCPU   = (#const SIGXCPU)   :: CInt
 sigXFSZ   = (#const SIGXFSZ)   :: CInt
-#if HAVE_SIGINFO
-sigINFO   = (#const SIGINFO)   :: CInt
-#endif
-#if HAVE_SIGWINCH
-sigWINCH  = (#const SIGWINCH)  :: CInt
-#endif
 #else
 foreign import ccall unsafe "__hsposix_SIGABRT"   sigABRT   :: CInt
 foreign import ccall unsafe "__hsposix_SIGALRM"   sigALRM   :: CInt
@@ -181,7 +169,7 @@ foreign import ccall unsafe "__hsposix_SIGTTIN"   sigTTIN   :: CInt
 foreign import ccall unsafe "__hsposix_SIGTTOU"   sigTTOU   :: CInt
 foreign import ccall unsafe "__hsposix_SIGUSR1"   sigUSR1   :: CInt
 foreign import ccall unsafe "__hsposix_SIGUSR2"   sigUSR2   :: CInt
-#if HAVE_SIGPOLL
+#ifdef SIGPOLL
 foreign import ccall unsafe "__hsposix_SIGPOLL"   sigPOLL   :: CInt
 #endif
 foreign import ccall unsafe "__hsposix_SIGPROF"   sigPROF   :: CInt
@@ -191,12 +179,6 @@ foreign import ccall unsafe "__hsposix_SIGURG"    sigURG    :: CInt
 foreign import ccall unsafe "__hsposix_SIGVTALRM" sigVTALRM :: CInt
 foreign import ccall unsafe "__hsposix_SIGXCPU"   sigXCPU   :: CInt
 foreign import ccall unsafe "__hsposix_SIGXFSZ"   sigXFSZ   :: CInt
-#if HAVE_SIGINFO
-foreign import ccall unsafe "__hsposix_SIGINFO"   sigINFO   :: CInt
-#endif
-#if HAVE_SIGWINCH
-foreign import ccall unsafe "__hsposix_SIGWINCH"   sigWINCH   :: CInt
-#endif
 #endif /* __HUGS__ */
 
 internalAbort ::Signal
@@ -259,7 +241,7 @@ userDefinedSignal1 = sigUSR1
 userDefinedSignal2 :: Signal
 userDefinedSignal2 = sigUSR2
 
-#if HAVE_SIGPOLL
+#ifdef SIGPOLL
 pollableEvent :: Signal
 pollableEvent = sigPOLL
 #endif
@@ -285,16 +267,6 @@ cpuTimeLimitExceeded = sigXCPU
 fileSizeLimitExceeded :: Signal
 fileSizeLimitExceeded = sigXFSZ
 
-#if HAVE_SIGINFO
-infoEvent :: Signal
-infoEvent = sigINFO
-#endif
-
-#if HAVE_SIGWINCH
-windowChange :: Signal
-windowChange = sigWINCH
-#endif
-
 -- -----------------------------------------------------------------------------
 -- Signal-related functions
 

diff --git a/include/HsBase.h b/include/HsBase.h
index 4ed8b4b..2e27492 100644 (file)
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -669,7 +669,7 @@ INLINE int __hsposix_SIGTTIN()   { return SIGTTIN; }
 INLINE int __hsposix_SIGTTOU()   { return SIGTTOU; }
 INLINE int __hsposix_SIGUSR1()   { return SIGUSR1; }
 INLINE int __hsposix_SIGUSR2()   { return SIGUSR2; }
-#if HAVE_SIGPOLL
+#ifdef SIGPOLL
 INLINE int __hsposix_SIGPOLL()   { return SIGPOLL; }
 #endif
 INLINE int __hsposix_SIGPROF()   { return SIGPROF; }
@@ -684,12 +684,6 @@ INLINE int __hsposix_SIG_BLOCK()   { return SIG_BLOCK; }
 INLINE int __hsposix_SIG_UNBLOCK() { return SIG_UNBLOCK; }
 INLINE int __hsposix_SIG_SETMASK() { return SIG_SETMASK; }
 
-#if HAVE_SIGINFO
-INLINE int __hsposix_SIGINFO() { return SIGINFO; }
-#endif
-#if HAVE_SIGWINCH
-INLINE int __hsposix_SIGWINCH()        { return SIGWINCH; }
-#endif
 #endif /* mingw32_TARGET_OS */
 
 // These are wrapped because on some OSs (eg. Linux) they are