fix bad merge; keys were serialized twice

[m6w6/ext-http] / php_http_etag.h

diff --git a/php_http_etag.h b/php_http_etag.h
index 899ec1c5af92fc211f9c45678aebd0e3651fd2ff..f208db7a48a685f1784adeaa52380a0da082e42f 100644 (file)
--- a/php_http_etag.h
+++ b/php_http_etag.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -16,13 +16,9 @@
 typedef struct php_http_etag {
        void *ctx;
        char *mode;
-
-#ifdef ZTS
-       void ***ts;
-#endif
 } php_http_etag_t;
 
-PHP_HTTP_API php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC);
+PHP_HTTP_API php_http_etag_t *php_http_etag_init(const char *mode);
 PHP_HTTP_API size_t php_http_etag_update(php_http_etag_t *e, const char *data_ptr, size_t data_len);
 PHP_HTTP_API char *php_http_etag_finish(php_http_etag_t *e);