1*4882a593Smuzhiyun[PATCH] Fix a compile error 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunUpstream-Status: Pending 4*4882a593Smuzhiyun 5*4882a593Smuzhiyunby conditional using 'XML_DOCB_DOCUMENT_NODE' since it is only 6*4882a593Smuzhiyundefined when LIBXML_DOCB_ENABLED is enabled in xmlversion.h. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Roy Li <rongqing.li@windriver.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun LibXML.xs | 9 +- 11*4882a593Smuzhiyun dom.c | 2 + 12*4882a593Smuzhiyun perl-libxml-mm.c | 4 + 13*4882a593Smuzhiyun 4 files changed, 678 insertions(+), 658 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/LibXML.xs b/LibXML.xs 16*4882a593Smuzhiyunindex b299ba4..66da04b 100644 17*4882a593Smuzhiyun--- a/LibXML.xs 18*4882a593Smuzhiyun+++ b/LibXML.xs 19*4882a593Smuzhiyun@@ -5026,7 +5026,9 @@ addChild( self, nNode ) 20*4882a593Smuzhiyun XSRETURN_UNDEF; 21*4882a593Smuzhiyun case XML_DOCUMENT_NODE : 22*4882a593Smuzhiyun case XML_HTML_DOCUMENT_NODE : 23*4882a593Smuzhiyun+#ifdef LIBXML_DOCB_ENABLED 24*4882a593Smuzhiyun case XML_DOCB_DOCUMENT_NODE : 25*4882a593Smuzhiyun+#endif 26*4882a593Smuzhiyun croak("addChild: HIERARCHY_REQUEST_ERR\n"); 27*4882a593Smuzhiyun XSRETURN_UNDEF; 28*4882a593Smuzhiyun case XML_NOTATION_NODE : 29*4882a593Smuzhiyun@@ -5286,7 +5288,9 @@ _toStringC14N(self, comments=0, xpath=&PL_sv_undef, exclusive=0, inc_prefix_list 30*4882a593Smuzhiyun if ( nodepath == NULL 31*4882a593Smuzhiyun && self->type != XML_DOCUMENT_NODE 32*4882a593Smuzhiyun && self->type != XML_HTML_DOCUMENT_NODE 33*4882a593Smuzhiyun+#ifdef LIBXML_DOCB_ENABLED 34*4882a593Smuzhiyun && self->type != XML_DOCB_DOCUMENT_NODE 35*4882a593Smuzhiyun+#endif 36*4882a593Smuzhiyun ) { 37*4882a593Smuzhiyun if (comments) 38*4882a593Smuzhiyun nodepath = xmlStrdup( (const xmlChar *) "(. | .//node() | .//@* | .//namespace::*)" ); 39*4882a593Smuzhiyun@@ -5297,7 +5301,10 @@ _toStringC14N(self, comments=0, xpath=&PL_sv_undef, exclusive=0, inc_prefix_list 40*4882a593Smuzhiyun if ( nodepath != NULL ) { 41*4882a593Smuzhiyun if ( self->type == XML_DOCUMENT_NODE 42*4882a593Smuzhiyun || self->type == XML_HTML_DOCUMENT_NODE 43*4882a593Smuzhiyun- || self->type == XML_DOCB_DOCUMENT_NODE ) { 44*4882a593Smuzhiyun+#ifdef LIBXML_DOCB_ENABLED 45*4882a593Smuzhiyun+ || self->type == XML_DOCB_DOCUMENT_NODE 46*4882a593Smuzhiyun+#endif 47*4882a593Smuzhiyun+ ) { 48*4882a593Smuzhiyun refNode = xmlDocGetRootElement( self->doc ); 49*4882a593Smuzhiyun } 50*4882a593Smuzhiyun if (SvOK(xpath_context)) { 51*4882a593Smuzhiyundiff --git a/dom.c b/dom.c 52*4882a593Smuzhiyunindex 87eb61d..cbd391b 100644 53*4882a593Smuzhiyun--- a/dom.c 54*4882a593Smuzhiyun+++ b/dom.c 55*4882a593Smuzhiyun@@ -654,7 +654,9 @@ domName(xmlNodePtr node) { 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun case XML_DOCUMENT_NODE : 58*4882a593Smuzhiyun case XML_HTML_DOCUMENT_NODE : 59*4882a593Smuzhiyun+#ifdef LIBXML_DOCB_ENABLED 60*4882a593Smuzhiyun case XML_DOCB_DOCUMENT_NODE : 61*4882a593Smuzhiyun+#endif 62*4882a593Smuzhiyun name = (const xmlChar *) "#document"; 63*4882a593Smuzhiyun break; 64*4882a593Smuzhiyun 65*4882a593Smuzhiyundiff --git a/perl-libxml-mm.c b/perl-libxml-mm.c 66*4882a593Smuzhiyunindex d162b06..7ac5436 100644 67*4882a593Smuzhiyun--- a/perl-libxml-mm.c 68*4882a593Smuzhiyun+++ b/perl-libxml-mm.c 69*4882a593Smuzhiyun@@ -331,7 +331,9 @@ PmmNewNode(xmlNodePtr node) 70*4882a593Smuzhiyun switch ( node->type ) { 71*4882a593Smuzhiyun case XML_DOCUMENT_NODE: 72*4882a593Smuzhiyun case XML_HTML_DOCUMENT_NODE: 73*4882a593Smuzhiyun+#ifdef LIBXML_DOCB_ENABLED 74*4882a593Smuzhiyun case XML_DOCB_DOCUMENT_NODE: 75*4882a593Smuzhiyun+#endif 76*4882a593Smuzhiyun proxy = (ProxyNodePtr)xmlMalloc(sizeof(struct _DocProxyNode)); 77*4882a593Smuzhiyun if (proxy != NULL) { 78*4882a593Smuzhiyun ((DocProxyNodePtr)proxy)->psvi_status = Pmm_NO_PSVI; 79*4882a593Smuzhiyun@@ -550,7 +552,9 @@ PmmNodeToSv( xmlNodePtr node, ProxyNodePtr owner ) 80*4882a593Smuzhiyun switch ( node->type ) { 81*4882a593Smuzhiyun case XML_DOCUMENT_NODE: 82*4882a593Smuzhiyun case XML_HTML_DOCUMENT_NODE: 83*4882a593Smuzhiyun+#ifdef LIBXML_DOCB_ENABLED 84*4882a593Smuzhiyun case XML_DOCB_DOCUMENT_NODE: 85*4882a593Smuzhiyun+#endif 86*4882a593Smuzhiyun if ( ((xmlDocPtr)node)->encoding != NULL ) { 87*4882a593Smuzhiyun SetPmmENCODING(dfProxy, (int)xmlParseCharEncoding( (const char*)((xmlDocPtr)node)->encoding )); 88*4882a593Smuzhiyun } 89*4882a593Smuzhiyun-- 90*4882a593Smuzhiyun1.7.10.4 91*4882a593Smuzhiyun 92