shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-04-25 22:50:08 +03:00
Code

applied patch from Mikhail Zabaluev to separate library flags for shared

Browse Source 
* libxml-2.0.pc.in: applied patch from Mikhail Zabaluev to separate
  library flags for shared and static builds, fixes #344594. If this
  bites you, use xml2-config.
Daniel
This commit is contained in:
Daniel Veillard 2006-10-11 12:32:51 +00:00
parent 04db684ba9
commit 26ab0e6c73
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Oct 11 14:32:00 CEST 2006 Daniel Veillard <daniel@veillard.com>
* libxml-2.0.pc.in: applied patch from Mikhail Zabaluev to separate
library flags for shared and static builds, fixes #344594. If this
bites you, use xml2-config.
Wed Oct 11 11:27:37 CEST 2006 Daniel Veillard <daniel@veillard.com> Wed Oct 11 11:27:37 CEST 2006 Daniel Veillard <daniel@veillard.com>
* python/Makefile.am: remove the build path recorded in the python * python/Makefile.am: remove the build path recorded in the python

3
libxml-2.0.pc.in
View File

@ -8,5 +8,6 @@ Name: libXML
Version: @VERSION@ Version: @VERSION@
Description: libXML library version2. Description: libXML library version2.
Requires: Requires:
Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ Libs: -L${libdir} -lxml2
Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@

14
xmlschemastypes.c
View File

@ -5715,6 +5715,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
if ((dec.frac == 0) || (dec.frac == dec.total)) if ((dec.frac == 0) || (dec.frac == dec.total))
bufsize++; bufsize++;
buf = xmlMalloc(bufsize); buf = xmlMalloc(bufsize);
if (buf == NULL)
return(-1);
offs = buf; offs = buf;
if (dec.sign) if (dec.sign)
*offs++ = '-'; *offs++ = '-';
@ -5788,6 +5790,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
if (dec.sign) if (dec.sign)
bufsize++; bufsize++;
*retValue = xmlMalloc(bufsize); *retValue = xmlMalloc(bufsize);
if (*retValue == NULL)
return(-1);
if (dec.hi != 0) { if (dec.hi != 0) {
if (dec.sign) if (dec.sign)
snprintf((char *) *retValue, bufsize, snprintf((char *) *retValue, bufsize,
@ -5863,7 +5867,9 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
case XML_SCHEMAS_GMONTH: { case XML_SCHEMAS_GMONTH: {
/* TODO: Unclear in XML Schema 1.0 */ /* TODO: Unclear in XML Schema 1.0 */
/* TODO: What to do with the timezone? */ /* TODO: What to do with the timezone? */
*retValue = xmlMalloc(5); *retValue = xmlMalloc(6);
if (*retValue == NULL)
return(-1);
snprintf((char *) *retValue, 6, "--%02u", snprintf((char *) *retValue, 6, "--%02u",
val->value.date.mon); val->value.date.mon);
} }
@ -5872,6 +5878,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
/* TODO: Unclear in XML Schema 1.0 */ /* TODO: Unclear in XML Schema 1.0 */
/* TODO: What to do with the timezone? */ /* TODO: What to do with the timezone? */
*retValue = xmlMalloc(6); *retValue = xmlMalloc(6);
if (*retValue == NULL)
return(-1);
snprintf((char *) *retValue, 6, "---%02u", snprintf((char *) *retValue, 6, "---%02u",
val->value.date.day); val->value.date.day);
} }
@ -5880,6 +5888,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
/* TODO: Unclear in XML Schema 1.0 */ /* TODO: Unclear in XML Schema 1.0 */
/* TODO: What to do with the timezone? */ /* TODO: What to do with the timezone? */
*retValue = xmlMalloc(8); *retValue = xmlMalloc(8);
if (*retValue == NULL)
return(-1);
snprintf((char *) *retValue, 8, "--%02u-%02u", snprintf((char *) *retValue, 8, "--%02u-%02u",
val->value.date.mon, val->value.date.day); val->value.date.mon, val->value.date.day);
} }
@ -6024,6 +6034,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
*retValue = BAD_CAST xmlStrdup(BAD_CAST "???"); *retValue = BAD_CAST xmlStrdup(BAD_CAST "???");
return (1); return (1);
} }
if (*retValue == NULL)
return(-1);
return (0); return (0);
} }