Fixed non-CY_ATTACH builds.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index cccd69bb6e7f6ded3b714aa8bccdb69f8cd09130..34763fb94afae3f24773720bffc081175c960f16 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -61,6 +61,11 @@
 #include <sstream>
 #include <cmath>
 
 #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"
 
 #include "Parser.hpp"
 #include "Cycript.tab.hh"
 


@@ -1302,7 +1307,7 @@ static JSStaticFunction Type_staticFunctions[4] = {
     {NULL, NULL, 0}
 };
 
     {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());
 
 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;
         args[i] = CYCastJSValue(context, argv[i]);
 
     JSObjectRef array;

-    if ($JSObjectMakeArray != NULL) {
+    if (JSObjectMakeArray$ != NULL) {

         JSValueRef exception(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));
         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_));
 
     _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() {
 }
 
 apr_pool_t *CYGetGlobalPool() {