com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_API.c Zend/zend_types.h
| From: | Anatol Belski | Date: | Mon, 15 Dec 2014 06:13:09 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_API.c Zend/zend_types.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83713@lists.php.net to get a copy of this message | ||
Commit: 61f90fbe0b5c20420661642085a13e596c8883e9
Author: Anatol Belski <ab@php.net> Mon, 15 Dec 2014 07:13:09 +0100
Parents: 5ff59f986c2037efa9d2af2d97e274078748450c 8f177fde907b632f7951f4939012bf1da4c77d15
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=61f90fbe0b5c20420661642085a13e596c8883e9
Log:
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Save 8 bytes on 64 bits
Conflicts:
Zend/zend_API.c
Changed paths:
MM Zend/zend_API.c
MM Zend/zend_types.h
Diff:
diff --cc Zend/zend_API.c
index d00854f,74679c4..f62fab1
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -1882,8 -1884,7 +1882,7 @@@ static int zend_startup_module_zval(zva
}
/* }}} */
-
-static void zend_sort_modules(void *base, size_t count, size_t siz, compare_func_t compare
TSRMLS_DC) /* {{{ */
+static void zend_sort_modules(void *base, size_t count, size_t siz, compare_func_t compare) /* {{{
*/
{
Bucket *b1 = base;
Bucket *b2;