|
66 | 66 | #if LIBXML_VERSION >= 20704
|
67 | 67 | #define HAVE_XMLSTRUCTUREDERRORCONTEXT 1
|
68 | 68 | #endif
|
| 69 | + |
| 70 | +/* |
| 71 | + * libxml2 2.12 decided to insert "const" into the error handler API. |
| 72 | + */ |
| 73 | +#if LIBXML_VERSION >= 21200 |
| 74 | +#define PgXmlErrorPtr const xmlError * |
| 75 | +#else |
| 76 | +#define PgXmlErrorPtr xmlErrorPtr |
| 77 | +#endif |
| 78 | + |
69 | 79 | #endif /* USE_LIBXML */
|
70 | 80 |
|
71 | 81 | #include "access/htup_details.h"
|
@@ -123,7 +133,7 @@ static xmlParserInputPtr xmlPgEntityLoader(const char *URL, const char *ID,
|
123 | 133 | xmlParserCtxtPtr ctxt);
|
124 | 134 | static void xml_errsave(Node *escontext, PgXmlErrorContext *errcxt,
|
125 | 135 | int sqlcode, const char *msg);
|
126 |
| -static void xml_errorHandler(void *data, xmlErrorPtr error); |
| 136 | +static void xml_errorHandler(void *data, PgXmlErrorPtr error); |
127 | 137 | static int errdetail_for_xml_code(int code);
|
128 | 138 | static void chopStringInfoNewlines(StringInfo str);
|
129 | 139 | static void appendStringInfoLineSeparator(StringInfo str);
|
@@ -2002,7 +2012,7 @@ xml_errsave(Node *escontext, PgXmlErrorContext *errcxt,
|
2002 | 2012 | * Error handler for libxml errors and warnings
|
2003 | 2013 | */
|
2004 | 2014 | static void
|
2005 |
| -xml_errorHandler(void *data, xmlErrorPtr error) |
| 2015 | +xml_errorHandler(void *data, PgXmlErrorPtr error) |
2006 | 2016 | {
|
2007 | 2017 | PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data;
|
2008 | 2018 | xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt;
|
|
0 commit comments