commit 204f1f144ce1eded7dd25162c1c67e66a93fe450
author Patrick R. Gansterer <paroga@paroga.com> Thu May 10 20:24:00 2012 +0800
committer Daniel Veillard <veillard@redhat.com> Thu May 10 20:24:00 2012 +0800
tree 7206a7005ad3b862c1a5f94d82916fa0703de674
parent b91111b47599b9b07830db5ae2291739d22c384b

undef ERROR if already defined

pattern.c

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)
 

xmlregexp.c

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);