svn commit: r447927 - head/devel/hs-kqueue/files

Gabor Pali pgj at FreeBSD.org
Mon Aug 14 09:14:31 UTC 2017


Author: pgj
Date: Mon Aug 14 09:14:29 2017
New Revision: 447927
URL: https://svnweb.freebsd.org/changeset/ports/447927

Log:
  Fix build on __FreeBSD_version >= 1200033.
  
  Reported by:	pkg-fallout

Modified:
  head/devel/hs-kqueue/files/patch-src__System__KQueue.chs

Modified: head/devel/hs-kqueue/files/patch-src__System__KQueue.chs
==============================================================================
--- head/devel/hs-kqueue/files/patch-src__System__KQueue.chs	Mon Aug 14 05:37:21 2017	(r447926)
+++ head/devel/hs-kqueue/files/patch-src__System__KQueue.chs	Mon Aug 14 09:14:29 2017	(r447927)
@@ -1,22 +1,26 @@
 --- src/System/KQueue.chs.orig	2016-05-30 14:31:11 UTC
 +++ src/System/KQueue.chs
-@@ -21,6 +21,7 @@ module System.KQueue
+@@ -19,8 +19,10 @@ module System.KQueue
+   , KQueueException
+   ) where
  
++#include <sys/param.h>
  #include <sys/time.h>
  #include <sys/event.h>
 +#include "MachDeps.h"
  
  #if __GLASGOW_HASKELL__ <= 708
  import Control.Applicative ( (<$>), (<*>) )
-@@ -57,6 +58,7 @@ import Foreign.C           ( CInt )
+@@ -57,6 +59,8 @@ import Foreign.C           ( CInt )
  import Foreign.C           ( CLong
                             , CTime
                             , CULong
 +                           , CUInt
++                           , CLLong
                             )
  
  -- | A kernel event queue.
-@@ -68,11 +70,19 @@ kqueue = KQueue <$> {#call kqueue as kqueue_ #}
+@@ -68,11 +72,23 @@ kqueue = KQueue <$> {#call kqueue as kqueue_ #}
  
  -- | A kernel event.
  data KEvent = KEvent
@@ -29,14 +33,18 @@
    , flags    :: [Flag]  -- ^ Actions to perform on the event.
    , fflags   :: [FFlag] -- ^ Filter-specific flags.
 +#if SIZEOF_HSWORD == 4
++#if __FreeBSD_version >= 1200033
++  , data_    :: CLLong  -- ^ Filter-specific data value.
++#else
 +  , data_    :: CInt    -- ^ Filter-specific data value.
++#endif
 +#else
    , data_    :: CLong   -- ^ Filter-specific data value.
 +#endif
    , udata    :: Ptr ()  -- ^ User-defined data, passed through unchanged.
    } deriving (Show, Eq)
  
-@@ -128,8 +138,10 @@ enum FFlag
+@@ -128,8 +144,10 @@ enum FFlag
    , NoteExit   = NOTE_EXIT
    , NoteFork   = NOTE_FORK
    , NoteExec   = NOTE_EXEC


More information about the svn-ports-head mailing list