core-foundation: define some more callbacks.

diff --git a/basis/core-foundation/file-descriptors/file-descriptors.factor b/basis/core-foundation/file-descriptors/file-descriptors.factor
index bc982dff35c21049bbd53965e4dfd1bfb65940d0..28b8b681f396bb82e32f011f71c25538be4428da 100644 (file)
--- a/basis/core-foundation/file-descriptors/file-descriptors.factor
+++ b/basis/core-foundation/file-descriptors/file-descriptors.factor
@@ -6,7 +6,13 @@ IN: core-foundation.file-descriptors
 
 TYPEDEF: void* CFFileDescriptorRef
 TYPEDEF: int CFFileDescriptorNativeDescriptor
-TYPEDEF: void* CFFileDescriptorCallBack
+
+CALLBACK: void CFFileDescriptorCallBack (
+   CFFileDescriptorRef f,
+   CFOptionFlags callBackTypes,
+   void *info
+) ;
+
 C-TYPE: CFFileDescriptorContext
 
 FUNCTION: CFFileDescriptorRef CFFileDescriptorCreate (

diff --git a/basis/core-foundation/run-loop/run-loop.factor b/basis/core-foundation/run-loop/run-loop.factor
index 14e80a5c98bebf3c614ce8966757c8bc9bac90f7..724812d3c20ad873e9c3378f4464d9c659de064d 100644 (file)
--- a/basis/core-foundation/run-loop/run-loop.factor
+++ b/basis/core-foundation/run-loop/run-loop.factor
@@ -56,11 +56,6 @@ FUNCTION: void CFRunLoopRemoveTimer (
     CFStringRef mode
 ) ;
 
-CALLBACK: void CFRunLoopTimerCallBack (
-   CFRunLoopTimerRef timer,
-   void *info
-) ;
-
 CFSTRING: CFRunLoopDefaultMode "kCFRunLoopDefaultMode"
 
 TUPLE: run-loop-state fds sources timers ;

diff --git a/basis/core-foundation/timers/timers.factor b/basis/core-foundation/timers/timers.factor
index adf4e8a1c617aacaef8c9ad850b77fd659b512fe..595b68df884b110c6bea2ef1ecd7e22849aabb05 100644 (file)
--- a/basis/core-foundation/timers/timers.factor
+++ b/basis/core-foundation/timers/timers.factor
@@ -5,7 +5,12 @@ core-foundation.time calendar.unix kernel locals math system ;
 IN: core-foundation.timers
 
 TYPEDEF: void* CFRunLoopTimerRef
-TYPEDEF: void* CFRunLoopTimerCallBack
+
+CALLBACK: void CFRunLoopTimerCallBack (
+   CFRunLoopTimerRef timer,
+   void *info
+) ;
+
 TYPEDEF: void* CFRunLoopTimerContext
 
 FUNCTION: CFRunLoopTimerRef CFRunLoopTimerCreate (

diff --git a/basis/io/backend/unix/multiplexers/run-loop/run-loop.factor b/basis/io/backend/unix/multiplexers/run-loop/run-loop.factor
index 2bf03ec9a18a402da0c24bb644b03e4fa0848572..51405b203c3eba8d561d785cb8073a9655ba3729 100644 (file)
--- a/basis/io/backend/unix/multiplexers/run-loop/run-loop.factor
+++ b/basis/io/backend/unix/multiplexers/run-loop/run-loop.factor
@@ -10,13 +10,12 @@ IN: io.backend.unix.multiplexers.run-loop
 TUPLE: run-loop-mx kqueue-mx ;
 
 : file-descriptor-callback ( -- callback )
-    void { CFFileDescriptorRef CFOptionFlags void* }
-    cdecl [
+    [
         3drop
         0 mx get-global kqueue-mx>> wait-for-events
         reset-run-loop
         yield
-    ] alien-callback ;
+    ] CFFileDescriptorCallBack ;
 
 : <run-loop-mx> ( -- mx )
     [