branch off v1 as R_1_7

[m6w6/ext-http] / php_http_cookie_api.h

diff --git a/php_http_cookie_api.h b/php_http_cookie_api.h
index c06e7ca897715d7f3c51ec30339eb8e939f99aca..bf07940bbeb74105e422b723b7010ecf7f3eba25 100644 (file)
--- a/php_http_cookie_api.h
+++ b/php_http_cookie_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -27,7 +27,7 @@ extern PHP_MINIT_FUNCTION(http_cookie);
        cookie params like those from rfc2109 and rfc2965 are just put into extras, if
        one specifies them in allowed extras, else they're treated like cookies themself
 */
-typedef struct {
+typedef struct _http_cookie_list_t {
        HashTable cookies;
        HashTable extras;
        long flags;
@@ -36,9 +36,9 @@ typedef struct {
        time_t expires;
 } http_cookie_list;
 
-#define http_cookie_list_new() _http_cookie_list_init(NULL TSRMLS_CC)
-#define http_cookie_list_init(l) _http_cookie_list_init((l) TSRMLS_CC)
-PHP_HTTP_API http_cookie_list *_http_cookie_list_init(http_cookie_list *list TSRMLS_DC);
+#define http_cookie_list_new() _http_cookie_list_init(NULL ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC)
+#define http_cookie_list_init(l) _http_cookie_list_init((l) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC)
+PHP_HTTP_API http_cookie_list *_http_cookie_list_init(http_cookie_list *list ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC);
 
 #define http_cookie_list_dtor(l) _http_cookie_list_dtor((l) TSRMLS_CC)
 PHP_HTTP_API void _http_cookie_list_dtor(http_cookie_list *list TSRMLS_DC);
@@ -68,6 +68,12 @@ PHP_HTTP_API http_cookie_list *_http_parse_cookie_ex(http_cookie_list * list, co
 #define http_cookie_list_tostruct(l, s) _http_cookie_list_tostruct((l), (s) TSRMLS_CC)
 PHP_HTTP_API void _http_cookie_list_tostruct(http_cookie_list *list, zval *strct TSRMLS_DC);
 
+#define http_cookie_list_fromstruct(l, s) _http_cookie_list_fromstruct((l), (s) TSRMLS_CC)
+PHP_HTTP_API http_cookie_list *_http_cookie_list_fromstruct(http_cookie_list *list, zval *strct TSRMLS_DC);
+
+#define http_cookie_list_tostring(l, str, len) _http_cookie_list_tostring((l), (str), (len) TSRMLS_CC)
+PHP_HTTP_API void _http_cookie_list_tostring(http_cookie_list *list, char **str, size_t *len TSRMLS_DC);
+
 #endif
 
 /*