summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2006-08-28 16:16:04 +0000
committerishmal <ishmal@users.sourceforge.net>2006-08-28 16:16:04 +0000
commit8249d9fc8ebccc61c08037e2e726c7c652059949 (patch)
tree37c1061e85e441bd1f466fb8a070ba3eb7cd75b9 /src
parentFinish method and property tables. Clean up comments. (diff)
downloadinkscape-8249d9fc8ebccc61c08037e2e726c7c652059949.tar.gz
inkscape-8249d9fc8ebccc61c08037e2e726c7c652059949.zip
Added an #undef for SEVERITY_ERROR, which conflicts with a Win32 macro
(bzr r1652)
Diffstat (limited to 'src')
-rw-r--r--src/dom/dom.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/dom/dom.h b/src/dom/dom.h
index bf0d0534a..e195dae7d 100644
--- a/src/dom/dom.h
+++ b/src/dom/dom.h
@@ -44,6 +44,11 @@
#endif
#endif
+//# Unfortunate hack for a name collision
+#ifdef SEVERITY_ERROR
+#undef SEVERITY_ERROR
+#endif
+
#define XMLNSNAME "http://www.w3.org/2000/xmlns/"
namespace org