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 *