← Back to branch summary

~ubuntu-branches/ubuntu/hardy/curl/hardy-updates

« back to all changes in this revision

Viewing changes to lib/version.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2006-10-30 10:56:48 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061030105648-uo8q8w9xklb40b4k
Tags: 7.15.5-1ubuntu1
* Merge from debian unstable. Remaining Ubuntu changes:
  - debian/control: Drop libdb4.2 build dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/version.c
18
18
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
19
19
 * KIND, either express or implied.
20
20
 *
21
 
 * $Id: version.c,v 1.48 2006-04-19 09:03:21 bagder Exp $
 
21
 * $Id: version.c,v 1.49 2006-08-04 16:10:48 giva Exp $
22
22
 ***************************************************************************/
23
23
 
24
24
#include "setup.h"
41
41
#include <stringprep.h>
42
42
#endif
43
43
 
 
44
#if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS)
 
45
#include <iconv.h>
 
46
#endif
44
47
 
45
48
char *curl_version(void)
46
49
{
74
77
    ptr += len;
75
78
  }
76
79
#endif
 
80
#if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS)
 
81
  len = snprintf(ptr, left, " iconv/%d.%d",
 
82
                 _libiconv_version >> 8, _libiconv_version & 255);
 
83
  left -= len;
 
84
  ptr += len;
 
85
#endif
77
86
 
78
87
  return version;
79
88
}
164
173
  NULL, /* c-ares version */
165
174
  0,    /* c-ares version numerical */
166
175
  NULL, /* libidn version */
 
176
  0,    /* iconv version */
167
177
};
168
178
 
169
179
curl_version_info_data *curl_version_info(CURLversion stamp)
192
202
  if(version_info.libidn)
193
203
    version_info.features |= CURL_VERSION_IDN;
194
204
#endif
 
205
 
 
206
#if defined(HAVE_ICONV) && defined(CURL_DOES_CONVERSIONS)
 
207
  version_info.iconv_ver_num = _libiconv_version;
 
208
#endif
 
209
 
195
210
  (void)stamp; /* avoid compiler warnings, we don't use this */
196
211
 
197
212
  return &version_info;