diff options
| author | Coleman Kane <cokane@FreeBSD.org> | 2008-05-08 14:01:42 +0000 |
|---|---|---|
| committer | Coleman Kane <cokane@FreeBSD.org> | 2008-05-08 14:01:42 +0000 |
| commit | c4ca06b9b37b1e9ef6c4d96ef26e131fe687077c (patch) | |
| tree | 19b22ae580bd461451275b7f9274ca17474f8d2c | |
| parent | b53e9221214d6406927b73c8e3d15ab8043a3bb2 (diff) | |
Notes
| -rw-r--r-- | lib/libexpat/Makefile | 14 | ||||
| -rw-r--r-- | lib/libexpat/libbsdxml.3 | 4 | ||||
| -rw-r--r-- | sbin/ifconfig/regdomain.c | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile index 41142ecddd7d7..10961876886b4 100644 --- a/lib/libexpat/Makefile +++ b/lib/libexpat/Makefile @@ -6,22 +6,28 @@ LIB= bsdxml SHLIBDIR?= /lib SHLIB_MAJOR= 3 SRCS= xmlparse.c xmlrole.c xmltok.c -INCS= bsdxml.h +INCS= bsdxml.h bsdxml_external.h MAN= libbsdxml.3 .PATH: ${EXPAT}/lib -CFLAGS+= -I${.CURDIR} -CLEANFILES= bsdxml.h +CFLAGS+= -I${.CURDIR} -DHAVE_EXPAT_CONFIG_H +CLEANFILES= bsdxml.h bsdxml_external.h # OK, so it is not entirely unadultered: we ammend the COPYING # to point people to the right place, get rid of some VMS stuff -# and use FreeBSD style indempotency #ifndefs. +# and use FreeBSD style indempotency #ifndefs. We also want to +# point it at the new bsdxml_external.h rather than the old +# expat_external.h file. # bsdxml.h: expat.h unifdef -U__VMS < ${.ALLSRC} | \ sed -e 's/XmlParse_INCLUDED/_BSD_XML_H_/' \ -e 's/COPYING/src\/contrib\/expat\/COPYING/' \ + -e 's/expat_external/bsdxml_external/' \ > ${.TARGET} +bsdxml_external.h: expat_external.h + cp ${.ALLSRC} ${.TARGET} + .include <bsd.lib.mk> diff --git a/lib/libexpat/libbsdxml.3 b/lib/libexpat/libbsdxml.3 index 2d5fc3e5e82ef..7d7b0e7190997 100644 --- a/lib/libexpat/libbsdxml.3 +++ b/lib/libexpat/libbsdxml.3 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd October 4, 2002 +.Dd May 5, 2008 .Dt LIBBSDXML 3 .Os .Sh NAME @@ -36,7 +36,7 @@ .Sh DESCRIPTION The .Nm -library is a verbatim copy of the eXpat XML library version 1.95.5. +library is a verbatim copy of the eXpat XML library version 2.0.1. .Pp To avoid version and autoconfiguration issues, the library has been renamed to diff --git a/sbin/ifconfig/regdomain.c b/sbin/ifconfig/regdomain.c index 55c382ee97ab9..095650709daf7 100644 --- a/sbin/ifconfig/regdomain.c +++ b/sbin/ifconfig/regdomain.c @@ -403,7 +403,7 @@ lib80211_regdomain_readconfig(struct regdata *rdp, const void *p, size_t len) XML_SetElementHandler(parser, start_element, end_element); XML_SetCharacterDataHandler(parser, char_data); if (XML_Parse(parser, p, len, 1) != XML_STATUS_OK) { - warnx("%s: %s at line %d", __func__, + warnx("%s: %s at line %ld", __func__, XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser)); return -1; |