From a14130e4234b06b8b7838874b0d93a3e99f3527a Mon Sep 17 00:00:00 2001 From: rfm Date: Sat, 6 Dec 2008 16:52:03 +0000 Subject: [PATCH] Fix for #25026 I hope git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27227 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/Additions/GSXML.m | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index b32775f6d..bc7451902 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-06 Richard Frith-Macdonald + + * Source/Additions/GSXML.m: + Hack to avoid issues on systems where the xml headers use the reserved + word 'id'. + 2008-12-06 Richard Frith-Macdonald * Source/Additions/GSCategories.m: ([+launchPathForTool:]) diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m index 9e3998b42..6b0402e08 100644 --- a/Source/Additions/GSXML.m +++ b/Source/Additions/GSXML.m @@ -54,6 +54,10 @@ #include "GNUstepBase/GSXML.h" #include +/* Avoid problems on systems where the xml headers use 'id' + */ +#define id GSXMLID + /* libxml headers */ #include #include @@ -79,6 +83,9 @@ #include #endif /* HAVE_LIBXSLT */ +#undef id + + /* * optimization *