com php-src: fix "unknown void * size" err: Zend/zend_sort. c
| From: | Anatol Belski | Date: | Thu, 15 Jan 2015 10:18:38 +0000 |
| Subject: | com php-src: fix "unknown void * size" err: Zend/zend_sort. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84104@lists.php.net to get a copy of this message | ||
Commit: cdfafd3f3859a045ac22449932c5bd3eb0c03a6c
Author: Anatol Belski <ab@php.net> Thu, 15 Jan 2015 11:01:18 +0100
Parents: 11f615b3118f34dd8a118261d03c386d9dc0bbfd
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cdfafd3f3859a045ac22449932c5bd3eb0c03a6c
Log:
fix "unknown void * size" err
Changed paths:
M Zend/zend_sort.c
Diff:
diff --git a/Zend/zend_sort.c b/Zend/zend_sort.c
index f9f9682..22d0a16 100644
--- a/Zend/zend_sort.c
+++ b/Zend/zend_sort.c
@@ -157,16 +157,16 @@ ZEND_API void zend_insert_sort(void *base, size_t nmemb, size_t siz,
compare_fun
case 1:
break;
case 2:
- zend_sort_2(base, base + siz, cmp, swp);
+ zend_sort_2(base, (char *)base + siz, cmp, swp);
break;
case 3:
- zend_sort_3(base, base + siz, base + siz + siz, cmp, swp);
+ zend_sort_3(base, (char *)base + siz, (char *)base + siz + siz, cmp, swp);
break;
case 4:
- zend_sort_4(base, base + siz, base + siz + siz, base + siz + siz + siz, cmp, swp);
+ zend_sort_4(base, (char *)base + siz, (char *)base + siz + siz, (char *)base + siz + siz + siz,
cmp, swp);
break;
case 5:
- zend_sort_5(base, base + siz, base + siz + siz, base + siz + siz + siz, base + (siz * 4), cmp,
swp);
+ zend_sort_5(base, (char *)base + siz, (char *)base + siz + siz, (char *)base + siz + siz + siz,
(char *)base + (siz * 4), cmp, swp);
break;
default:
{