libxml-ruby 2.6.0-x86-mingw32 → 2.7.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9f00d30d4338c5f2f9a8fe6c6949d1c665b377c8
-  data.tar.gz: 3af83672e51e8755109902a255a167f2b14f9875
-SHA512:
-  metadata.gz: f7fc9a7e582ddd9799d8217f48935bb5178f7657c9c919325207e93c66a104895e504aa2bb206f173c6e5f1a00db8a175f2fd56e77b00fc564c118072386f5eb
-  data.tar.gz: b56080583500c323c68bba174306bfad997046e1e9645e82db972b228c5191c4b6b8c53b1075130cb7ef1232533223f3adfae97604c3ff8e5867eebe8943c0bd
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjIzMWRiZWI5MWIzNmVmNmY3ZjUxZjc2MDU1YzNlZmY2MDZiNzJmMQ==
+  data.tar.gz: !binary |-
+    ZDQxNDZmZDU2ZmM4ZTUxMjk2NzE4NGYzN2E3ZWU1MmEwMjliNTY2MA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    Y2NkNjA3YzM3MjE3MDg1OWFlYjYwNWFiZTVjMzEzZWRkY2VlY2NiMjc2NjQ5
+    NWIzZjQ0YzNkM2FkZjk3Nzc3ZGVjNzlhNDZlMzBhMzQ0Mzc1NDI5MDc2ZTkz
+    NWNhZDMxY2JmNWU0ZGJmYzQ4MmQ2ZGU2NzllYmM1Y2MxNzk5NDY=
+  data.tar.gz: !binary |-
+    NWQ4ZDRlOWZkMzM3ZjhjMmYyZmQxZGQ3YThmZmRmNTMwNThmMTQ2YjhlYmFm
+    NmQwZmU1Y2EzY2NjYjc3NDkzNWFjOTFjNjQwZjAwMTk5ZTY2ZWM3NDA3MGU2
+    NzE4ZWYxZTkzY2UwZjZkMWVmOTQyMTdjMzI5NGJhMDgyMTEwZWY=

data/HISTORY

@@ -1,5 +1,19 @@
 = Release History
 
+== 2.7.0 / 2013-08-03 Charlie Savage
+
+* Do not call Ruby code during a GC cycle (Dirkjan Bussink)
+* Fix thread error handling (Geoffrey Giesemann)
+* Set libxml error handler when a libxml-ruby error handler is set (Geoffrey Giesemann)
+* Fix tests for nil TypeErrors (Geoffrey Giesemann)
+* Fix segmentation fault for issue #62.  The deregisternode function was incorrectly
+  NULLing out a node's mark and free functions for nodes removed from a document tree (Charlie Savage)
+* Cleanup writer code (Charlie Savage)
+* Fix equality check of LibXML::XML::Error against other objects (Michał Szajbe)
+* Fix XML::Writer.set_quote_char UT, wrong expected string (#63).  (julp)
+* Fix potential segfault when GC occurs while creating ns from xpath (Timothy Elliott)
+* Fix segmentation fault after failing to load external schema (#59).  (Clifford Heath)
+
 == 2.6.0 / 2013-02-16 Charlie Savage
 
 * Fix uninitialized constant LibXML::XML::Error::I18N (NameError) that occurred

data/ext/libxml/extconf.h

@@ -1,5 +1,5 @@
-#ifndef EXTCONF_H
-#define EXTCONF_H
-#define HAVE_ZLIB_H 1
-#define HAVE_LIBXML_XMLVERSION_H 1
-#endif
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_ZLIB_H 1
+#define HAVE_LIBXML_XMLVERSION_H 1
+#endif

data/ext/libxml/extconf.rb

@@ -4,17 +4,19 @@ require 'rbconfig'
 
 require 'mkmf'
 
-if defined?(CFLAGS)
-  if CFLAGS.index(CONFIG['CCDLFLAGS'])
-    $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
-  else
-    $CFLAGS = CFLAGS
-  end
-else
-  $CFLAGS = CONFIG['CFLAGS']
-end
-$LDFLAGS = CONFIG['LDFLAGS']
-$LIBPATH.push(Config::CONFIG['libdir'])
+#if defined?(CFLAGS)
+#  if CFLAGS.index(CONFIG['CCDLFLAGS'])
+#    $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
+#  else
+#    $CFLAGS = CFLAGS
+#  end
+#else
+#  $CFLAGS = CONFIG['CFLAGS']
+#end
+#$LDFLAGS = CONFIG['LDFLAGS']
+#$LDFLAGS = "-L/usr/local/lib"
+#$LIBPATH.push(Config::CONFIG['libdir'])
+$LDFLAGS = "-Lc:/mingw/local/lib"
 
 def crash(str)
   printf(" extconf failure: %s\n", str)

data/ext/libxml/ruby_libxml.h

@@ -58,6 +58,7 @@
 #include "ruby_xml_writer.h"
 #include "ruby_xml_sax2_handler.h"
 #include "ruby_xml_sax_parser.h"
+#include "ruby_xml_writer.h"
 #include "ruby_xml_xinclude.h"
 #include "ruby_xml_xpath.h"
 #include "ruby_xml_xpath_expression.h"

data/ext/libxml/ruby_xml_dtd.c

@@ -47,7 +47,6 @@ void rxml_dtd_mark(xmlDtdPtr xdtd)
 
   if (xdtd->_private == NULL)
   {
-    rb_warning("XmlNode is not bound! (%s:%d)", __FILE__, __LINE__);
     return;
   }
 
@@ -123,13 +122,25 @@ static VALUE rxml_dtd_uri_get(VALUE self)
   xmlDtdPtr xdtd;
   Data_Get_Struct(self, xmlDtd, xdtd);
 
-
   if (xdtd->SystemID == NULL)
     return (Qnil);
   else
     return (rxml_new_cstr((const char*) xdtd->SystemID, NULL));
 }
 
+/*
+ * call-seq:
+ *    node.type -> num
+ *
+ * Obtain this node's type identifier.
+ */
+static VALUE rxml_dtd_type(VALUE self)
+{
+  xmlDtdPtr xdtd;
+  Data_Get_Struct(self, xmlDtd, xdtd);
+  return (INT2NUM(xdtd->type));
+}
+
 /*
  * call-seq:
  *    XML::Dtd.new("DTD string") -> dtd
@@ -251,7 +262,7 @@ void rxml_init_dtd()
   rb_define_method(cXMLDtd, "external_id", rxml_dtd_external_id_get, 0);
   rb_define_method(cXMLDtd, "name", rxml_dtd_name_get, 0);
   rb_define_method(cXMLDtd, "uri", rxml_dtd_uri_get, 0);
-
+  rb_define_method(cXMLDtd, "node_type", rxml_dtd_type, 0);
   rb_define_alias(cXMLDtd, "system_id", "uri");
 }
 

data/ext/libxml/ruby_xml_error.c

@@ -37,15 +37,6 @@ static ID ERROR_HANDLER_ID;
  *   XML::Error.reset_handler
  */
 
-static void rxml_set_handler(VALUE self, VALUE block)
-{
-#ifdef RB_CVAR_SET_4ARGS
-  rb_cvar_set(self, ERROR_HANDLER_ID, block, 0);
-#else
-  rb_cvar_set(self, ERROR_HANDLER_ID, block);
-#endif
-}
-
 /*
  * call-seq:
  *    Error.get_error_handler
@@ -59,41 +50,6 @@ static VALUE rxml_error_get_handler()
   return block;
 }
 
-/*
- * call-seq:
- *    Error.set_error_handler {|error| ... }
- *
- * Registers a block that will be called with an instance of
- * XML::Error when libxml generates warning, error or fatal
- * error messages.
- */
-static VALUE rxml_error_set_handler(VALUE self)
-{
-  VALUE block;
-
-  if (rb_block_given_p() == Qfalse)
-    rb_raise(rb_eRuntimeError, "No block given");
-
-  block = rb_block_proc();
-
-  /* Embed the block within the Error class to avoid it to be collected.
-   Previous handler will be overwritten if it exists. */
-  rxml_set_handler(self, block);
-
-  return self;
-}
-
-/*
- * call-seq:
- *    Error.reset_error_handler
- *
- * Removes the current error handler. */
-static VALUE rxml_error_reset_handler(VALUE self)
-{
-  rxml_set_handler(self, Qnil);
-  return self;
-}
-
 VALUE rxml_error_wrap(xmlErrorPtr xerror)
 {
   VALUE result = Qnil;
@@ -155,6 +111,53 @@ static void structuredErrorFunc(void *userData, xmlErrorPtr xerror)
   }
 }
 
+static void rxml_set_handler(VALUE self, VALUE block)
+{
+#ifdef RB_CVAR_SET_4ARGS
+  rb_cvar_set(self, ERROR_HANDLER_ID, block, 0);
+#else
+  rb_cvar_set(self, ERROR_HANDLER_ID, block);
+#endif
+
+  /* Intercept libxml error handlers */
+  xmlSetStructuredErrorFunc(NULL, structuredErrorFunc);
+}
+
+/*
+ * call-seq:
+ *    Error.set_error_handler {|error| ... }
+ *
+ * Registers a block that will be called with an instance of
+ * XML::Error when libxml generates warning, error or fatal
+ * error messages.
+ */
+static VALUE rxml_error_set_handler(VALUE self)
+{
+  VALUE block;
+
+  if (rb_block_given_p() == Qfalse)
+    rb_raise(rb_eRuntimeError, "No block given");
+
+  block = rb_block_proc();
+
+  /* Embed the block within the Error class to avoid it to be collected.
+   Previous handler will be overwritten if it exists. */
+  rxml_set_handler(self, block);
+
+  return self;
+}
+
+/*
+ * call-seq:
+ *    Error.reset_error_handler
+ *
+ * Removes the current error handler. */
+static VALUE rxml_error_reset_handler(VALUE self)
+{
+  rxml_set_handler(self, Qnil);
+  return self;
+}
+
 void rxml_raise(xmlErrorPtr xerror)
 {
   /* Wrap error up as Ruby object and send it off to ruby */
@@ -167,9 +170,6 @@ void rxml_init_error()
   CALL_METHOD = rb_intern("call");
   ERROR_HANDLER_ID = rb_intern("@@__error_handler_callback__");
 
-  /* Intercept libxml error handlers */
-  xmlSetStructuredErrorFunc(NULL, structuredErrorFunc);
-
   /* Error class */
   eXMLError = rb_define_class_under(mXML, "Error", rb_eStandardError);
   rb_define_singleton_method(eXMLError, "get_handler", rxml_error_get_handler, 0);

data/ext/libxml/ruby_xml_node.c

@@ -46,7 +46,7 @@ static void rxml_node_deregisterNode(xmlNodePtr xnode)
   if (xnode->_private)
   {
     /* Node was wrapped.  Set the _private member to free and
-      then dislabe the dfree function so that Ruby will not
+      then disable the dfree function so that Ruby will not
       try to free the node a second time. */
     VALUE node = (VALUE) xnode->_private;
     RDATA(node)->data = NULL;
@@ -619,12 +619,12 @@ static VALUE rxml_node_to_s(int argc, VALUE *argv, VALUE self)
   xmlNodeDumpOutput(output, xnode->doc, xnode, level, indent, xencoding);
   xmlOutputBufferFlush(output);
 
-#ifdef LIBXML2_NEW_BUFFER
-  if (output->conv)
-    result = rxml_new_cstr((const char*) xmlBufContent(output->conv), xencoding);
-  else
-    result = rxml_new_cstr((const char*) xmlBufContent(output->buffer), xencoding);
-#else
+#ifdef LIBXML2_NEW_BUFFER
+  if (output->conv)
+    result = rxml_new_cstr((const char*) xmlBufContent(output->conv), xencoding);
+  else
+    result = rxml_new_cstr((const char*) xmlBufContent(output->buffer), xencoding);
+#else
   if (output->conv)
     result = rxml_new_cstr((const char*) output->conv->content, xencoding);
   else
@@ -1144,8 +1144,14 @@ static VALUE rxml_node_remove_ex(VALUE self)
      namespaces, etc.  For a node to live on its own, it
      needs to get its own copies of this information.*/
   xresult = xmlDocCopyNode(xnode, NULL, 1);
-  
-  /* Now free the original node. */
+
+  /* This ruby node object no longer points at the node.*/
+  xnode->_private = NULL;
+  RDATA(self)->data = NULL;
+
+  /* Now free the original node.  This will call the deregister node
+    callback which would reset the mark and free function except for 
+	the fact we set the _private field to null above*/
   xmlFreeNode(xnode);
 
   /* Now wrap the new node */

data/ext/libxml/ruby_xml_schema.c

@@ -89,6 +89,9 @@ static VALUE rxml_schema_init_from_document(VALUE class, VALUE document)
   xschema = xmlSchemaParse(xparser);
   xmlSchemaFreeParserCtxt(xparser);
 
+  if (xschema == NULL)
+    return Qnil;
+
   return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
 }
 

data/ext/libxml/ruby_xml_version.h

@@ -1,9 +1,9 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "2.6.0"
-#define RUBY_LIBXML_VERNUM   260
+#define RUBY_LIBXML_VERSION  "2.7.0"
+#define RUBY_LIBXML_VERNUM   270
 #define RUBY_LIBXML_VER_MAJ   2
-#define RUBY_LIBXML_VER_MIN   6
+#define RUBY_LIBXML_VER_MIN   7
 #define RUBY_LIBXML_VER_MIC   0
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/libxml/ruby_xml_writer.c

@@ -1,4 +1,8 @@
-#include <libxml/xmlversion.h>
+#include "ruby_libxml.h"
+#include "ruby_xml_writer.h"
+
+VALUE cXMLWriter;
+static VALUE sEncoding, sStandalone;
 
 #ifdef LIBXML_WRITER_ENABLED
 
@@ -12,13 +16,8 @@
  * For a more in depth tutorial, albeit in C, see http://xmlsoft.org/xmlwriter.html
  */
 
-# include <libxml/xmlwriter.h>
+#include <libxml/xmlwriter.h>
 
-# include "ruby_libxml.h"
-# include "ruby_xml_writer.h"
-
-VALUE cXMLWriter;
-static VALUE sEncoding, sStandalone;
 
 typedef enum {
     RXMLW_OUTPUT_NONE,
@@ -29,42 +28,42 @@ typedef enum {
 
 typedef struct {
     VALUE output;
-# ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
-# endif /* HAVE_RUBY_ENCODING_H */
+#endif /* HAVE_RUBY_ENCODING_H */
     xmlBufferPtr buffer;
     xmlTextWriterPtr writer;
     rxmlw_output_type output_type;
 } rxml_writer_object;
 
-# ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RUBY_ENCODING_H
 
-#  define /*VALUE*/ rxml_writer_c_to_ruby_string(/*const xmlChar **/ string, /*long*/ string_len) \
+#define /*VALUE*/ rxml_writer_c_to_ruby_string(/*const xmlChar **/ string, /*long*/ string_len) \
     rb_external_str_new_with_enc(string, string_len, rb_utf8_encoding())
 
-#  define /*VALUE*/ rxml_writer_ruby_string_to_utf8(/*VALUE*/ string) \
+#define /*VALUE*/ rxml_writer_ruby_string_to_utf8(/*VALUE*/ string) \
     rb_str_conv_enc(string, rb_enc_get(string), rb_utf8_encoding())
 // rb_str_export_to_enc(string, rb_utf8_encoding())
 
-#  define /*void*/ rxml_writer_free_utf8_string(/*VALUE*/ orig, /*VALUE*/ utf8) \
+#define /*void*/ rxml_writer_free_utf8_string(/*VALUE*/ orig, /*VALUE*/ utf8) \
     do {                       \
         if (orig != utf8) {    \
             rb_str_free(utf8); \
         }                      \
     } while (0);
 
-# else
+#else
 
-#  define /*VALUE*/ rxml_writer_c_to_ruby_string(/*const xmlChar **/ string, /*long*/ string_len) \
+#define /*VALUE*/ rxml_writer_c_to_ruby_string(/*const xmlChar **/ string, /*long*/ string_len) \
     rb_str_new(string, string_len)
 
-#  define /*VALUE*/ rxml_writer_ruby_string_to_utf8(/*VALUE*/ string) \
+#define /*VALUE*/ rxml_writer_ruby_string_to_utf8(/*VALUE*/ string) \
     string
 
-#  define /*void*/ rxml_writer_free_utf8_string(/*VALUE*/ orig, /*VALUE*/ utf8) \
+#define /*void*/ rxml_writer_free_utf8_string(/*VALUE*/ orig, /*VALUE*/ utf8) \
     /* NOP */
 
-# endif /* HAVE_RUBY_ENCODING_H */
+#endif /* HAVE_RUBY_ENCODING_H */
 
 static void rxml_writer_free(rxml_writer_object *rwo)
 {
@@ -123,9 +122,9 @@ xmlCharEncodingHandlerPtr xmlFindCharEncodingHandler(const char * name);
     rwo = ALLOC(rxml_writer_object);
     rwo->output = io;
     rwo->buffer = NULL;
-# ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = NULL;
-# endif /* HAVE_RUBY_ENCODING_H */
+#endif /* HAVE_RUBY_ENCODING_H */
     rwo->output_type = RXMLW_OUTPUT_IO;
     if (NULL == (out = xmlOutputBufferCreateIO(rxml_write_callback, NULL, (void *) io, NULL))) {
         rxml_raise(&xmlLastError);
@@ -151,9 +150,9 @@ static VALUE rxml_writer_file(VALUE klass, VALUE filename)
     rwo = ALLOC(rxml_writer_object);
     rwo->output = Qnil;
     rwo->buffer = NULL;
-# ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = NULL;
-# endif /* HAVE_RUBY_ENCODING_H */
+#endif /* HAVE_RUBY_ENCODING_H */
     rwo->output_type = RXMLW_OUTPUT_NONE;
     if (NULL == (rwo->writer = xmlNewTextWriterFilename(StringValueCStr(filename), 0))) {
         rxml_raise(&xmlLastError);
@@ -173,9 +172,9 @@ static VALUE rxml_writer_string(VALUE klass)
 
     rwo = ALLOC(rxml_writer_object);
     rwo->output = Qnil;
-# ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = NULL;
-# endif /* HAVE_RUBY_ENCODING_H */
+#endif /* HAVE_RUBY_ENCODING_H */
     rwo->output_type = RXMLW_OUTPUT_STRING;
     if (NULL == (rwo->buffer = xmlBufferCreate())) {
         rxml_raise(&xmlLastError);
@@ -201,9 +200,9 @@ static VALUE rxml_writer_doc(VALUE klass)
     rwo = ALLOC(rxml_writer_object);
     rwo->buffer = NULL;
     rwo->output = Qnil;
-# ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = NULL;
-# endif /* HAVE_RUBY_ENCODING_H */
+#endif /* HAVE_RUBY_ENCODING_H */
     rwo->output_type = RXMLW_OUTPUT_DOC;
     if (NULL == (rwo->writer = xmlNewTextWriterDoc(&doc, 0))) {
         rxml_raise(&xmlLastError);
@@ -238,11 +237,11 @@ static VALUE rxml_writer_flush(int argc, VALUE *argv, VALUE self)
     if (NULL != rwo->buffer) {
         VALUE content;
 
-# ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RUBY_ENCODING_H
         content = rb_external_str_new_with_enc(rwo->buffer->content, rwo->buffer->use, rwo->encoding);
-# else
+#else
         content = rb_str_new(rwo->buffer->content, rwo->buffer->use);
-# endif /* HAVE_RUBY_ENCODING_H */
+#endif /* HAVE_RUBY_ENCODING_H */
         if (NIL_P(empty) || RTEST(empty)) { /* nil = default value = true */
             xmlBufferEmpty(rwo->buffer);
         }
@@ -301,7 +300,7 @@ static VALUE numeric_rxml_writer_void(VALUE obj, int (*fn)(xmlTextWriterPtr))
     return (-1 == ret ? Qfalse : Qtrue);
 }
 
-# define numeric_rxml_writer_string(/*VALUE*/ obj, /*VALUE*/ name_or_content, /*int (**/fn/*)(xmlTextWriterPtr, const xmlChar *)*/) \
+#define numeric_rxml_writer_string(/*VALUE*/ obj, /*VALUE*/ name_or_content, /*int (**/fn/*)(xmlTextWriterPtr, const xmlChar *)*/) \
     numeric_rxml_writer_va_strings(obj, Qundef, 1, fn, name_or_content)
 
 /**
@@ -312,7 +311,7 @@ static VALUE numeric_rxml_writer_void(VALUE obj, int (*fn)(xmlTextWriterPtr))
  * - validate names
  * and so on
  **/
-# define XMLWRITER_MAX_STRING_ARGS 5
+#define XMLWRITER_MAX_STRING_ARGS 5
 static VALUE numeric_rxml_writer_va_strings(VALUE obj, VALUE pe, size_t strings_count, int (*fn)(ANYARGS), ...)
 {
     va_list ap;
@@ -392,20 +391,20 @@ static VALUE numeric_rxml_writer_va_strings(VALUE obj, VALUE pe, size_t strings_
                 break;
         }
     }
-# ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RUBY_ENCODING_H
     while (--strings_count > 0) {
         if (!NIL_P(orig[strings_count])) {
             rxml_writer_free_utf8_string(orig[strings_count], utf8[strings_count]);
         }
     }
-# endif /* HAVE_RUBY_ENCODING_H */
+#endif /* HAVE_RUBY_ENCODING_H */
 
     return (-1 == ret ? Qfalse : Qtrue);
 }
 
 /* ===== public instance methods ===== */
 
-# if LIBXML_VERSION >= 20605
+#if LIBXML_VERSION >= 20605
 /* call-seq:
  *    writer.set_indent(indentation) -> (true|false)
  *
@@ -437,7 +436,7 @@ static VALUE rxml_writer_set_indent_string(VALUE self, VALUE indentation)
 {
     return numeric_rxml_writer_string(self, indentation, xmlTextWriterSetIndentString);
 }
-# endif /* LIBXML_VERSION >= 20605 */
+#endif /* LIBXML_VERSION >= 20605 */
 
 /* ===== public full tag interface ===== */
 
@@ -491,7 +490,7 @@ static VALUE rxml_writer_write_element(int argc, VALUE *argv, VALUE self)
     }
 }
 
-# define ARRAY_SIZE(array) \
+#define ARRAY_SIZE(array) \
     (sizeof(array) / sizeof((array)[0]))
 
 /* call-seq:
@@ -635,7 +634,7 @@ static VALUE rxml_writer_end_attribute(VALUE self)
     return numeric_rxml_writer_void(self, xmlTextWriterEndAttribute);
 }
 
-# if LIBXML_VERSION >= 20607
+#if LIBXML_VERSION >= 20607
 /* call-seq:
  *    writer.start_comment -> (true|false)
  *
@@ -657,7 +656,7 @@ static VALUE rxml_writer_end_comment(VALUE self)
 {
     return numeric_rxml_writer_void(self, xmlTextWriterEndComment);
 }
-# endif /* LIBXML_VERSION >= 20607 */
+#endif /* LIBXML_VERSION >= 20607 */
 
 /* call-seq:
  *    writer.start_element(name) -> (true|false)
@@ -769,9 +768,9 @@ static VALUE rxml_writer_start_document(int argc, VALUE *argv, VALUE self)
         }
     }
     rwo = rxml_textwriter_get(self);
-# ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = rxml_figure_encoding(xencoding);
-# endif /* !HAVE_RUBY_ENCODING_H */
+#endif /* !HAVE_RUBY_ENCODING_H */
     ret = xmlTextWriterStartDocument(rwo->writer, NULL, xencoding, xstandalone);
 
     return (-1 == ret ? Qfalse : Qtrue);
@@ -909,13 +908,13 @@ static VALUE rxml_writer_end_dtd_element(VALUE self)
  *
  * Examples:
  *   writer.write_dtd 'html'
- *     # => <!DOCTYPE html>
+ *     #=> <!DOCTYPE html>
  *   writer.write_dtd 'docbook', nil, 'http://www.docbook.org/xml/5.0/dtd/docbook.dtd'
- *     # => <!DOCTYPE docbook SYSTEM "http://www.docbook.org/xml/5.0/dtd/docbook.dtd">
+ *     #=> <!DOCTYPE docbook SYSTEM "http://www.docbook.org/xml/5.0/dtd/docbook.dtd">
  *   writer.write_dtd 'html', '-//W3C//DTD XHTML 1.1//EN', 'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
- *     # => <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+ *     #=> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
  *   writer.write_dtd 'person', nil, nil, '<!ELEMENT person (firstname,lastname)><!ELEMENT firstname (#PCDATA)><!ELEMENT lastname (#PCDATA)>'
- *     # => <!DOCTYPE person [<!ELEMENT person (firstname,lastname)><!ELEMENT firstname (#PCDATA)><!ELEMENT lastname (#PCDATA)>]>
+ *     #=> <!DOCTYPE person [<!ELEMENT person (firstname,lastname)><!ELEMENT firstname (#PCDATA)><!ELEMENT lastname (#PCDATA)>]>
  */
 static VALUE rxml_writer_write_dtd(int argc, VALUE *argv, VALUE self)
 {
@@ -931,7 +930,7 @@ static VALUE rxml_writer_write_dtd(int argc, VALUE *argv, VALUE self)
  *
  * Writes a DTD attribute list, all at once. Returns +false+ on failure.
  *   writer.write_dtd_attlist 'id', 'ID #IMPLIED'
- *     # => <!ATTLIST id ID #IMPLIED>
+ *     #=> <!ATTLIST id ID #IMPLIED>
  */
 static VALUE rxml_writer_write_dtd_attlist(VALUE self, VALUE name, VALUE content)
 {
@@ -943,7 +942,7 @@ static VALUE rxml_writer_write_dtd_attlist(VALUE self, VALUE name, VALUE content
  *
  * Writes a full DTD element, all at once. Returns +false+ on failure.
  *   writer.write_dtd_element 'person', '(firstname,lastname)'
- *     # => <!ELEMENT person (firstname,lastname)>
+ *     #=> <!ELEMENT person (firstname,lastname)>
  */
 static VALUE rxml_writer_write_dtd_element(VALUE self, VALUE name, VALUE content)
 {
@@ -994,9 +993,9 @@ static VALUE rxml_writer_write_dtd_external_entity_contents(VALUE self, VALUE pu
  *
  * Examples:
  *   writer.write_dtd_entity 'Shape', '(rect|circle|poly|default)', true
- *     # => <!ENTITY % Shape "(rect|circle|poly|default)">
+ *     #=> <!ENTITY % Shape "(rect|circle|poly|default)">
  *   writer.write_dtd_entity 'delta', '&#948;', false
- *     # => <!ENTITY delta "&#948;">
+ *     #=> <!ENTITY delta "&#948;">
  */
 static VALUE rxml_writer_write_dtd_internal_entity(VALUE self, VALUE name, VALUE content, VALUE pe)
 {
@@ -1013,7 +1012,7 @@ static VALUE rxml_writer_write_dtd_notation(VALUE self, VALUE name, VALUE pubid,
     return numeric_rxml_writer_va_strings(self, Qundef, 3, xmlTextWriterWriteDTDNotation, name, pubid, sysid);
 }
 
-# if LIBXML_VERSION >= 20900
+#if LIBXML_VERSION >= 20900
 /* call-seq:
  *    writer.set_quote_char(...) -> (true|false)
  *
@@ -1035,7 +1034,10 @@ static VALUE rxml_writer_set_quote_char(VALUE self, VALUE quotechar)
 
     return (-1 == ret ? Qfalse : Qtrue);
 }
-# endif /* LIBXML_VERSION >= 20900 */
+#endif /* LIBXML_VERSION >= 20900 */
+
+#endif /* LIBXML_WRITER_ENABLED */
+
 
 /* grep -P 'xmlTextWriter(Start|End|Write)(?!DTD|V?Format)[^(]+' /usr/include/libxml2/libxml/xmlwriter.h */
 void rxml_init_writer(void)
@@ -1045,19 +1047,20 @@ void rxml_init_writer(void)
 
     cXMLWriter = rb_define_class_under(mXML, "Writer", rb_cObject);
 
+#ifdef LIBXML_WRITER_ENABLED
     rb_define_singleton_method(cXMLWriter, "io", rxml_writer_io, 1);
     rb_define_singleton_method(cXMLWriter, "file", rxml_writer_file, 1);
     rb_define_singleton_method(cXMLWriter, "document", rxml_writer_doc, 0);
     rb_define_singleton_method(cXMLWriter, "string", rxml_writer_string, 0);
 
     /* misc */
-# if LIBXML_VERSION >= 20605
+#if LIBXML_VERSION >= 20605
     rb_define_method(cXMLWriter, "set_indent", rxml_writer_set_indent, 1);
     rb_define_method(cXMLWriter, "set_indent_string", rxml_writer_set_indent_string, 1);
-# endif /* LIBXML_VERSION >= 20605 */
-# if LIBXML_VERSION >= 20900
+#endif /* LIBXML_VERSION >= 20605 */
+#if LIBXML_VERSION >= 20900
     rb_define_method(cXMLWriter, "set_quote_char", rxml_writer_set_quote_char, 1);
-# endif  /* LIBXML_VERSION >= 20900 */
+#endif  /* LIBXML_VERSION >= 20900 */
     rb_define_method(cXMLWriter, "flush", rxml_writer_flush, -1);
     rb_define_method(cXMLWriter, "start_dtd", rxml_writer_start_dtd, -1);
     rb_define_method(cXMLWriter, "start_dtd_entity", rxml_writer_start_dtd_entity, -1);
@@ -1091,10 +1094,10 @@ void rxml_init_writer(void)
     rb_define_method(cXMLWriter, "full_end_element", rxml_writer_full_end_element, 0);
     rb_define_method(cXMLWriter, "start_document", rxml_writer_start_document, -1);
     rb_define_method(cXMLWriter, "end_document", rxml_writer_end_document, 0);
-# if LIBXML_VERSION >= 20607
+#if LIBXML_VERSION >= 20607
     rb_define_method(cXMLWriter, "start_comment", rxml_writer_start_comment, 0);
     rb_define_method(cXMLWriter, "end_comment", rxml_writer_end_comment, 0);
-# endif /* LIBXML_VERSION >= 20607 */
+#endif /* LIBXML_VERSION >= 20607 */
     rb_define_method(cXMLWriter, "start_pi", rxml_writer_start_pi, 1);
     rb_define_method(cXMLWriter, "end_pi", rxml_writer_end_pi, 0);
 
@@ -1110,6 +1113,6 @@ void rxml_init_writer(void)
     rb_define_method(cXMLWriter, "result", rxml_writer_result, 0);
 
     rb_undef_method(CLASS_OF(cXMLWriter), "new");
+#endif
 }
 
-#endif /* LIBXML_WRITER_ENABLED */