]> granicus.if.org Git - php/commitdiff
Fixed complier error PRE_64BIT_BRANCH_MERGE
authorXinchen Hui <laruence@php.net>
Fri, 22 Aug 2014 02:20:44 +0000 (10:20 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 22 Aug 2014 02:20:44 +0000 (10:20 +0800)
ext/iconv/iconv.c

index 39c5b314a8f1c505f1f76abca1aab0479cfb562b..3b9998ea195b3acb2036675a737c35cc399546a5 100644 (file)
@@ -596,7 +596,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
        }
 
        if (out_left < 8) {
-               size_t pos = out_p - out_buffer;
+               size_t pos = out_p - out_buffer->val;
                out_buffer = STR_REALLOC(out_buffer, out_size + 8, 0);
                out_p = out_buffer->val + pos;
                out_size += 7;