moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Use '_LIBICONV_VERSION' instead of variable '_libiconv_version' 

to support older iconv versions.
This commit is contained in:
Gisle Vanem 2006-08-15 17:02:24 +00:00
parent ee3514ccdc
commit 31def9e217
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/version.c
View File

@ -78,8 +78,13 @@ char *curl_version(void)
} }
#endif #endif
#if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS) #if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS)
#ifdef _LIBICONV_VERSION
len = snprintf(ptr, left, " iconv/%d.%d", len = snprintf(ptr, left, " iconv/%d.%d",
_libiconv_version >> 8, _libiconv_version & 255); _LIBICONV_VERSION >> 8, _LIBICONV_VERSION & 255);
#else
/* version unknown */
len = snprintf(ptr, left, " iconv");
#endif /* _LIBICONV_VERSION */
left -= len; left -= len;
ptr += len; ptr += len;
#endif #endif
@ -204,7 +209,12 @@ curl_version_info_data *curl_version_info(CURLversion stamp)
#endif #endif
#if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS) #if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS)
version_info.iconv_ver_num = _libiconv_version; #ifdef _LIBICONV_VERSION
version_info.iconv_ver_num = _LIBICONV_VERSION;
#else
/* version unknown */
version_info.iconv_ver_num = -1;
#endif /* _LIBICONV_VERSION */
#endif #endif
(void)stamp; /* avoid compiler warnings, we don't use this */ (void)stamp; /* avoid compiler warnings, we don't use this */