Merge alien/parser/parser.factor

[factor.git] / basis / alien / parser / parser.factor

diff --git a/basis/alien/parser/parser.factor b/basis/alien/parser/parser.factor
index 8385bfb97f61b51d9b807f379d77dbe96a981745..8d850c47eea8500b6542452ae16fb063c0770cb4 100644 (file)
--- a/basis/alien/parser/parser.factor
+++ b/basis/alien/parser/parser.factor
@@ -91,14 +91,14 @@ IN: alien.parser
     '[ [ _ _ _ ] dip alien-callback ] ;
 
 :: make-callback-type ( lib return type-name parameters -- word quot effect )
-    return type-name normalize-c-arg :> ( return type-name )
+    return type-name normalize-c-arg :> ( return-c-type type-name )
     type-name current-vocab create :> type-word 
     type-word [ reset-generic ] [ reset-c-type ] bi
     void* type-word typedef
     parameters return parse-arglist :> ( types callback-effect )
     type-word callback-effect "callback-effect" set-word-prop
     type-word lib "callback-library" set-word-prop
-    type-word return types lib library-abi callback-quot (( quot -- alien )) ;
+    type-word return-c-type types lib library-abi callback-quot (( quot -- alien )) ;
 
 : (CALLBACK:) ( -- word quot effect )
     "c-library" get