diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2003-02-06 01:25:48 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2003-02-06 01:25:48 +0000 |
| commit | 519f106ac6e9111a856d227bdfc1685f9a2ed606 (patch) | |
| tree | aaf754e0b7382e5e2eae089d8370c3dd0e88216b /textproc/expat2 | |
| parent | 6a07c0e8c00a70ab61c83590dbf6475935cacbc9 (diff) | |
| download | ports-519f106ac6e9111a856d227bdfc1685f9a2ed606.tar.gz ports-519f106ac6e9111a856d227bdfc1685f9a2ed606.zip | |
Move declaration of enum XML_Status to more earlier place.
This patch is already included in expat repository and will be removed
after next version is released.
Pointed out by: Jordanas Kriauciunas <joskis@xxx.lt>
Notes
Notes:
svn path=/head/; revision=74929
Diffstat (limited to 'textproc/expat2')
| -rw-r--r-- | textproc/expat2/Makefile | 1 | ||||
| -rw-r--r-- | textproc/expat2/files/patch-expat.h | 62 |
2 files changed, 63 insertions, 0 deletions
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile index b6f684994d80..4840403904f3 100644 --- a/textproc/expat2/Makefile +++ b/textproc/expat2/Makefile @@ -7,6 +7,7 @@ PORTNAME= expat PORTVERSION= 1.95.6 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= expat diff --git a/textproc/expat2/files/patch-expat.h b/textproc/expat2/files/patch-expat.h new file mode 100644 index 000000000000..1399f19289ec --- /dev/null +++ b/textproc/expat2/files/patch-expat.h @@ -0,0 +1,62 @@ +--- lib/expat.h.orig Fri Jan 17 07:03:42 2003 ++++ lib/expat.h Thu Feb 6 10:19:21 2003 +@@ -57,6 +57,26 @@ + #define XML_TRUE ((XML_Bool) 1) + #define XML_FALSE ((XML_Bool) 0) + ++/* The XML_Status enum gives the possible return values for several ++ API functions. The preprocessor #defines are included so this ++ stanza can be added to code that still needs to support older ++ versions of Expat 1.95.x: ++ ++ #ifndef XML_STATUS_OK ++ #define XML_STATUS_OK 1 ++ #define XML_STATUS_ERROR 0 ++ #endif ++ ++ Otherwise, the #define hackery is quite ugly and would have been ++ dropped. ++*/ ++enum XML_Status { ++ XML_STATUS_ERROR = 0, ++#define XML_STATUS_ERROR XML_STATUS_ERROR ++ XML_STATUS_OK = 1 ++#define XML_STATUS_OK XML_STATUS_OK ++}; ++ + enum XML_Error { + XML_ERROR_NONE, + XML_ERROR_NO_MEMORY, +@@ -717,28 +737,11 @@ + detected. The last call to XML_Parse must have isFinal true; len + may be zero for this call (or any other). + +- The XML_Status enum gives the possible return values for the +- XML_Parse and XML_ParseBuffer functions. Though the return values +- for these functions has always been described as a Boolean value, +- the implementation, at least for the 1.95.x series, has always +- returned exactly one of these values. The preprocessor #defines +- are included so this stanza can be added to code that still needs +- to support older versions of Expat 1.95.x: +- +- #ifndef XML_STATUS_OK +- #define XML_STATUS_OK 1 +- #define XML_STATUS_ERROR 0 +- #endif +- +- Otherwise, the #define hackery is quite ugly and would have been dropped. ++ Though the return values for these functions has always been ++ described as a Boolean value, the implementation, at least for the ++ 1.95.x series, has always returned exactly one of the XML_Status ++ values. + */ +-enum XML_Status { +- XML_STATUS_ERROR = 0, +-#define XML_STATUS_ERROR XML_STATUS_ERROR +- XML_STATUS_OK = 1 +-#define XML_STATUS_OK XML_STATUS_OK +-}; +- + XMLPARSEAPI(enum XML_Status) + XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); + |