git.iko.soy/jsaddle
on master help sign in
Fix to make 32bit and 64bit portability
5bc28bdHamish Mackenzie
src/Language/Javascript/JSC/Object.hs+2−11
compare with master
unifiedsplit
@@ -78,7 +78,7 @@ import Prelude hiding ((!!))
78import Language.Javascript.JSC.Types
78import Language.Javascript.JSC.Types
79 (JSPropertyNameArrayRef, JSStringRef, JSObjectRef, JSValueRefRef,
79 (JSPropertyNameArrayRef, JSStringRef, JSObjectRef, JSValueRefRef,
80 JSValueRef, JSContextRef, Index)
80 JSValueRef, JSContextRef, Index)
81−import Foreign.C (CSize(..), CUInt(..))
81+import Foreign.C.Types (CSize(..), CULong(..), CUInt(..))
82#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)
82#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)
83import GHCJS.Types (nullRef, castRef, JSArray, JSFun)
83import GHCJS.Types (nullRef, castRef, JSArray, JSFun)
84import GHCJS.Foreign (newObj, toArray, fromArray, syncCallback2)
84import GHCJS.Foreign (newObj, toArray, fromArray, syncCallback2)
@@ -92,7 +92,7 @@ import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSObjectRef
92 jsobjectcallasconstructor, jsobjectmakearray,
92 jsobjectcallasconstructor, jsobjectmakearray,
93 jsobjectcallasfunction, jsobjectgetproperty, jsobjectsetproperty,
93 jsobjectcallasfunction, jsobjectgetproperty, jsobjectsetproperty,
94 JSPropertyAttributes, JSObjectCallAsFunctionCallback,
94 JSPropertyAttributes, JSObjectCallAsFunctionCallback,
95− jsobjectmakefunctionwithcallback)
95+ jsobjectmakefunctionwithcallback, JSObjectCallAsFunctionCallback')
96import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSValueRef
96import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSValueRef
97 (jsvaluemakeundefined)
97 (jsvaluemakeundefined)
98import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSContextRef
98import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSContextRef
@@ -300,15 +300,6 @@ obj = do
300 liftIO $ jsobjectmake gctxt nullPtr nullPtr
300 liftIO $ jsobjectmake gctxt nullPtr nullPtr
301#endif
301#endif
302
302
303−type JSObjectCallAsFunctionCallback' =
304− JSContextRef
305− -> JSValueRef
306− -> JSValueRef
307− -> CUInt
308− -> JSValueRefRef
309− -> JSValueRefRef
310− -> IO JSValueRef
311−
312-- | Type used for Haskell functions called from JavaScript.
303-- | Type used for Haskell functions called from JavaScript.
313type JSCallAsFunction = JSValueRef -- ^ Function object
304type JSCallAsFunction = JSValueRef -- ^ Function object
314 -> JSValueRef -- ^ this
305 -> JSValueRef -- ^ this