cvs: pecl /kakasi kakasi.c
| From: | Moriyoshi Koizumi | Date: | Sun, 10 Aug 2003 00:28:51 +0000 |
| Subject: | cvs: pecl /kakasi kakasi.c | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-408@lists.php.net to get a copy of this message | ||
moriyoshi Sat Aug 9 20:28:51 2003 EDT
Modified files:
/pecl/kakasi kakasi.c
Log:
- Fix ZTS build
Index: pecl/kakasi/kakasi.c
diff -u pecl/kakasi/kakasi.c:1.1 pecl/kakasi/kakasi.c:1.2
--- pecl/kakasi/kakasi.c:1.1 Wed Jan 9 04:10:31 2002
+++ pecl/kakasi/kakasi.c Sat Aug 9 20:28:51 2003
@@ -14,7 +14,7 @@
2001/12/3 Release 0.3.0
*/
-/* $Id: kakasi.c,v 1.1 2002/01/09 09:10:31 yohgaki Exp $ */
+/* $Id: kakasi.c,v 1.2 2003/08/10 00:28:51 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -170,7 +170,7 @@
/* }}} */
-static int php_kakasi_array_compare(const void *a, const void *b)
+static int php_kakasi_array_compare(const void *a, const void *b TSRMLS_DC)
{
Bucket *f;
Bucket *s;
@@ -209,9 +209,9 @@
return res;
}
-static int php_kakasi_reverse_array_compare(const void *a, const void *b)
+static int php_kakasi_reverse_array_compare(const void *a, const void *b TSRMLS_DC)
{
- return php_kakasi_array_compare(a,b)*-1;
+ return -php_kakasi_array_compare(a,b TSRMLS_CC);
}
@@ -239,7 +239,7 @@
php_kakasi_unlock();
return;
}
- if (zend_hash_sort(target_hash, qsort, php_kakasi_array_compare, 0) == FAILURE) {
+ if (zend_hash_sort(target_hash, zend_qsort, (compare_func_t)php_kakasi_array_compare, 0 TSRMLS_CC)
== FAILURE) {
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -274,7 +274,7 @@
php_kakasi_unlock();
RETURN_FALSE;
}
- if (zend_hash_sort(target_hash, qsort, php_kakasi_reverse_array_compare, 0) == FAILURE) {
+ if (zend_hash_sort(target_hash, zend_qsort, (compare_func_t)php_kakasi_reverse_array_compare, 0
TSRMLS_CC) == FAILURE) {
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -438,7 +438,7 @@
php_kakasi_unlock();
return;
}
- if (zend_hash_sort(target_hash, qsort, php_kakasi_ignorecase_array_compare, 0) == FAILURE) {
+ if (zend_hash_sort(target_hash, zend_qsort, (compare_func_t)php_kakasi_ignorecase_array_compare, 0
TSRMLS_CC) == FAILURE) {
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -473,7 +473,7 @@
php_kakasi_unlock();
RETURN_FALSE;
}
- if (zend_hash_sort(target_hash, qsort, php_kakasi_reverse_ignorecase_array_compare, 0) == FAILURE)
{
+ if (zend_hash_sort(target_hash, zend_qsort,
(compare_func_t)php_kakasi_reverse_ignorecase_array_compare, 0 TSRMLS_CC) == FAILURE) {
RETVAL_FALSE;
} else {
RETVAL_TRUE;