ox 2.0.11 → 2.0.12

data/ext/ox/extconf.rb

@@ -6,6 +6,7 @@ dir_config(extension_name)
 parts = RUBY_DESCRIPTION.split(' ')
 type = parts[0].downcase()
 type = 'ree' if 'ruby' == type && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
+is_windows = RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
 platform = RUBY_PLATFORM
 version = RUBY_VERSION.split('.')
 puts ">>>>> Creating Makefile for #{type} version #{RUBY_VERSION} on #{platform} <<<<<"
@@ -28,7 +29,7 @@ dflags = {
   'HAS_PRIVATE_ENCODING' => ('jruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
   'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type) ? 1 : 0,
-  'HAS_IVAR_HELPERS' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
+  'HAS_IVAR_HELPERS' => ('ruby' == type && !is_windows && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
   'HAS_PROC_WITH_BLOCK' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_GC_GUARD' => ('jruby' != type && 'rubinius' != type) ? 1 : 0,
   'HAS_BIGDECIMAL' => ('jruby' != type) ? 1 : 0,

data/ext/ox/sax.c

@@ -85,20 +85,6 @@ static Nv		hint_try_close(SaxDrive dr, const char *name);
 
 VALUE	ox_sax_value_class = Qnil;
 
-/* This is only for CentOS 5.4 with Ruby 1.9.3-p0 and for OS X 10.6 and Solaris 10. */
-#ifdef NEEDS_STPCPY
-char *stpncpy(char *dest, const char *src, size_t n) {
-    size_t	cnt = strlen(src) + 1;
-
-    if (n < cnt) {
-	cnt = n;
-    }
-    strncpy(dest, src, cnt);
-
-    return dest + cnt - 1;
-}
-#endif
-
 static VALUE protect_parse(VALUE drp) {
     parse((SaxDrive)drp);
 

data/ext/ox/sax_buf.c

@@ -243,6 +243,19 @@ read_from_fd(Buf buf) {
 }
 #endif
 
+static char*
+ox_stpncpy(char *dest, const char *src, size_t n) {
+    size_t	cnt = strlen(src) + 1;
+
+    if (n < cnt) {
+	cnt = n;
+    }
+    strncpy(dest, src, cnt);
+
+    return dest + cnt - 1;
+}
+
+
 static int
 read_from_str(Buf buf) {
     size_t      max = buf->end - buf->tail - 1;
@@ -253,7 +266,7 @@ read_from_str(Buf buf) {
 	/* done */
 	return -1;
     }
-    s = stpncpy(buf->tail, buf->in_str, max);
+    s = ox_stpncpy(buf->tail, buf->in_str, max);
     *s = '\0';
     cnt = s - buf->tail;
     buf->in_str += cnt;

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module. 
-  VERSION = '2.0.11'
+  VERSION = '2.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies: []
 description: "A fast XML parser and object serializer that uses only standard C lib.\n
   \           \nOptimized XML (Ox), as the name implies was written to provide speed