X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=712c8cb1aedc3f53ed52984db9fa6ef888f1083e;hp=9e0dc6ca69bc39fa7eb80263fbf78a24f56a378a;hb=630d4c9560cf7917d8ac18513d417765a94ba6cb;hpb=731b6a841374147b766c850b2a90c6bfade6f9f1

diff --git a/php_http_api.h b/php_http_api.h
index 9e0dc6c..712c8cb 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -58,17 +58,18 @@ typedef int STATUS;
 
 #ifdef PHP_WIN32
 #	define CURL_STATICLIB
-#	define PHP_HTTP_HAVE_NETDB
 #	include <winsock2.h>
-#elif defined(HAVE_NETDB_H)
-#	define PHP_HTTP_HAVE_NETDB
-#	include <netdb.h>
+#else
+#	ifdef HAVE_NETDB_H
+#		include <netdb.h>
+#	endif
 #	ifdef HAVE_UNISTD_H
 #		include <unistd.h>
 #	endif
-#	ifdef HAVE_ERRNO_H
-#		include <errno.h>
-#	endif
+#endif
+
+#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTYPE_H) && defined(HAVE_ISWALNUM) && (defined(HAVE_MBRTOWC) || defined(HAVE_MBTOWC))
+#	define PHP_HTTP_HAVE_WCHAR 1
 #endif
 
 #include <ctype.h>
@@ -78,7 +79,6 @@ typedef int STATUS;
 #include "php_http.h"
 
 #include "php_http_buffer.h"
-#include "php_http_strlist.h"
 #include "php_http_misc.h"
 #include "php_http_options.h"
 
@@ -111,9 +111,6 @@ typedef int STATUS;
 
 ZEND_BEGIN_MODULE_GLOBALS(php_http)
 	struct php_http_env_globals env;
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
-	struct php_http_curl_globals curl;
-#endif
 ZEND_END_MODULE_GLOBALS(php_http)
 
 ZEND_EXTERN_MODULE_GLOBALS(php_http);