X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_curl_api.c;h=6e96940daf7ad77da0c906f18286d4a0ab9a4623;hb=2d5d8aa343778897c7eedb25464a2cb0a789d748;hp=9ee8afedb7401ca21427f20404d0561e857bd7e8;hpb=a268ede6ed45dc674906efd6fc8710012841e75e;p=m6w6%2Fext-http

diff --git a/http_curl_api.c b/http_curl_api.c
index 9ee8afe..6e96940 100644
--- a/http_curl_api.c
+++ b/http_curl_api.c
@@ -20,14 +20,10 @@
 #endif
 
 #ifdef PHP_WIN32
-#	define _WINSOCKAPI_
-#	define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 #	include <winsock2.h>
-#	include <sys/types.h>
 #endif
 
 #include <curl/curl.h>
-#include <curl/easy.h>
 
 #include "php.h"
 #include "php_http.h"
@@ -72,8 +68,6 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 		} \
 	}
 
-
-
 #define http_curl_cleanup(ch, clean_curl) \
 	http_curl_freestr(); \
 	http_curl_freebuf(); \
@@ -106,9 +100,9 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 	HTTP_G(curlbuf).size = 0;
 
 #define http_curl_copybuf(data, size) \
-	* size = HTTP_G(curlbuf).used; \
-	* data = ecalloc(1, HTTP_G(curlbuf).used + 1); \
-	memcpy(* data, HTTP_G(curlbuf).data, * size);
+	*size = HTTP_G(curlbuf).used; \
+	*data = ecalloc(1, HTTP_G(curlbuf).used + 1); \
+	memcpy(*data, HTTP_G(curlbuf).data, HTTP_G(curlbuf).used);
 
 #define http_curl_sizebuf(for_size) \
 	{ \