Merge pull request #629 from iwadon/fix-mswin64

Fix to build for x64-mswin64
sparklemotion · Mar 5, 2012 · f57469c · f57469c
2 parents 1ce1581 + ef1c76c
commit f57469c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ext/nokogiri/extconf.rb b/ext/nokogiri/extconf.rb
@@ -17,7 +17,7 @@
 $CFLAGS << " #{ENV["CFLAGS"]}"
 $LIBS << " #{ENV["LIBS"]}"
 
-if RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin32/
+if RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin/
   $CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
 elsif RbConfig::CONFIG['target_os'] =~ /solaris/
   $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
@@ -34,7 +34,7 @@
   $CFLAGS << " -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline"
 end
 
-if RbConfig::CONFIG['target_os'] =~ /mswin32/
+if RbConfig::CONFIG['target_os'] =~ /mswin/
   lib_prefix = 'lib'
 
   # There's no default include/lib dir on Windows. Let's just add the Ruby ones

diff --git a/ext/nokogiri/xml_document.c b/ext/nokogiri/xml_document.c
@@ -468,8 +468,6 @@ static VALUE canonicalize(int argc, VALUE* argv, VALUE self)
   xmlChar **ns;
   long ns_len, i;
 
-  rb_scan_args(argc, argv, "03", &mode, &incl_ns, &with_comments);
-
   xmlDocPtr doc;
   xmlOutputBufferPtr buf;
   xmlC14NIsVisibleCallback cb = NULL;
@@ -478,6 +476,8 @@ static VALUE canonicalize(int argc, VALUE* argv, VALUE self)
   VALUE rb_cStringIO;
   VALUE io;
 
+  rb_scan_args(argc, argv, "03", &mode, &incl_ns, &with_comments);
+
   Data_Get_Struct(self, xmlDoc, doc);
 
   rb_cStringIO = rb_const_get_at(rb_cObject, rb_intern("StringIO"));