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

[cycript.git] / JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 9e9c85211df6648e070ebec9ce820506675eeb3f..7cead8e57f1f92f83330278a507ffda6aaa779c6 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -46,8 +46,11 @@
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 
+#ifdef HAVE_FFI_FFI_H
+#include <ffi/ffi.h>
+#else
 #include <ffi.h>
-#include <sqlite3.h>
+#endif
 
 extern JSStringRef Array_s;
 extern JSStringRef cy_s;
@@ -60,13 +63,15 @@ extern JSStringRef push_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);
-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[]);
 
@@ -134,8 +139,6 @@ struct CYHooks {
 
 extern struct CYHooks *hooks_;
 
-char *sqlite3_column_pooled(apr_pool_t *pool, sqlite3_stmt *stmt, int n);
-
 JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, sig::Type *type, ffi_type *ffi, JSObjectRef owner);
 
 void CYFinalize(JSObjectRef object);