Get this all working really everywhere again, seriously this time.

[cycript.git] / JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index a3e9f0a7d7021fac0725b1f2f54a692e512bbb15..7cead8e57f1f92f83330278a507ffda6aaa779c6 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -46,7 +46,11 @@
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 

+#ifdef HAVE_FFI_FFI_H
+#include <ffi/ffi.h>
+#else

 #include <ffi.h>
 #include <ffi.h>

+#endif

 
 extern JSStringRef Array_s;
 extern JSStringRef cy_s;
 
 extern JSStringRef Array_s;
 extern JSStringRef cy_s;


@@ -59,13 +63,15 @@ extern JSStringRef push_s;
 extern JSStringRef splice_s;
 extern JSStringRef toCYON_s;
 extern JSStringRef toJSON_s;
 extern JSStringRef splice_s;
 extern JSStringRef toCYON_s;
 extern JSStringRef toJSON_s;

+extern JSStringRef toPointer_s;
+extern JSStringRef toString_s;

 
 void CYInitializeDynamic();
 JSGlobalContextRef CYGetJSContext();
 JSObjectRef CYGetGlobalObject(JSContextRef context);
 
 extern "C" void CYSetupContext(JSGlobalContextRef context);
 
 void CYInitializeDynamic();
 JSGlobalContextRef CYGetJSContext();
 JSObjectRef CYGetGlobalObject(JSContextRef context);
 
 extern "C" void CYSetupContext(JSGlobalContextRef context);

-const char *CYExecute(apr_pool_t *pool, const char *code);
+const char *CYExecute(apr_pool_t *pool, CYUTF8String code);

 
 void CYSetArgs(int argc, const char *argv[]);
 
 
 void CYSetArgs(int argc, const char *argv[]);