cvs: php-src /ext/date php_date.c php_date.h /ext/standard head.c

tony2001 Fri Jul 8 14:16:46 2005 EDT Modified files: /php-src/ext/standard head.c /php-src/ext/date php_date.c php_date.h Log: fix tsrm build http://cvs.php.net/diff.php/php-src/ext/standard/head.c?r1=1.82&r2=1.83&ty=u Index: php-src/ext/standard/head.c diff -u php-src/ext/standard/head.c:1.82 php-src/ext/standard/head.c:1.83 --- php-src/ext/standard/head.c:1.82 Fri Jul 8 12:17:04 2005 +++ php-src/ext/standard/head.c Fri Jul 8 14:16:46 2005 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.82 2005/07/08 16:17:04 iliaa Exp $ */ +/* $Id: head.c,v 1.83 2005/07/08 18:16:46 tony2001 Exp $ */ #include <stdio.h> #include "php.h" @@ -103,14 +103,14 @@ * pick an expiry date 1 year and 1 second in the past */ time_t t = time(NULL) - 31536001; - dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, d-M-Y H:i:s T")-1, t, 0); + dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, d-M-Y H:i:s T")-1, t, 0 TSRMLS_CC); sprintf(cookie, "Set-Cookie: %s=deleted; expires=%s", name, dt); efree(dt); } else { sprintf(cookie, "Set-Cookie: %s=%s", name, value ? encoded_value : ""); if (expires > 0) { strcat(cookie, "; expires="); - dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, d-M-Y H:i:s T")-1, expires, 0); + dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, d-M-Y H:i:s T")-1, expires, 0 TSRMLS_CC); strcat(cookie, dt); efree(dt); } http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.37&r2=1.38&ty=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.37 php-src/ext/date/php_date.c:1.38 --- php-src/ext/date/php_date.c:1.37 Fri Jul 8 08:26:30 2005 +++ php-src/ext/date/php_date.c Fri Jul 8 14:16:46 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.37 2005/07/08 12:26:30 tony2001 Exp $ */ +/* $Id: php_date.c,v 1.38 2005/07/08 18:16:46 tony2001 Exp $ */ #include "php.h" #include "php_streams.h" @@ -347,13 +347,13 @@ RETURN_FALSE; } - string = php_format_date(format, format_len, ts, localtime); + string = php_format_date(format, format_len, ts, localtime TSRMLS_CC); RETVAL_STRING(string, 0); } /* }}} */ -PHPAPI char *php_format_date(char *format, int format_len, long ts, int localtime) /* {{{ */ +PHPAPI char *php_format_date(char *format, int format_len, long ts, int localtime TSRMLS_DC) /* {{{ */ { timelib_time *t; timelib_tzinfo *tzi; http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.14&r2=1.15&ty=u Index: php-src/ext/date/php_date.h diff -u php-src/ext/date/php_date.h:1.14 php-src/ext/date/php_date.h:1.15 --- php-src/ext/date/php_date.h:1.14 Fri Jul 8 08:26:30 2005 +++ php-src/ext/date/php_date.h Fri Jul 8 14:16:46 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.h,v 1.14 2005/07/08 12:26:30 tony2001 Exp $ */ +/* $Id: php_date.h,v 1.15 2005/07/08 18:16:46 tony2001 Exp $ */ #ifndef PHP_DATE_H #define PHP_DATE_H @@ -69,6 +69,6 @@ #define _php_strftime php_strftime PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm); #endif -PHPAPI char *php_format_date(char *format, int format_len, long ts, int localtime); +PHPAPI char *php_format_date(char *format, int format_len, long ts, int localtime TSRMLS_DC); #endif /* PHP_DATE_H */