From 204f1f144ce1eded7dd25162c1c67e66a93fe450 Mon Sep 17 00:00:00 2001
From: "Patrick R. Gansterer" <paroga@paroga.com>
Date: Thu, 10 May 2012 20:24:00 +0800
Subject: [PATCH] undef ERROR if already defined

---
 pattern.c   | 3 +++
 xmlregexp.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pattern.c b/pattern.c
index 8cd69ae9..1570001c 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 aaff33e7..8a8be983 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);