X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_object.c;h=444516f53c450becab9bbdd728ca3c15c0b8697e;hb=5178ff512e676873a875cff22f65468d2d325fde;hp=5987681a73d2dcbaa7bfbe39782dfe2d62a7eb7b;hpb=2acce3eb2d1815e2882608da632c3fd5614b389c;p=m6w6%2Fext-http diff --git a/http_request_object.c b/http_request_object.c index 5987681..444516f 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -19,16 +19,10 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#ifdef HTTP_HAVE_CURL -# ifdef PHP_WIN32 -# include -# endif -# include -#endif - #include "php.h" +#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) + #include "php_http_std_defs.h" #include "php_http_request_object.h" #include "php_http_request_api.h" @@ -38,8 +32,10 @@ #include "php_http_message_api.h" #include "php_http_message_object.h" -#ifdef ZEND_ENGINE_2 -#ifdef HTTP_HAVE_CURL +#ifdef PHP_WIN32 +# include +#endif +#include #define http_request_object_declare_default_properties() _http_request_object_declare_default_properties(TSRMLS_C) static inline void _http_request_object_declare_default_properties(TSRMLS_D); @@ -330,8 +326,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this return FAILURE; } -#endif /* HTTP_HAVE_CURL */ -#endif /* ZEND_ENGINE_2 */ +#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */ /* * Local variables: