Merge branch 'R_2_5'

[m6w6/ext-http] / src / php_http_info.h

diff --git a/src/php_http_info.h b/src/php_http_info.h
index 4f02908446b6c0c430eb6bb39269f45967500b00..8a52ee2df19adf543a89e0be0b6adab47e42ed8a 100644 (file)
--- a/src/php_http_info.h
+++ b/src/php_http_info.h
@@ -41,6 +41,8 @@ typedef struct php_http_info_data {
        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,
@@ -56,10 +58,10 @@ typedef struct php_http_info {
        PHP_HTTP_INFO_IMPL(http, type)
 } php_http_info_t;
 
-typedef zend_bool (*php_http_info_callback_t)(void **callback_data, HashTable **headers, php_http_info_t *info TSRMLS_DC);
+typedef zend_bool (*php_http_info_callback_t)(void **callback_data, HashTable **headers, php_http_info_t *info);
 
-PHP_HTTP_API php_http_info_t *php_http_info_init(php_http_info_t *info TSRMLS_DC);
-PHP_HTTP_API php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header TSRMLS_DC);
+PHP_HTTP_API php_http_info_t *php_http_info_init(php_http_info_t *info);
+PHP_HTTP_API php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header);
 PHP_HTTP_API void php_http_info_dtor(php_http_info_t *info);
 PHP_HTTP_API void php_http_info_free(php_http_info_t **info);