X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=5bddb0c42e670a69fe0bdc6049614b97953354f5;hp=42d34fca4bfc611f9c72dc942cfacbc1d070fcdc;hb=refs%2Fheads%2Fv2.2.x;hpb=87db9817d428282792c8146d9c2ae9748ebf6f1e diff --git a/php_http_api.h b/php_http_api.h index 42d34fc..5bddb0c 100644 --- a/php_http_api.h +++ b/php_http_api.h @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2013, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -58,17 +58,18 @@ typedef int STATUS; #ifdef PHP_WIN32 # define CURL_STATICLIB -# define PHP_HTTP_HAVE_NETDB # include -#elif defined(HAVE_NETDB_H) -# define PHP_HTTP_HAVE_NETDB -# include +#else +# ifdef HAVE_NETDB_H +# include +# endif # ifdef HAVE_UNISTD_H # include # endif -# ifdef HAVE_ERRNO_H -# include -# 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 @@ -111,9 +112,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);