iconv 1.0.0 → 1.0.1

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.swp
 .bundle
 .config
 .yardoc

data/ext/iconv/extconf.rb

@@ -5,9 +5,11 @@ dir_config("iconv")
 conf = File.exist?(File.join($srcdir, "config.charset"))
 conf = with_config("config-charset", enable_config("config-charset", conf))
 
+have_func("rb_enc_get", "ruby/encoding.h")
+have_func("st_lookup", "ruby/st.h")
 if have_func("iconv", "iconv.h") or
     have_library("iconv", "iconv", "iconv.h")
-  check_signedness("size_t")
+  check_signedness("size_t") rescue nil
   if checking_for("const of iconv() 2nd argument") do
       create_tmpsrc(cpp_include("iconv.h") + "---> iconv(cd,0,0,0,0) <---")
       src = xpopen(cpp_command("")) {|f|f.read}

data/ext/iconv/iconv.c

@@ -13,12 +13,18 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include <errno.h>
 #include <iconv.h>
 #include <assert.h>
+#ifdef HAVE_RUBY_ST_H
 #include "ruby/st.h"
+#else /* assume 1.8 */
+#include "st.h"
+#endif
+#ifdef HAVE_RUBY_ENCODING_H
 #include "ruby/encoding.h"
+#endif
 
 /*
  * Document-class: Iconv
@@ -932,6 +938,7 @@ iconv_iconv(int argc, VALUE *argv, VALUE self)
 	    length = NIL_P(n2) ? -1 : NUM2LONG(n2);
 	}
     }
+#ifdef HAVE_RUBY_ENCODING_H
     if (start > 0 || length > 0) {
 	rb_encoding *enc = rb_enc_get(str);
 	const char *s = RSTRING_PTR(str), *e = s + RSTRING_LEN(str);
@@ -943,6 +950,7 @@ iconv_iconv(int argc, VALUE *argv, VALUE self)
 	    length = rb_enc_nth(ps, e, length, enc) - ps;
 	}
     }
+#endif
 
     return iconv_convert(VALUE2ICONV(cd), str, start, length, ENCODING_GET(self), NULL);
 }

data/lib/iconv/version.rb

@@ -1,3 +1,3 @@
 class Iconv
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iconv
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -26,7 +26,6 @@ files:
 - README.md
 - Rakefile
 - ext/iconv/charset_alias.rb
-- ext/iconv/depend
 - ext/iconv/extconf.rb
 - ext/iconv/iconv.c
 - ext/iconv/mkwrapper.rb

data/ext/iconv/depend

@@ -1,2 +0,0 @@
-iconv.o: iconv.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
-  $(hdrdir)/st.h $(hdrdir)/intern.h $(hdrdir)/encoding.h