Fix issue in 64-bit choose() reported by heardrwt.

[cycript.git] / cycript.hpp

diff --git a/cycript.hpp b/cycript.hpp
index e9284e787f599fa39b79d3d60649620a8a4daebb..d0fcaf65e5561af908affb25a938998d3f34789c 100644 (file)
--- a/cycript.hpp
+++ b/cycript.hpp
@@ -22,13 +22,10 @@
 #ifndef CYCRIPT_HPP
 #define CYCRIPT_HPP
 
-#include <apr_pools.h>
 #include <sig/types.hpp>
 #include <sstream>
 
-#include "String.hpp"
-
-void CYInitializeStatic();
+#include "Pooling.hpp"
 
 bool CYRecvAll_(int socket, uint8_t *data, size_t size);
 bool CYSendAll_(int socket, const uint8_t *data, size_t size);
@@ -39,7 +36,7 @@ void CYStringify(std::ostringstream &str, const char *data, size_t size);
 double CYCastDouble(const char *value, size_t size);
 double CYCastDouble(const char *value);
 
-extern "C" void CYHandleClient(apr_pool_t *pool, int socket);
+extern "C" void CYHandleClient(int socket);
 
 template <typename Type_>
 bool CYRecvAll(int socket, Type_ *data, size_t size) {
@@ -51,6 +48,6 @@ bool CYSendAll(int socket, const Type_ *data, size_t size) {
     return CYSendAll_(socket, reinterpret_cast<const uint8_t *>(data), size);
 }
 
-apr_pool_t *CYGetGlobalPool();
+CYPool &CYGetGlobalPool();
 
 #endif/*CYCRIPT_HPP*/