Changed "%zu" to "%"APR_SIZE_T_FMT on APR format calls, removed the accidental NSAuto...

[cycript.git] / cycript.hpp

diff --git a/cycript.hpp b/cycript.hpp
index 316a37dbf987d1a2472b0f5ef22144cad9c9e6b0..a1e1f022d5cff8abdc7b3170835892e64e088483 100644 (file)
--- a/cycript.hpp
+++ b/cycript.hpp
@@ -40,7 +40,11 @@
 #ifndef CYCRIPT_HPP
 #define CYCRIPT_HPP
 
+#ifdef __APPLE__
+#include <JavaScriptCore/JavaScriptCore.h>
+#else
 #include <JavaScriptCore/JavaScript.h>
+#endif
 
 #include <apr_pools.h>
 #include <ffi.h>
@@ -51,6 +55,8 @@
 
 #include <sqlite3.h>
 
+void CYInitialize();
+
 bool CYRecvAll_(int socket, uint8_t *data, size_t size);
 bool CYSendAll_(int socket, const uint8_t *data, size_t size);
 
@@ -78,6 +84,8 @@ void CYSetArgs(int argc, const char *argv[]);
 
 bool CYCastBool(JSContextRef context, JSValueRef value);
 double CYCastDouble(JSContextRef context, JSValueRef value);
+
+CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value);
 const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSStringRef value);
 
 JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index);
@@ -119,9 +127,13 @@ JSValueRef CYCallAsFunction(JSContextRef context, JSObjectRef function, JSObject
 const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef object);
 
 struct CYHooks {
-    void *(*ExecuteStart)();
-    void (*ExecuteEnd)(void *);
+    void *(*ExecuteStart)(JSContextRef);
+    void (*ExecuteEnd)(JSContextRef, void *);
+
     JSValueRef (*RuntimeProperty)(JSContextRef, CYUTF8String);
+    void (*CallFunction)(JSContextRef, ffi_cif *, void (*)(), uint8_t *, void **);
+    void (*SetupContext)(JSContextRef);
+
     bool (*PoolFFI)(apr_pool_t *, JSContextRef, sig::Type *, ffi_type *, void *, JSValueRef);
     JSValueRef (*FromFFI)(JSContextRef, sig::Type *, ffi_type *, void *, bool, JSObjectRef);
 };