diff options
| author | Xinchen Hui <laruence@php.net> | 2014-08-22 10:20:44 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-08-22 10:20:44 +0800 |
| commit | da35db3ec5fc4b27087292c067a6ea1d0f77bf8f (patch) | |
| tree | 6566e0d3dec4aa2e2c39697d465823b0395ca264 | |
| parent | 7fca659a7bd73a62c1f46ad04de995a6bfa1c994 (diff) | |
| download | php-git-da35db3ec5fc4b27087292c067a6ea1d0f77bf8f.tar.gz | |
Fixed complier errorPRE_64BIT_BRANCH_MERGE
| -rw-r--r-- | ext/iconv/iconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 39c5b314a8..3b9998ea19 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -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; |