Fixed non-CY_ATTACH builds.

diff --git a/Handler.mm b/Handler.mm
index 016f0c8bc1aeebde97ae18728534800041cc5754..2a42ef0893fd920e5c76f809bd34576a38606284 100644 (file)
--- a/Handler.mm
+++ b/Handler.mm
@@ -151,3 +151,24 @@ extern "C" void CYHandleClient(apr_pool_t *pool, int socket) {
     _aprcall(apr_threadattr_create(&attr, client->pool_));
     _aprcall(apr_thread_create(&client->thread_, attr, &OnClient, client, client->pool_));
 }
+
+extern "C" void CYHandleServer(pid_t pid) {
+    CYInitialize();
+
+    int socket(_syscall(::socket(PF_UNIX, SOCK_STREAM, 0))); try {
+        struct sockaddr_un address;
+        memset(&address, 0, sizeof(address));
+        address.sun_family = AF_UNIX;
+        sprintf(address.sun_path, "/tmp/.s.cy.%u", pid);
+
+        _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
+
+        apr_pool_t *pool;
+        apr_pool_create(&pool, NULL);
+
+        CYHandleClient(pool, socket);
+    } catch (const CYException &error) {
+        CYPool pool;
+        fprintf(stderr, "%s\n", error.PoolCString(pool));
+    }
+}

diff --git a/Library.cpp b/Library.cpp
index 4cccc06a6e401d54ebfdddb172c71aa33ac8843a..34763fb94afae3f24773720bffc081175c960f16 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -1454,27 +1454,6 @@ CYJSError::CYJSError(JSContextRef context, const char *format, ...) {
     CYThrow(context, exception);
 }
 
-extern "C" void CYHandleServer(pid_t pid) {
-    CYInitialize();
-
-    int socket(_syscall(::socket(PF_UNIX, SOCK_STREAM, 0))); try {
-        struct sockaddr_un address;
-        memset(&address, 0, sizeof(address));
-        address.sun_family = AF_UNIX;
-        sprintf(address.sun_path, "/tmp/.s.cy.%u", pid);
-
-        _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
-
-        apr_pool_t *pool;
-        apr_pool_create(&pool, NULL);
-
-        CYHandleClient(pool, socket);
-    } catch (const CYException &error) {
-        CYPool pool;
-        fprintf(stderr, "%s\n", error.PoolCString(pool));
-    }
-}
-
 JSGlobalContextRef CYGetJSContext() {
     CYInitialize();
 

diff --git a/cycript.hpp b/cycript.hpp
index 3e38a0f8f6ad8c6a90a5a09dbfdd63372ac6f90f..ec8cc821ff2ccdadd46affcb51c5c27db62ca88f 100644 (file)
--- a/cycript.hpp
+++ b/cycript.hpp
@@ -51,6 +51,8 @@
 
 #include <sqlite3.h>
 
+void CYInitialize();
+
 bool CYRecvAll_(int socket, uint8_t *data, size_t size);
 bool CYSendAll_(int socket, const uint8_t *data, size_t size);