Fixed non-CY_ATTACH builds.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index d80978e35694949710702e3577e5ebc374226b9e..34763fb94afae3f24773720bffc081175c960f16 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -61,6 +61,11 @@
 #include <sstream>
 #include <cmath>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/un.h>
+
 #include "Parser.hpp"
 #include "Cycript.tab.hh"
 
@@ -145,7 +150,7 @@ _finline size_t iconv_(size_t (*iconv)(iconv_t, Type_, size_t *, char **, size_t
     return iconv(cd, const_cast<Type_>(inbuf), inbytesleft, outbuf, outbytesleft);
 }
 
-static CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
+CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
     _assert(pool != NULL);
 
     CYUTF16String utf16(CYCastUTF16String(value));
@@ -1302,7 +1307,7 @@ static JSStaticFunction Type_staticFunctions[4] = {
     {NULL, NULL, 0}
 };
 
-static JSObjectRef (*$JSObjectMakeArray)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
+static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
 
 void CYSetArgs(int argc, const char *argv[]) {
     JSContextRef context(CYGetJSContext());
@@ -1311,9 +1316,9 @@ void CYSetArgs(int argc, const char *argv[]) {
         args[i] = CYCastJSValue(context, argv[i]);
 
     JSObjectRef array;
-    if ($JSObjectMakeArray != NULL) {
+    if (JSObjectMakeArray$ != NULL) {
         JSValueRef exception(NULL);
-        array = (*$JSObjectMakeArray)(context, argc, args, &exception);
+        array = (*JSObjectMakeArray$)(context, argc, args, &exception);
         CYThrow(context, exception);
     } else {
         JSValueRef value(CYCallAsFunction(context, Array_, NULL, argc, args));
@@ -1382,7 +1387,7 @@ void CYInitialize() {
     _aprcall(apr_pool_create(&Pool_, NULL));
     _sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_));
 
-    $JSObjectMakeArray = reinterpret_cast<JSObjectRef (*)(JSContextRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(RTLD_DEFAULT, "JSObjectMakeArray"));
+    JSObjectMakeArray$ = reinterpret_cast<JSObjectRef (*)(JSContextRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(RTLD_DEFAULT, "JSObjectMakeArray"));
 }
 
 apr_pool_t *CYGetGlobalPool() {
@@ -1449,8 +1454,6 @@ CYJSError::CYJSError(JSContextRef context, const char *format, ...) {
     CYThrow(context, exception);
 }
 
-void CYObjectiveC(JSContextRef context, JSObjectRef global);
-
 JSGlobalContextRef CYGetJSContext() {
     CYInitialize();
 
@@ -1569,10 +1572,8 @@ JSGlobalContextRef CYGetJSContext() {
 
         Result_ = JSStringCreateWithUTF8CString("_");
 
-// XXX: this is very wrong and sad
-#ifdef __APPLE__
-        CYObjectiveC(context, global);
-#endif
+        if (hooks_ != NULL && hooks_->SetupContext != NULL)
+            (*hooks_->SetupContext)(context);
     }
 
     return Context_;