diff options
| author | Xinchen Hui <laruence@php.net> | 2013-10-27 16:53:35 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-10-27 16:53:35 +0800 |
| commit | 7fe370f9c7db46f3dd97e93b84e84300d95de0fb (patch) | |
| tree | c3faca810f6ab7e4192dd13b865922c613904890 | |
| parent | dfe4b15b8e8932ce3c49b670ca2e59e70ebc0055 (diff) | |
| parent | a3bd4fda09e3385809fff6355ed12fb82b175124 (diff) | |
| download | php-git-7fe370f9c7db46f3dd97e93b84e84300d95de0fb.tar.gz | |
Merge branch '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 62b19a79d9..0f2580000d 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -160,11 +160,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; |