gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

include libxml2 headers early

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34995 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-03-25 20:22:39 +00:00
parent b383bbcf78
commit 980c878509
2 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-03-25 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSXMLPrivate.h: Change order of includes to ensure libxml2
headers are seen early.
2012-03-23 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLNode.m (-rootDocument): Better test for private document.

52
Source/NSXMLPrivate.h
View file

@ -27,6 +27,34 @@
#import "common.h"
#ifdef HAVE_LIBXML
/* Avoid problems on systems where the xml headers use 'id'
*/
#define id GSXMLID
/* libxml headers */
#include <libxml/tree.h>
#include <libxml/entities.h>
#include <libxml/parser.h>
#include <libxml/parserInternals.h>
#include <libxml/HTMLparser.h>
#include <libxml/xmlmemory.h>
#include <libxml/xmlsave.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
#ifdef HAVE_LIBXSLT
#include <libxslt/xslt.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
#endif /* HAVE_LIBXSLT */
#undef id
#endif /* HAVE_LIBXML */
#define EXPOSE_NSXMLDTD_IVARS 1
#define EXPOSE_NSXMLDTDNode_IVARS 1
#define EXPOSE_NSXMLDocument_IVARS 1
@ -178,30 +206,6 @@ StringFromXMLString(const unsigned char *bytes, unsigned length)
#ifdef HAVE_LIBXML
/* Avoid problems on systems where the xml headers use 'id'
*/
#define id GSXMLID
/* libxml headers */
#include <libxml/tree.h>
#include <libxml/entities.h>
#include <libxml/parser.h>
#include <libxml/parserInternals.h>
#include <libxml/HTMLparser.h>
#include <libxml/xmlmemory.h>
#include <libxml/xmlsave.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
#ifdef HAVE_LIBXSLT
#include <libxslt/xslt.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
#endif /* HAVE_LIBXSLT */
#undef id
// Private methods to manage libxml pointers...
@interface NSXMLNode (Private)
- (void *) _node;