Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_info.h

diff --git a/php_http_info.h b/php_http_info.h
index b771c5cc40912cf0e0798e6f5119e8e18dc85b61..8a52ee2df19adf543a89e0be0b6adab47e42ed8a 100644 (file)
--- a/php_http_info.h
+++ b/php_http_info.h
@@ -41,6 +41,8 @@ typedef struct php_http_info_data {
        php_http_version_t version;
 } php_http_info_data_t;
 
        php_http_version_t version;
 } php_http_info_data_t;
 

+#undef PHP_HTTP_REQUEST
+#undef PHP_HTTP_RESPONSE

 typedef enum php_http_info_type {
        PHP_HTTP_NONE = 0,
        PHP_HTTP_REQUEST,
 typedef enum php_http_info_type {
        PHP_HTTP_NONE = 0,
        PHP_HTTP_REQUEST,