summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2015-01-30 20:04:04 +0100
committerMichael Wallner <mike@php.net>2015-01-30 20:04:04 +0100
commitb72b4084a5fca22a195720441cdd15ad2c767a5c (patch)
tree400ebc3eb28939bf303da683699e512a2ebc179d
parentf6508f9fa2b10747c4176c007cbe4e14297c09a3 (diff)
downloadphp-git-b72b4084a5fca22a195720441cdd15ad2c767a5c.tar.gz
fix warnings
-rw-r--r--ext/iconv/iconv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 486f65d622..b9fb10bdec 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1338,7 +1338,9 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fn
ini_in_p = in_p;
for (out_size = (char_cnt - 2) / 3; out_size > 0;) {
+#if !ICONV_SUPPORTS_ERRNO
size_t prev_out_left;
+#endif
nbytes_required = 0;
@@ -1374,8 +1376,9 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fn
}
#endif
}
-
+#if !ICONV_SUPPORTS_ERRNO
prev_out_left = out_left;
+#endif
if (iconv(cd, NULL, NULL, (char **) &out_p, &out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
if (errno != E2BIG) {