mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/iconv/iconv.c (iconv_convert): append unchanged portion
after overflow. [ruby-dev:21006] * ext/iconv/extconf.rb: check if iconv() 2nd argument is const. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
252df14e6b
commit
5172e595c9
3 changed files with 24 additions and 1 deletions
|
|
@ -6,6 +6,20 @@ conf = File.exist?(File.join($srcdir, "config.charset"))
|
|||
conf = with_config("config-charset", enable_config("config-charset", conf))
|
||||
|
||||
if have_header("iconv.h")
|
||||
if !try_compile("", "-Werror") or checking_for("iconv() 2nd argument is const") do
|
||||
!try_compile('
|
||||
#include <iconv.h>
|
||||
size_t
|
||||
test(iconv_t cd, char **inptr, size_t *inlen, char **outptr, size_t *outlen)
|
||||
{
|
||||
return iconv(cd, inptr, inlen, outptr, outlen);
|
||||
}
|
||||
', "-Werror")
|
||||
end
|
||||
$defs.push('-DICONV_INPTR_CAST=""')
|
||||
else
|
||||
$defs.push('-DICONV_INPTR_CAST="(char **)"')
|
||||
end
|
||||
have_library("iconv")
|
||||
if conf
|
||||
prefix = '$(srcdir)'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue