kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta

Browse source 
characters in command line option.  fixed: [ruby-talk:155369]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-09-09 07:45:54 +00:00
parent bf50186080
commit ad5b3bac0f
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,8 +1,11 @@
Fri Sep 9 16:35:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Sep 9 16:45:25 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_times): make empty strings to keep taintness, * string.c (rb_str_times): make empty strings to keep taintness,
and a little improvement. [ruby-dev:26900] and a little improvement. [ruby-dev:26900]
* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
characters in command line option. fixed: [ruby-talk:155369]
Thu Sep 8 14:58:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org> Thu Sep 8 14:58:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* merged a patch from Takahiro Kambe <taca@back-street.net> to * merged a patch from Takahiro Kambe <taca@back-street.net> to

4
ext/iconv/extconf.rb
View file

@ -21,9 +21,7 @@ if have_func("iconv", "iconv.h") or
/\bconst\b/ =~ second /\bconst\b/ =~ second
end end
end end
$defs.push('-DICONV_INPTR_CAST=""') $defs.push('-DICONV_INPTR_CONST')
else
$defs.push('-DICONV_INPTR_CAST="(char **)"')
end end
if conf if conf
prefix = '$(srcdir)' prefix = '$(srcdir)'

5
ext/iconv/iconv.c
View file

@ -243,6 +243,11 @@ iconv_try
size_t *outlen; size_t *outlen;
#endif /* HAVE_PROTOTYPES */ #endif /* HAVE_PROTOTYPES */
{ {
#ifdef ICONV_INPTR_CONST
#define ICONV_INPTR_CAST
#else
#define ICONV_INPTR_CAST (char **)
#endif
size_t ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen); size_t ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
if (ret == (size_t)-1) { if (ret == (size_t)-1) {
if (!*inlen) if (!*inlen)