aboutsummaryrefslogtreecommitdiffstats
path: root/ext/iconv/iconv.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-30 21:47:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-30 21:47:35 +0000
commitef84b7c67898646394e4cef8fd475cb652f2f0ca (patch)
tree50693a213c108b91ff05f8dcb9704d31ffd76955 /ext/iconv/iconv.c
parent72969cd348ac6f00bbe71ad63120db0114b35367 (diff)
downloadruby-ef84b7c67898646394e4cef8fd475cb652f2f0ca.tar.gz
* ext/dl/cptr.c (rb_dlptr_new2): remove unused variable.
* ext/iconv/iconv.c (get_iconv_opt_i): ditto. * ext/syck/token.c (Plain): fix types on LP64. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/iconv/iconv.c')
-rw-r--r--ext/iconv/iconv.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 531745c38d..125e82d624 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -563,13 +563,17 @@ iconv_s_allocate(VALUE klass)
static VALUE
get_iconv_opt_i(VALUE i, VALUE arg)
{
+ VALUE name;
+#if defined ICONV_SET_TRANSLITERATE || defined ICONV_SET_DISCARD_ILSEQ
+ VALUE val;
struct rb_iconv_opt_t *opt = (struct rb_iconv_opt_t *)arg;
- VALUE name, val;
+#endif
- (void)opt;
i = rb_Array(i);
name = rb_ary_entry(i, 0);
+#if defined ICONV_SET_TRANSLITERATE || defined ICONV_SET_DISCARD_ILSEQ
val = rb_ary_entry(i, 1);
+#endif
do {
if (SYMBOL_P(name)) {
ID id = SYM2ID(name);