felipe Tue, 08 Dec 2009 01:51:34 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291848
Log:
- Fixed ZTS build
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.h
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.h
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c 2009-12-08
01:44:15 UTC (rev 291847)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c 2009-12-08
01:51:34 UTC (rev 291848)
@@ -590,17 +590,17 @@
}
/* }}} */
-CWD_API int realpath_cache_size()
+CWD_API int realpath_cache_size(TSRMLS_D)
{
return CWDG(realpath_cache_size);
}
-CWD_API int realpath_cache_max_buckets()
+CWD_API int realpath_cache_max_buckets(TSRMLS_D)
{
return (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
}
-CWD_API realpath_cache_bucket** realpath_cache_get_buckets()
+CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D)
{
return CWDG(realpath_cache);
}
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.h
===================================================================
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.h 2009-12-08
01:44:15 UTC (rev 291847)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.h 2009-12-08
01:51:34 UTC (rev 291848)
@@ -238,9 +238,9 @@
CWD_API void realpath_cache_clean(TSRMLS_D);
CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int
path_len, time_t t TSRMLS_DC);
-CWD_API int realpath_cache_size();
-CWD_API int realpath_cache_max_buckets();
-CWD_API realpath_cache_bucket** realpath_cache_get_buckets();
+CWD_API int realpath_cache_size(TSRMLS_D);
+CWD_API int realpath_cache_max_buckets(TSRMLS_D);
+CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
/* The actual macros to be used in programs using TSRM
* If the program defines VIRTUAL_DIR it will use the
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-12-08 01:44:15 UTC (rev
291847)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-12-08 01:51:34 UTC (rev
291848)
@@ -590,17 +590,17 @@
}
/* }}} */
-CWD_API int realpath_cache_size()
+CWD_API int realpath_cache_size(TSRMLS_D)
{
return CWDG(realpath_cache_size);
}
-CWD_API int realpath_cache_max_buckets()
+CWD_API int realpath_cache_max_buckets(TSRMLS_D)
{
return (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
}
-CWD_API realpath_cache_bucket** realpath_cache_get_buckets()
+CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D)
{
return CWDG(realpath_cache);
}
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.h
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.h 2009-12-08 01:44:15 UTC (rev
291847)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.h 2009-12-08 01:51:34 UTC (rev
291848)
@@ -255,9 +255,9 @@
CWD_API void realpath_cache_clean(TSRMLS_D);
CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int
path_len, time_t t TSRMLS_DC);
-CWD_API int realpath_cache_size();
-CWD_API int realpath_cache_max_buckets();
-CWD_API realpath_cache_bucket** realpath_cache_get_buckets();
+CWD_API int realpath_cache_size(TSRMLS_D);
+CWD_API int realpath_cache_max_buckets(TSRMLS_D);
+CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
/* The actual macros to be used in programs using TSRM
* If the program defines VIRTUAL_DIR it will use the
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
