diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-09 07:45:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-09 07:45:54 +0000 |
| commit | ad5b3bac0fc0de92edc42b21ec922e3f19a2a4e7 (patch) | |
| tree | d0674ddfaca042b5aafb56cc4c897599066653d7 /ext/iconv | |
| parent | bf50186080510bc77e4c7b6c8732961e8741f91d (diff) | |
* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
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
Diffstat (limited to 'ext/iconv')
| -rw-r--r-- | ext/iconv/extconf.rb | 4 | ||||
| -rw-r--r-- | ext/iconv/iconv.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb index 65ea327950..62adb7a6b6 100644 --- a/ext/iconv/extconf.rb +++ b/ext/iconv/extconf.rb @@ -21,9 +21,7 @@ if have_func("iconv", "iconv.h") or /\bconst\b/ =~ second end end - $defs.push('-DICONV_INPTR_CAST=""') - else - $defs.push('-DICONV_INPTR_CAST="(char **)"') + $defs.push('-DICONV_INPTR_CONST') end if conf prefix = '$(srcdir)' diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 65dd07f7de..5715b8fbde 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -243,6 +243,11 @@ iconv_try size_t *outlen; #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); if (ret == (size_t)-1) { if (!*inlen) |