From: Gisle Vanem <gvanem@broadpark.no>
Date: Fri, 4 Aug 2006 16:10:48 +0000 (+0000)
Subject: Added version info for iconv.
X-Git-Tag: upstream/7.37.1~10126
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cca00a63781934492caa8b46f8a9e56035a6e6fe;p=platform%2Fupstream%2Fcurl.git

Added version info for iconv.
---

diff --git a/lib/version.c b/lib/version.c
index 6cf5eb5..46f3ff0 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -41,6 +41,9 @@
 #include <stringprep.h>
 #endif
 
+#if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS)
+#include <iconv.h>
+#endif
 
 char *curl_version(void)
 {
@@ -74,6 +77,12 @@ char *curl_version(void)
     ptr += len;
   }
 #endif
+#if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS)
+  len = snprintf(ptr, left, " iconv/%d.%d",
+                 _libiconv_version >> 8, _libiconv_version & 255);
+  left -= len;
+  ptr += len;
+#endif
 
   return version;
 }
@@ -164,6 +173,7 @@ static curl_version_info_data version_info = {
   NULL, /* c-ares version */
   0,    /* c-ares version numerical */
   NULL, /* libidn version */
+  0,    /* iconv version */
 };
 
 curl_version_info_data *curl_version_info(CURLversion stamp)
@@ -192,6 +202,11 @@ curl_version_info_data *curl_version_info(CURLversion stamp)
   if(version_info.libidn)
     version_info.features |= CURL_VERSION_IDN;
 #endif
+
+#if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS)
+  version_info.iconv_ver_num = _libiconv_version;
+#endif
+
   (void)stamp; /* avoid compiler warnings, we don't use this */
 
   return &version_info;