on master help sign in
Fix to make 32bit and 64bit portability
commit5bc28bd74ac8a1011d5e5465d64b0ca15d17d86b authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateSat 27 Jul 2013, 22:37 (13 years ago) parent3538e29
1 file changed+2−11
src/Language/Javascript/JSC/Object.hs+2−11
src/Language/Javascript/JSC/Object.hs+2−11
@@ -78,7 +78,7 @@ import Prelude hiding ((!!))
7878import Language.Javascript.JSC.Types
7979 (JSPropertyNameArrayRef, JSStringRef, JSObjectRef, JSValueRefRef,
8080 JSValueRef, JSContextRef, Index)
81−import Foreign.C (CSize(..), CUInt(..))
81+import Foreign.C.Types (CSize(..), CULong(..), CUInt(..))
8282#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)
8383import GHCJS.Types (nullRef, castRef, JSArray, JSFun)
8484import GHCJS.Foreign (newObj, toArray, fromArray, syncCallback2)
@@ -92,7 +92,7 @@ import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSObjectRef
9292 jsobjectcallasconstructor, jsobjectmakearray,
9393 jsobjectcallasfunction, jsobjectgetproperty, jsobjectsetproperty,
9494 JSPropertyAttributes, JSObjectCallAsFunctionCallback,
95− jsobjectmakefunctionwithcallback)
95+ jsobjectmakefunctionwithcallback, JSObjectCallAsFunctionCallback')
9696import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSValueRef
9797 (jsvaluemakeundefined)
9898import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSContextRef
@@ -300,15 +300,6 @@ obj = do
300300 liftIO $ jsobjectmake gctxt nullPtr nullPtr
301301#endif
302302
303−type JSObjectCallAsFunctionCallback' =
304− JSContextRef
305− -> JSValueRef
306− -> JSValueRef
307− -> CUInt
308− -> JSValueRefRef
309− -> JSValueRefRef
310− -> IO JSValueRef
311−
312303-- | Type used for Haskell functions called from JavaScript.
313304type JSCallAsFunction = JSValueRef -- ^ Function object
314305 -> JSValueRef -- ^ this