- fix inclusion of zlib.h

[m6w6/ext-http] / php_http_requestpool_object.h

diff --git a/php_http_requestpool_object.h b/php_http_requestpool_object.h
index cd5914f85a3061b9caa73e1bd8f65733385cff61..c5af3be511b7c29bd488208e4a0050c9bd6b2fcc 100644 (file)
--- a/php_http_requestpool_object.h
+++ b/php_http_requestpool_object.h
@@ -17,14 +17,6 @@
 #ifdef HTTP_HAVE_CURL
 #ifdef ZEND_ENGINE_2
 
-#ifdef PHP_WIN32
-#      include <winsock2.h>
-#endif
-
-#include <curl/curl.h>
-
-#include "php_http_request_pool_api.h"
-
 typedef struct {
        zend_object zo;
        http_request_pool pool;
@@ -38,9 +30,9 @@ extern zend_function_entry http_requestpool_object_fe[];
 
 extern PHP_MINIT_FUNCTION(http_requestpool_object);
 
-#define http_requestpool_object_new _http_requestpool_object_new
+#define http_requestpool_object_new(ce) _http_requestpool_object_new(ce TSRMLS_CC)
 extern zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC);
-#define http_requestpool_object_free _http_requestpool_object_free
+#define http_requestpool_object_free(o) _http_requestpool_object_free(o TSRMLS_CC)
 extern void _http_requestpool_object_free(zend_object *object TSRMLS_DC);
 
 PHP_METHOD(HttpRequestPool, __construct);
@@ -56,6 +48,7 @@ PHP_METHOD(HttpRequestPool, current);
 PHP_METHOD(HttpRequestPool, key);
 PHP_METHOD(HttpRequestPool, next);
 PHP_METHOD(HttpRequestPool, rewind);
+PHP_METHOD(HttpRequestPool, count);
 PHP_METHOD(HttpRequestPool, getAttachedRequests);
 PHP_METHOD(HttpRequestPool, getFinishedRequests);