[commit: base] master: Use CAPI to make the C wrapper for kevent (b6c9c35)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b6c9c353b973ac01f1d6723a1a32d3b07ed13a02

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

commit b6c9c353b973ac01f1d6723a1a32d3b07ed13a02
Author: Ian Lynagh <ian at well-typed.com>
Date:   Mon Oct 15 21:43:29 2012 +0100

    Use CAPI to make the C wrapper for kevent

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

 GHC/Event/KQueue.hsc |    2 +-
 include/HsBase.h     |   13 -------------
 2 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/GHC/Event/KQueue.hsc b/GHC/Event/KQueue.hsc
index 23e988c..4197931 100644
--- a/GHC/Event/KQueue.hsc
+++ b/GHC/Event/KQueue.hsc
@@ -305,7 +305,7 @@ foreign import ccall safe "kevent64"
     c_kevent64 :: QueueFd -> Ptr Event -> CInt -> Ptr Event -> CInt -> CUInt
                -> Ptr TimeSpec -> IO CInt
 #elif defined(HAVE_KEVENT)
-foreign import ccall safe "__hscore_kevent"
+foreign import capi safe "sys/event.h kevent"
     c_kevent :: QueueFd -> Ptr Event -> CInt -> Ptr Event -> CInt
              -> Ptr TimeSpec -> IO CInt
 #else
diff --git a/include/HsBase.h b/include/HsBase.h
index 99efde5..74ab816 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -155,10 +155,6 @@ extern HsWord64 getMonotonicUSec(void);
 #include <sys/select.h>
 #endif
 
-#if HAVE_SYS_EVENT_H
-#include <sys/event.h>
-#endif
-
 /* in inputReady.c */
 extern int fdReady(int fd, int write, int msecs, int isSock);
 
@@ -545,15 +541,6 @@ INLINE int __hscore_open(char *file, int how, mode_t mode) {
 }
 #endif
 
-#ifdef HAVE_KEVENT
-INLINE int __hscore_kevent(int kq, const struct kevent *changelist,
-                           size_t nchanges, struct kevent *eventlist,
-                           size_t nevents, const struct timespec *timeout) {
-	return kevent(kq, changelist, nchanges, eventlist, nevents, timeout);
-}
-#endif
-
-
 #if darwin_HOST_OS
 // You should not access _environ directly on Darwin in a bundle/shared library.
 // See #2458 and http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man7/environ.7.html