[libxml2] undef ERROR if already defined
- From: Daniel Veillard <veillard src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] undef ERROR if already defined
- Date: Thu, 10 May 2012 12:24:24 +0000 (UTC)
commit 204f1f144ce1eded7dd25162c1c67e66a93fe450
Author: Patrick R. Gansterer <paroga paroga com>
Date: Thu May 10 20:24:00 2012 +0800
undef ERROR if already defined
pattern.c | 3 +++
xmlregexp.c | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/pattern.c b/pattern.c
index 8cd69ae..1570001 100644
--- a/pattern.c
+++ b/pattern.c
@@ -39,6 +39,9 @@
/* #define DEBUG_STREAMING */
+#ifdef ERROR
+#undef ERROR
+#endif
#define ERROR(a, b, c, d)
#define ERROR5(a, b, c, d, e)
diff --git a/xmlregexp.c b/xmlregexp.c
index aaff33e..8a8be98 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -44,6 +44,9 @@
#define MAX_PUSH 10000000
+#ifdef ERROR
+#undef ERROR
+#endif
#define ERROR(str) \
ctxt->error = XML_REGEXP_COMPILE_ERROR; \
xmlRegexpErrCompile(ctxt, str);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]