libxml-ruby 5.0.5 → 6.0.0

data/ext/libxml/ruby_xml_relaxng.h

@@ -1,8 +1,9 @@
-#ifndef __RXML_RELAXNG__
-#define __RXML_RELAXNG__
-
-extern VALUE cXMLRelaxNG;
-
-void  rxml_init_relaxng(void);
-#endif
-
+#ifndef __RXML_RELAXNG__
+#define __RXML_RELAXNG__
+
+extern VALUE cXMLRelaxNG;
+extern const rb_data_type_t rxml_relaxng_data_type;
+
+void  rxml_init_relaxng(void);
+#endif
+

data/ext/libxml/ruby_xml_sax2_handler.h

@@ -1,10 +1,10 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_SAX2_HANDLER__
-#define __RXML_SAX2_HANDLER__
-
-extern xmlSAXHandler rxml_sax_handler;
-
-void rxml_init_sax2_handler(void);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_SAX2_HANDLER__
+#define __RXML_SAX2_HANDLER__
+
+extern xmlSAXHandler rxml_sax_handler;
+
+void rxml_init_sax2_handler(void);
+
+#endif

data/ext/libxml/ruby_xml_sax_parser.c

@@ -76,7 +76,7 @@ static VALUE rxml_sax_parser_parse(VALUE self)
 {
   VALUE context = rb_ivar_get(self, CONTEXT_ATTR);
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(context, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(context, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   ctxt->sax2 = 1;
 	ctxt->userData = (void*)rb_ivar_get(self, CALLBACKS_ATTR);

data/ext/libxml/ruby_xml_sax_parser.h

@@ -1,10 +1,10 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_SAX_PARSER__
-#define __RXML_SAX_PARSER__
-
-extern VALUE cXMLSaxParser;
-
-void rxml_init_sax_parser(void);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_SAX_PARSER__
+#define __RXML_SAX_PARSER__
+
+extern VALUE cXMLSaxParser;
+
+void rxml_init_sax_parser(void);
+
+#endif

data/ext/libxml/ruby_xml_schema.c

@@ -109,11 +109,18 @@ struct _xmlSchemaImport {
 
 VALUE cXMLSchema;
 
-static void rxml_schema_free(xmlSchemaPtr xschema)
+static void rxml_schema_free(void *data)
 {
+  xmlSchemaPtr xschema = (xmlSchemaPtr)data;
   xmlSchemaFree(xschema);
 }
 
+const rb_data_type_t rxml_schema_type = {
+  "XML::Schema",
+  {NULL, rxml_schema_free, NULL},
+  NULL, NULL, 0
+};
+
 VALUE rxml_wrap_schema(xmlSchemaPtr xschema)
 {
   VALUE result;
@@ -121,7 +128,7 @@ VALUE rxml_wrap_schema(xmlSchemaPtr xschema)
   if (!xschema)
     rb_raise(rb_eArgError, "XML::Schema is required!");
 
-  result = Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
+  result = TypedData_Wrap_Struct(cXMLSchema, &rxml_schema_type, xschema);
 
   /*
    * Create these as instance variables to provide the output of inspect/to_str some
@@ -130,7 +137,7 @@ VALUE rxml_wrap_schema(xmlSchemaPtr xschema)
   rb_iv_set(result, "@target_namespace", QNIL_OR_STRING(xschema->targetNamespace));
   rb_iv_set(result, "@name", QNIL_OR_STRING(xschema->name));
   rb_iv_set(result, "@id", QNIL_OR_STRING(xschema->id));
-  rb_iv_set(result, "@version", QNIL_OR_STRING(xschema->name));
+  rb_iv_set(result, "@version", QNIL_OR_STRING(xschema->version));
 
   return result;
 }
@@ -179,7 +186,7 @@ static VALUE rxml_schema_init_from_document(VALUE class, VALUE document)
   xmlDocPtr xdoc;
   xmlSchemaParserCtxtPtr xparser;
 
-  Data_Get_Struct(document, xmlDoc, xdoc);
+  TypedData_Get_Struct(document, xmlDoc, &rxml_document_data_type, xdoc);
 
   xmlResetLastError();
   xparser = xmlSchemaNewDocParserCtxt(xdoc);
@@ -219,7 +226,7 @@ static VALUE rxml_schema_document(VALUE self)
 {
   xmlSchemaPtr xschema;
 
-  Data_Get_Struct(self, xmlSchema, xschema);
+  TypedData_Get_Struct(self, xmlSchema, &rxml_schema_type, xschema);
 
   return rxml_node_wrap(xmlDocGetRootElement(xschema->doc));
 }
@@ -254,7 +261,7 @@ static VALUE rxml_schema_namespaces(VALUE self)
   VALUE result;
   xmlSchemaPtr xschema;
 
-  Data_Get_Struct(self, xmlSchema, xschema);
+  TypedData_Get_Struct(self, xmlSchema, &rxml_schema_type, xschema);
 
   result = rb_ary_new();
   xmlHashScan(xschema->schemasImports, (xmlHashScanner)scan_namespaces, (void *)result);
@@ -273,7 +280,7 @@ static VALUE rxml_schema_elements(VALUE self)
   VALUE result = rb_hash_new();
   xmlSchemaPtr xschema;
 
-  Data_Get_Struct(self, xmlSchema, xschema);
+  TypedData_Get_Struct(self, xmlSchema, &rxml_schema_type, xschema);
   xmlHashScan(xschema->elemDecl, (xmlHashScanner)scan_schema_element, (void *)result);
 
   return result;
@@ -300,7 +307,7 @@ static VALUE rxml_schema_imported_ns_elements(VALUE self)
   xmlSchemaPtr xschema;
   VALUE result = rb_hash_new();
 
-  Data_Get_Struct(self, xmlSchema, xschema);
+  TypedData_Get_Struct(self, xmlSchema, &rxml_schema_type, xschema);
 
   if (xschema)
   {
@@ -321,7 +328,7 @@ static VALUE rxml_schema_types(VALUE self)
   VALUE result = rb_hash_new();
   xmlSchemaPtr xschema;
 
-  Data_Get_Struct(self, xmlSchema, xschema);
+  TypedData_Get_Struct(self, xmlSchema, &rxml_schema_type, xschema);
 
   if (xschema != NULL && xschema->typeDecl != NULL)
   {
@@ -350,7 +357,7 @@ static VALUE rxml_schema_imported_types(VALUE self)
   xmlSchemaPtr xschema;
   VALUE result = rb_hash_new();
 
-  Data_Get_Struct(self, xmlSchema, xschema);
+  TypedData_Get_Struct(self, xmlSchema, &rxml_schema_type, xschema);
 
   if (xschema)
   {
@@ -381,7 +388,7 @@ static VALUE rxml_schema_imported_ns_types(VALUE self)
   xmlSchemaPtr xschema;
   VALUE result = rb_hash_new();
 
-  Data_Get_Struct(self, xmlSchema, xschema);
+  TypedData_Get_Struct(self, xmlSchema, &rxml_schema_type, xschema);
 
   if (xschema)
   {

data/ext/libxml/ruby_xml_schema.h

@@ -1,25 +1,26 @@
-#ifndef __RXML_SCHEMA__
-#define __RXML_SCHEMA__
-
-#include <libxml/schemasInternals.h>
-#include <libxml/xmlschemastypes.h>
-
-typedef struct _xmlSchemaItemList xmlSchemaItemList;
-typedef xmlSchemaItemList *xmlSchemaItemListPtr;
-struct _xmlSchemaItemList {
-    void **items;
-    /* used for dynamic addition of schemata */
-    int nbItems;
-    /* used for dynamic addition of schemata */
-    int sizeItems; /* used for dynamic addition of schemata */
-};
-
-#define QNIL_OR_STRING(slot) \
-    (slot == NULL) ? Qnil : rb_str_new2((const char *)slot)
-
-extern VALUE cXMLSchema;
-
-void rxml_init_schema(void);
-
-#endif
-
+#ifndef __RXML_SCHEMA__
+#define __RXML_SCHEMA__
+
+#include <libxml/schemasInternals.h>
+#include <libxml/xmlschemastypes.h>
+
+typedef struct _xmlSchemaItemList xmlSchemaItemList;
+typedef xmlSchemaItemList *xmlSchemaItemListPtr;
+struct _xmlSchemaItemList {
+    void **items;
+    /* used for dynamic addition of schemata */
+    int nbItems;
+    /* used for dynamic addition of schemata */
+    int sizeItems; /* used for dynamic addition of schemata */
+};
+
+#define QNIL_OR_STRING(slot) \
+    (slot == NULL) ? Qnil : rb_str_new2((const char *)slot)
+
+extern VALUE cXMLSchema;
+extern const rb_data_type_t rxml_schema_type;
+
+void rxml_init_schema(void);
+
+#endif
+

data/ext/libxml/ruby_xml_schema_attribute.c

@@ -50,11 +50,11 @@ struct _xmlSchemaAttributeUseProhib {
 
 VALUE cXMLSchemaAttribute;
 
-static void rxml_schema_attribute_free(xmlSchemaAttributeUsePtr attr)
-{
-  attr = NULL;
-  xmlFree(attr);
-}
+static const rb_data_type_t rxml_schema_attribute_type = {
+  "XML::Schema::Attribute",
+  {NULL, NULL, NULL},
+  NULL, NULL, 0
+};
 
 VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr)
 {
@@ -64,7 +64,7 @@ VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr)
   if (!attr)
     rb_raise(rb_eArgError, "XML::Schema::Attribute required!");
 
-  result = Data_Wrap_Struct(cXMLSchemaAttribute, NULL, rxml_schema_attribute_free, attr);
+  result = TypedData_Wrap_Struct(cXMLSchemaAttribute, &rxml_schema_attribute_type, attr);
 
   if (attr->type == XML_SCHEMA_EXTRA_ATTR_USE_PROHIB) {
     tns_str = ((xmlSchemaAttributeUseProhibPtr) attr)->targetNamespace;
@@ -89,7 +89,7 @@ static VALUE rxml_schema_attribute_node(VALUE self)
 {
   xmlSchemaAttributeUsePtr attr;
 
-  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
+  TypedData_Get_Struct(self, xmlSchemaAttributeUse, &rxml_schema_attribute_type, attr);
 
   return rxml_node_wrap(attr->node);
 }

data/ext/libxml/ruby_xml_schema_attribute.h

@@ -1,37 +1,37 @@
-#ifndef __RXML_SCHEMA_ATTRIBUTE__
-#define __RXML_SCHEMA_ATTRIBUTE__
-
-#include "ruby_xml_schema.h"
-
-extern VALUE cXMLSchemaAttribute;
-
-/**
- * xmlSchemaAttributeUsePtr:
- *
- * The abstract base type for tree-like structured schema components.
- * (Extends xmlSchemaTreeItem)
- */
-typedef struct _xmlSchemaAttributeUse xmlSchemaAttributeUse;
-typedef xmlSchemaAttributeUse *xmlSchemaAttributeUsePtr;
-struct _xmlSchemaAttributeUse {
-    xmlSchemaTypeType type;
-    xmlSchemaAnnotPtr annot;
-    xmlSchemaAttributeUsePtr next; /* The next attr. use. */
-    /*
-    * The attr. decl. OR a QName-ref. to an attr. decl. OR
-    * a QName-ref. to an attribute group definition.
-    */
-    xmlSchemaAttributePtr attrDecl;
-
-    int flags;
-    xmlNodePtr node;
-    int occurs;
-    /* required, optional */
-    const xmlChar *defValue;
-    xmlSchemaValPtr defVal;
-};
-
-void rxml_init_schema_attribute(void);
-VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr);
-
-#endif
+#ifndef __RXML_SCHEMA_ATTRIBUTE__
+#define __RXML_SCHEMA_ATTRIBUTE__
+
+#include "ruby_xml_schema.h"
+
+extern VALUE cXMLSchemaAttribute;
+
+/**
+ * xmlSchemaAttributeUsePtr:
+ *
+ * The abstract base type for tree-like structured schema components.
+ * (Extends xmlSchemaTreeItem)
+ */
+typedef struct _xmlSchemaAttributeUse xmlSchemaAttributeUse;
+typedef xmlSchemaAttributeUse *xmlSchemaAttributeUsePtr;
+struct _xmlSchemaAttributeUse {
+    xmlSchemaTypeType type;
+    xmlSchemaAnnotPtr annot;
+    xmlSchemaAttributeUsePtr next; /* The next attr. use. */
+    /*
+    * The attr. decl. OR a QName-ref. to an attr. decl. OR
+    * a QName-ref. to an attribute group definition.
+    */
+    xmlSchemaAttributePtr attrDecl;
+
+    int flags;
+    xmlNodePtr node;
+    int occurs;
+    /* required, optional */
+    const xmlChar *defValue;
+    xmlSchemaValPtr defVal;
+};
+
+void rxml_init_schema_attribute(void);
+VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr);
+
+#endif

data/ext/libxml/ruby_xml_schema_element.c

@@ -4,11 +4,11 @@
 
 VALUE cXMLSchemaElement;
 
-static void rxml_schema_element_free(xmlSchemaElementPtr xschema_element)
-{
-  xschema_element = NULL;
-  xmlFree(xschema_element);
-}
+static const rb_data_type_t rxml_schema_element_type = {
+  "XML::Schema::Element",
+  {NULL, NULL, NULL},
+  NULL, NULL, 0
+};
 
 VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelem)
 {
@@ -17,7 +17,7 @@ VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelem)
   if (!xelem)
     rb_raise(rb_eArgError, "XML::Schema::Element is required!");
 
-  result = Data_Wrap_Struct(cXMLSchemaElement, NULL, rxml_schema_element_free, xelem);
+  result = TypedData_Wrap_Struct(cXMLSchemaElement, &rxml_schema_element_type, xelem);
 
   rb_iv_set(result, "@name", QNIL_OR_STRING(xelem->name));
   rb_iv_set(result, "@value", QNIL_OR_STRING(xelem->value));
@@ -31,7 +31,7 @@ static VALUE rxml_schema_element_node(VALUE self)
 {
   xmlSchemaElementPtr xelem;
 
-  Data_Get_Struct(self, xmlSchemaElement, xelem);
+  TypedData_Get_Struct(self, xmlSchemaElement, &rxml_schema_element_type, xelem);
 
   return rxml_node_wrap(xelem->node);
 }
@@ -41,7 +41,7 @@ static VALUE rxml_schema_element_annot(VALUE self)
   xmlSchemaElementPtr xelem;
   VALUE annotation = Qnil;
 
-  Data_Get_Struct(self, xmlSchemaElement, xelem);
+  TypedData_Get_Struct(self, xmlSchemaElement, &rxml_schema_element_type, xelem);
 
   if ((xelem->annot != NULL) && (xelem->annot->content != NULL))
   {

data/ext/libxml/ruby_xml_schema_element.h

@@ -1,11 +1,11 @@
-#ifndef __RXML_SCHEMA_ELEMENT__
-#define __RXML_SCHEMA_ELEMENT__
-
-#include "ruby_xml_schema.h"
-
-extern VALUE cXMLSchemaElement;
-
-VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelement);
-void rxml_init_schema_element(void);
-
-#endif
+#ifndef __RXML_SCHEMA_ELEMENT__
+#define __RXML_SCHEMA_ELEMENT__
+
+#include "ruby_xml_schema.h"
+
+extern VALUE cXMLSchemaElement;
+
+VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelement);
+void rxml_init_schema_element(void);
+
+#endif

data/ext/libxml/ruby_xml_schema_facet.c

@@ -1,50 +1,50 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_schema_facet.h"
-
-#include <libxml/schemasInternals.h>
-#include <libxml/xmlschemas.h>
-#include <libxml/xmlschemastypes.h>
-
-VALUE cXMLSchemaFacet;
-
-static void rxml_schema_facet_free(xmlSchemaFacetPtr xschema_type)
-{
-  xschema_type = NULL;
-  xmlFree(xschema_type);
-}
-
-VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet)
-{
-  VALUE result;
-
-  if (!facet)
-    rb_raise(rb_eArgError, "XML::Schema::Facet required!");
-
-  result = Data_Wrap_Struct(cXMLSchemaFacet, NULL, rxml_schema_facet_free, facet);
-
-  rb_iv_set(result, "@kind", INT2NUM(facet->type));
-  rb_iv_set(result, "@value", QNIL_OR_STRING(facet->value));
-
-  return result;
-
-}
-
-/* START FACET*/
-
-static VALUE rxml_schema_facet_node(VALUE self)
-{
-  xmlSchemaFacetPtr facet;
-
-  Data_Get_Struct(self, xmlSchemaFacet, facet);
-
-  return rxml_node_wrap(facet->node);
-}
-
-void rxml_init_schema_facet(void)
-{
-  cXMLSchemaFacet = rb_define_class_under(cXMLSchema, "Facet", rb_cObject);
-  rb_define_attr(cXMLSchemaFacet, "kind", 1, 0);
-  rb_define_attr(cXMLSchemaFacet, "value", 1, 0);
-
-  rb_define_method(cXMLSchemaFacet, "node", rxml_schema_facet_node, 0);
-}
+#include "ruby_libxml.h"
+#include "ruby_xml_schema_facet.h"
+
+#include <libxml/schemasInternals.h>
+#include <libxml/xmlschemas.h>
+#include <libxml/xmlschemastypes.h>
+
+VALUE cXMLSchemaFacet;
+
+static const rb_data_type_t rxml_schema_facet_type = {
+  "XML::Schema::Facet",
+  {NULL, NULL, NULL},
+  NULL, NULL, 0
+};
+
+VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet)
+{
+  VALUE result;
+
+  if (!facet)
+    rb_raise(rb_eArgError, "XML::Schema::Facet required!");
+
+  result = TypedData_Wrap_Struct(cXMLSchemaFacet, &rxml_schema_facet_type, facet);
+
+  rb_iv_set(result, "@kind", INT2NUM(facet->type));
+  rb_iv_set(result, "@value", QNIL_OR_STRING(facet->value));
+
+  return result;
+
+}
+
+/* START FACET*/
+
+static VALUE rxml_schema_facet_node(VALUE self)
+{
+  xmlSchemaFacetPtr facet;
+
+  TypedData_Get_Struct(self, xmlSchemaFacet, &rxml_schema_facet_type, facet);
+
+  return rxml_node_wrap(facet->node);
+}
+
+void rxml_init_schema_facet(void)
+{
+  cXMLSchemaFacet = rb_define_class_under(cXMLSchema, "Facet", rb_cObject);
+  rb_define_attr(cXMLSchemaFacet, "kind", 1, 0);
+  rb_define_attr(cXMLSchemaFacet, "value", 1, 0);
+
+  rb_define_method(cXMLSchemaFacet, "node", rxml_schema_facet_node, 0);
+}

data/ext/libxml/ruby_xml_schema_facet.h

@@ -1,9 +1,9 @@
-#ifndef __RXML_SCHEMA_FACET__
-#define __RXML_SCHEMA_FACET__
-
-extern VALUE cXMLSchemaFacet;
-
-VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet);
-void rxml_init_schema_facet(void);
-
-#endif
+#ifndef __RXML_SCHEMA_FACET__
+#define __RXML_SCHEMA_FACET__
+
+extern VALUE cXMLSchemaFacet;
+
+VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet);
+void rxml_init_schema_facet(void);
+
+#endif

data/ext/libxml/ruby_xml_schema_type.c

@@ -46,11 +46,11 @@ a group definition, a XML_SCHEMA_EXTRA_QNAMEREF (if a reference),
 
 VALUE cXMLSchemaType;
 
-static void rxml_schema_type_free(xmlSchemaTypePtr xschema_type)
-{
-  xschema_type = NULL;
-  xmlFree(xschema_type);
-}
+static const rb_data_type_t rxml_schema_type_type = {
+  "XML::Schema::Type",
+  {NULL, NULL, NULL},
+  NULL, NULL, 0
+};
 
 VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype)
 {
@@ -59,7 +59,7 @@ VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype)
   if (!xtype)
     rb_raise(rb_eArgError, "XML::Schema::Type required!");
 
-  result = Data_Wrap_Struct(cXMLSchemaType, NULL, rxml_schema_type_free, xtype);
+  result = TypedData_Wrap_Struct(cXMLSchemaType, &rxml_schema_type_type, xtype);
 
   rb_iv_set(result, "@name", QNIL_OR_STRING(xtype->name));
   rb_iv_set(result, "@namespace", QNIL_OR_STRING(xtype->targetNamespace));
@@ -72,7 +72,7 @@ static VALUE rxml_schema_type_base(VALUE self)
 {
   xmlSchemaTypePtr xtype;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
 
   return (xtype->baseType != xtype) ? rxml_wrap_schema_type(xtype->baseType) : Qnil;
 }
@@ -81,7 +81,7 @@ static VALUE rxml_schema_type_node(VALUE self)
 {
   xmlSchemaTypePtr xtype;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
 
   return (xtype->node != NULL) ? rxml_node_wrap(xtype->node) : Qnil;
 }
@@ -93,7 +93,7 @@ static VALUE rxml_schema_type_facets(VALUE self)
   VALUE result = rb_ary_new();
   VALUE facet;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
 
   xfacet = xtype->facets;
 
@@ -112,7 +112,7 @@ static VALUE rxml_schema_type_annot(VALUE self)
   VALUE result = Qnil;
   xmlSchemaTypePtr xtype;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
 
   if(xtype != NULL && xtype->annot != NULL && xtype->annot->content != NULL)
   {
@@ -198,7 +198,7 @@ static VALUE rxml_schema_type_elements(VALUE self)
   VALUE result = rb_hash_new();
   xmlSchemaTypePtr xtype;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
   rxmlSchemaCollectElements((xmlSchemaParticlePtr) xtype->subtypes, result);
 
   return result;
@@ -212,7 +212,7 @@ static VALUE rxml_schema_type_attributes(VALUE self)
   xmlSchemaItemListPtr xuses;
   int i;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
   xuses = xtype->attrUses;
 
   if (xuses != NULL)
@@ -229,13 +229,6 @@ static VALUE rxml_schema_type_attributes(VALUE self)
 
 void rxml_init_schema_type(void)
 {
-  /* Add in infinity support for ruby 1.8.7 */
-  #if !defined(RUBY_VM) && defined(INFINITY)
-  ID infinityId = rb_intern("INFINITY");
-  if (rb_const_defined(rb_cFloat, infinityId) == Qfalse)
-    rb_define_const(rb_cFloat, "INFINITY", rb_float_new(INFINITY));
-  #endif
-
   cXMLSchemaType = rb_define_class_under(cXMLSchema, "Type", rb_cObject);
   rb_undef_alloc_func(cXMLSchemaType);
 

data/ext/libxml/ruby_xml_schema_type.h

@@ -1,9 +1,9 @@
-#ifndef __RXML_SCHEMA_TYPE__
-#define __RXML_SCHEMA_TYPE__
-
-extern VALUE cXMLSchemaType;
-
-VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype);
-void rxml_init_schema_type(void);
-
-#endif
+#ifndef __RXML_SCHEMA_TYPE__
+#define __RXML_SCHEMA_TYPE__
+
+extern VALUE cXMLSchemaType;
+
+VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype);
+void rxml_init_schema_type(void);
+
+#endif

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  "5.0.5"
-#define RUBY_LIBXML_VERNUM   505
-#define RUBY_LIBXML_VER_MAJ   5
+#define RUBY_LIBXML_VERSION  "6.0.0"
+#define RUBY_LIBXML_VERNUM   600
+#define RUBY_LIBXML_VER_MAJ   6
 #define RUBY_LIBXML_VER_MIN   0
-#define RUBY_LIBXML_VER_MIC   5
+#define RUBY_LIBXML_VER_MIC   0
 #define RUBY_LIBXML_VER_PATCH 0