svn: /pecl/apc/trunk/ apc_cache.c apc_cache.h php_apc.c
| From: | Kalle Sommer Nielsen | Date: | Tue, 22 Sep 2009 11:31:22 +0000 |
| Subject: | svn: /pecl/apc/trunk/ apc_cache.c apc_cache.h php_apc.c | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-12915@lists.php.net to get a copy of this message | ||
kalle Tue, 22 Sep 2009 11:31:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288560
Log:
Fix ZTS build
Changed paths:
U pecl/apc/trunk/apc_cache.c
U pecl/apc/trunk/apc_cache.h
U pecl/apc/trunk/php_apc.c
Modified: pecl/apc/trunk/apc_cache.c
===================================================================
--- pecl/apc/trunk/apc_cache.c 2009-09-22 10:22:35 UTC (rev 288559)
+++ pecl/apc/trunk/apc_cache.c 2009-09-22 11:31:22 UTC (rev 288560)
@@ -458,7 +458,7 @@
return 0;
}
- if(apc_cache_is_last_key(cache, &key, t)) {
+ if(apc_cache_is_last_key(cache, &key, t TSRMLS_CC)) {
/* potential cache slam */
return 0;
}
@@ -1138,7 +1138,7 @@
/* }}} */
/* {{{ apc_cache_is_last_key */
-zend_bool apc_cache_is_last_key(apc_cache_t* cache, apc_cache_key_t* key, time_t t)
+zend_bool apc_cache_is_last_key(apc_cache_t* cache, apc_cache_key_t* key, time_t t TSRMLS_DC)
{
apc_keyid_t *lastkey = &cache->header->lastkey;
unsigned int keylen = key->data.user.identifier_len+1;
Modified: pecl/apc/trunk/apc_cache.h
===================================================================
--- pecl/apc/trunk/apc_cache.h 2009-09-22 10:22:35 UTC (rev 288559)
+++ pecl/apc/trunk/apc_cache.h 2009-09-22 11:31:22 UTC (rev 288560)
@@ -356,7 +356,7 @@
extern zend_bool apc_cache_busy(apc_cache_t* cache);
extern zend_bool apc_cache_write_lock(apc_cache_t* cache);
extern void apc_cache_write_unlock(apc_cache_t* cache);
-extern zend_bool apc_cache_is_last_key(apc_cache_t* cache, apc_cache_key_t* key, time_t t);
+extern zend_bool apc_cache_is_last_key(apc_cache_t* cache, apc_cache_key_t* key, time_t t
TSRMLS_DC);
/* used by apc_rfc1867 to update data in-place - not to be used elsewhere */
Modified: pecl/apc/trunk/php_apc.c
===================================================================
--- pecl/apc/trunk/php_apc.c 2009-09-22 10:22:35 UTC (rev 288559)
+++ pecl/apc/trunk/php_apc.c 2009-09-22 11:31:22 UTC (rev 288560)
@@ -673,7 +673,7 @@
goto freepool;
}
- if (apc_cache_is_last_key(apc_user_cache, &key, t)) {
+ if (apc_cache_is_last_key(apc_user_cache, &key, t TSRMLS_CC)) {
goto freepool;
}