diff options
| author | Anatol Belski <ab@php.net> | 2014-12-15 07:13:09 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-15 07:13:09 +0100 |
| commit | 61f90fbe0b5c20420661642085a13e596c8883e9 (patch) | |
| tree | 499eeeaa48ef882a74a9ffb13a2f743eea4be47e /Zend/zend_API.c | |
| parent | 5ff59f986c2037efa9d2af2d97e274078748450c (diff) | |
| parent | 8f177fde907b632f7951f4939012bf1da4c77d15 (diff) | |
| download | php-git-61f90fbe0b5c20420661642085a13e596c8883e9.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Save 8 bytes on 64 bits
Conflicts:
Zend/zend_API.c
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index d00854f54a..f62fab1b87 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1882,7 +1882,6 @@ static int zend_startup_module_zval(zval *zv) /* {{{ */ } /* }}} */ - static void zend_sort_modules(void *base, size_t count, size_t siz, compare_func_t compare) /* {{{ */ { Bucket *b1 = base; |