diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/standard/versioning.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/standard/versioning.c')
| -rw-r--r-- | ext/standard/versioning.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/versioning.c b/ext/standard/versioning.c index 9eb3829a08..e6f5e480ae 100644 --- a/ext/standard/versioning.c +++ b/ext/standard/versioning.c @@ -211,7 +211,7 @@ php_version_compare(const char *orig_ver1, const char *orig_ver2) PHP_FUNCTION(version_compare) { char *v1, *v2, *op = NULL; - int v1_len, v2_len, op_len = 0; + size_t v1_len, v2_len, op_len = 0; int compare, argc; argc = ZEND_NUM_ARGS(); |