diff options
| author | Xinchen Hui <laruence@php.net> | 2013-10-27 16:53:13 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-10-27 16:53:13 +0800 |
| commit | a3bd4fda09e3385809fff6355ed12fb82b175124 (patch) | |
| tree | 38c47816d3191eefcce8851ea57b00996b81cbc2 | |
| parent | 70c3a722e2561cb33d408f3c65e58f9468d2f667 (diff) | |
| parent | 9b399be77877881f4d6eaf4ebbf23ad180ecd6ee (diff) | |
| download | php-git-a3bd4fda09e3385809fff6355ed12fb82b175124.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | ext/phar/dirstream.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index c29ca9d968..98af1bffc2 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -168,11 +168,7 @@ static int phar_compare_dir_name(const void *a, const void *b TSRMLS_DC) /* {{{ f = *((Bucket **) a); s = *((Bucket **) b); -#if (PHP_MAJOR_VERSION < 6) result = zend_binary_strcmp(f->arKey, f->nKeyLength, s->arKey, s->nKeyLength); -#else - result = zend_binary_strcmp(f->key.arKey.s, f->nKeyLength, s->key.arKey.s, s->nKeyLength); -#endif if (result < 0) { return -1; |