Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_header_parser.h

diff --git a/php_http_header_parser.h b/php_http_header_parser.h
index ed9ecaf1af5b3f9db7769cc51f54da99da6bcbea..33707bd6fb5709ec5643fe950567e9747447bca5 100644 (file)
--- a/php_http_header_parser.h
+++ b/php_http_header_parser.h
@@ -38,12 +38,9 @@ typedef struct php_http_header_parser {
                char *str;
                size_t len;
        } _val;
-#ifdef ZTS
-       void ***ts;
-#endif
 } php_http_header_parser_t;
 
-PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser TSRMLS_DC);
+PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser);
 PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_push(php_http_header_parser_t *parser, unsigned argc, ...);
 PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_is(php_http_header_parser_t *parser);
 PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_pop(php_http_header_parser_t *parser);
@@ -53,19 +50,18 @@ PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_parse(php_htt
 PHP_HTTP_API php_http_header_parser_state_t php_http_headerparser_parse_stream(php_http_header_parser_t *parser, php_http_buffer_t *buffer, php_stream *s, unsigned flags, HashTable *headers, php_http_info_callback_t callback_func, void *callback_arg);
 
 typedef struct php_http_header_parser_object {
-       zend_object zo;
-       zend_object_value zv;
        php_http_buffer_t *buffer;
        php_http_header_parser_t *parser;
+       zend_object zo;
 } php_http_header_parser_object_t;
 
 PHP_HTTP_API zend_class_entry *php_http_header_parser_class_entry;
 
 PHP_MINIT_FUNCTION(http_header_parser);
 
-zend_object_value php_http_header_parser_object_new(zend_class_entry *ce TSRMLS_DC);
-zend_object_value php_http_header_parser_object_new_ex(zend_class_entry *ce, php_http_header_parser_t *parser, php_http_header_parser_object_t **ptr TSRMLS_DC);
-void php_http_header_parser_object_free(void *object TSRMLS_DC);
+zend_object *php_http_header_parser_object_new(zend_class_entry *ce);
+php_http_header_parser_object_t *php_http_header_parser_object_new_ex(zend_class_entry *ce, php_http_header_parser_t *parser);
+void php_http_header_parser_object_free(zend_object *object);
 
 #endif /* PHP_HTTP_HEADER_PARSER_H */