Further makefile reorganization, header file fixes, code movement, and general massag...

[cycript.git] / cycript.hpp

diff --git a/cycript.hpp b/cycript.hpp
index 0658f5df6cd21618dce657d1decbaa6d2b69a3ef..b789731e4da737ec508209cb4f491735489089b9 100644 (file)
--- a/cycript.hpp
+++ b/cycript.hpp
@@ -45,9 +45,8 @@
 #endif
 
 #include <JavaScriptCore/JavaScript.h>
-#include <JavaScriptCore/JSStringRefCF.h>
 
-#include <apr-1/apr_pools.h>
+#include <apr_pools.h>
 #include <ffi.h>
 
 #include <sig/types.hpp>
@@ -55,6 +54,8 @@
 bool CYRecvAll_(int socket, uint8_t *data, size_t size);
 bool CYSendAll_(int socket, const uint8_t *data, size_t size);
 
+extern "C" void CYHandleClient(apr_pool_t *pool, int socket);
+
 template <typename Type_>
 bool CYRecvAll(int socket, Type_ *data, size_t size) {
     return CYRecvAll_(socket, reinterpret_cast<uint8_t *>(data), size);
@@ -71,12 +72,4 @@ const char *CYExecute(apr_pool_t *pool, const char *code);
 
 void CYSetArgs(int argc, const char *argv[]);
 
-const char *CYPoolCYONString(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception);
-JSStringRef CYCopyJSString(const char *value);
-
-void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value);
-
-JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)());
-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
-
 #endif/*CYCRIPT_HPP*/