Attachment #263115 for bug #354745





#ifdef HAVE_LIBXML2

#include "win_defines_save.h" /* icu workaround */
#include <libxml/xpathInternals.h>
#include <libxml/xmlsave.h>
#include <libxml/SAX2.h>
#include <libxml/parserInternals.h>
#include "win_defines_restore.h" /* icu workaround */

/* not defined in older versions */
#define XML_SAVE_FORMAT     1

Lines 40-46 WINE_DEFAULT_DEBUG_CHANNEL(msxml); Link Here

(-)a/dlls/msxml3/httprequest.c (+2 lines)
40		40
41	#ifdef HAVE_LIBXML2	41	#ifdef HAVE_LIBXML2
42		42
		43	#include "win_defines_save.h" /* icu workaround */
43	#include <libxml/encoding.h>	44	#include <libxml/encoding.h>
		45	#include "win_defines_restore.h" /* icu workaround */
44		46
45	static const WCHAR MethodGetW[] = {'G','E','T',0};	47	static const WCHAR MethodGetW[] = {'G','E','T',0};
46	static const WCHAR MethodPutW[] = {'P','U','T',0};	48	static const WCHAR MethodPutW[] = {'P','U','T',0};





#ifdef HAVE_LIBXML2

#include "win_defines_save.h" /* icu workaround */
#ifdef HAVE_LIBXML_PARSER_H
#include <libxml/parser.h>
#endif



#include <libxml/xmlerror.h>
#include "win_defines_restore.h" /* icu workaround */

extern void schemasInit(void);
extern void schemasCleanup(void);


extern void* libxslt_handle;
#ifdef SONAME_LIBXSLT
# include "win_defines_save.h" /* icu workaround */
# ifdef HAVE_LIBXSLT_PATTERN_H
#  include <libxslt/pattern.h>
# endif

# endif
# include <libxslt/xsltutils.h>
# include <libxslt/xsltInternals.h>
# include "win_defines_restore.h" /* icu workaround */

# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
MAKE_FUNCPTR(xsltApplyStylesheet);

Lines 33-39 Link Here

(-)a/dlls/msxml3/node.c (+2 lines)
33	#include "msxml_private.h"	33	#include "msxml_private.h"
34		34
35	#ifdef HAVE_LIBXML2	35	#ifdef HAVE_LIBXML2
		36	# include "win_defines_save.h" /* icu workaround */
36	# include <libxml/HTMLtree.h>	37	# include <libxml/HTMLtree.h>
		38	# include "win_defines_restore.h" /* icu workaround */
37	#endif	39	#endif
38		40
39	#include "wine/debug.h"	41	#include "wine/debug.h"

Lines 48-55 WINE_DEFAULT_DEBUG_CHANNEL(msxml); Link Here

(-)a/dlls/msxml3/queryresult.c (+2 lines)
48		48
49	#ifdef HAVE_LIBXML2	49	#ifdef HAVE_LIBXML2
50		50
		51	#include "win_defines_save.h" /* icu workaround */
51	#include <libxml/xpath.h>	52	#include <libxml/xpath.h>
52	#include <libxml/xpathInternals.h>	53	#include <libxml/xpathInternals.h>
		54	#include "win_defines_restore.h" /* icu workaround */
53		55
54	int registerNamespaces(xmlXPathContextPtr ctxt);	56	int registerNamespaces(xmlXPathContextPtr ctxt);
55	xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str);	57	xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str);

Lines 42-49 WINE_DEFAULT_DEBUG_CHANNEL(msxml); Link Here

(-)a/dlls/msxml3/saxreader.c (+2 lines)
42		42
43	#ifdef HAVE_LIBXML2	43	#ifdef HAVE_LIBXML2
44		44
		45	#include "win_defines_save.h" /* icu workaround */
45	#include <libxml/SAX2.h>	46	#include <libxml/SAX2.h>
46	#include <libxml/parserInternals.h>	47	#include <libxml/parserInternals.h>
		48	#include "win_defines_restore.h" /* icu workaround */
47		49
48	typedef struct _saxreader	50	typedef struct _saxreader
49	{	51	{

Lines 47-52 WINE_DEFAULT_DEBUG_CHANNEL(msxml); Link Here

(-)a/dlls/msxml3/schema.c (+2 lines)
47		47
48	#ifdef HAVE_LIBXML2	48	#ifdef HAVE_LIBXML2
49		49
		50	#include "win_defines_save.h" /* icu workaround */
50	#include <libxml/tree.h>	51	#include <libxml/tree.h>
51	#include <libxml/xmlschemas.h>	52	#include <libxml/xmlschemas.h>
52	#include <libxml/schemasInternals.h>	53	#include <libxml/schemasInternals.h>
Lines 54-59 WINE_DEFAULT_DEBUG_CHANNEL(msxml); Link Here
54	#include <libxml/parser.h>	55	#include <libxml/parser.h>
55	#include <libxml/parserInternals.h>	56	#include <libxml/parserInternals.h>
56	#include <libxml/xmlIO.h>	57	#include <libxml/xmlIO.h>
		58	#include "win_defines_restore.h" /* icu workaround */
57		59
58	xmlDocPtr XDR_to_XSD_doc(xmlDocPtr xdr_doc, xmlChar const* nsURI);	60	xmlDocPtr XDR_to_XSD_doc(xmlDocPtr xdr_doc, xmlChar const* nsURI);
59		61




/*
 *    Restore previously saved *WIN* defines
 *
 * Copyright 2011 Alexandre Rostovtsev
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

/* libxml2 can be built with icu support, in which case libxml2 and libxslt
 * headers will pull in icu headers.
 * icu-4.6 (and perhaps other versions too) assumes that if WIN32, _WIN32,
 * WIN64, or _WIN64 are defined, then the platform lacks inttypes.h; it then
 * tries to define some standard integer types, which conflict with existing
 * definitions, and as a result, msxml3 will fail to build.
 * See http://bugs.gentoo.org/show_bug.cgi?id=354745
 *
 * We therefore need to wrap all libxml2 and libxslt include statements with
 * #include "win_defines_save.h" / #include "win_defines_restore.h"
 * which will save and then restore the *WIN* defines. */

#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif

#ifdef HAVE_INTTYPES_H

#ifdef WIN32_DEFINE_SAVED
# define WIN32 WIN32_DEFINE_SAVED
# undef WIN32_DEFINE_SAVED
#endif
#ifdef _WIN32_DEFINE_SAVED
# define _WIN32 _WIN32_DEFINE_SAVED
# undef _WIN32_DEFINE_SAVED
#endif
#ifdef WIN64_DEFINE_SAVED
# define WIN64 WIN64_DEFINE_SAVED
# undef WIN64_DEFINE_SAVED
#endif
#ifdef _WIN64_DEFINE_SAVED
# define _WIN64 _WIN64_DEFINE_SAVED
# undef _WIN64_DEFINE_SAVED
#endif

#endif /* HAVE_INTTYPES_H */




/*
 *    Filter and save certain *WIN* defines
 *
 * Copyright 2011 Alexandre Rostovtsev
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

/* libxml2 can be built with icu support, in which case libxml2 and libxslt
 * headers will pull in icu headers.
 * icu-4.6 (and perhaps other versions too) assumes that if WIN32, _WIN32,
 * WIN64, or _WIN64 are defined, then the platform lacks inttypes.h; it then
 * tries to define some standard integer types, which conflict with existing
 * definitions, and as a result, msxml3 will fail to build.
 * See http://bugs.gentoo.org/show_bug.cgi?id=354745
 *
 * We therefore need to wrap all libxml2 and libxslt include statements with
 * #include "win_defines_save.h" / #include "win_defines_restore.h"
 * which will save and then restore the *WIN* defines. */

#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif

#ifdef HAVE_INTTYPES_H

#ifdef WIN32
# define WIN32_DEFINE_SAVED WIN32
# undef WIN32
#endif
#ifdef _WIN32
# define _WIN32_DEFINE_SAVED _WIN32
# undef _WIN32
#endif
#ifdef WIN64
# define WIN64_DEFINE_SAVED WIN64
# undef WIN64
#endif
#ifdef _WIN64
# define _WIN64_DEFINE_SAVED _WIN64
# undef _WIN64
#endif

#endif /* HAVE_INTTYPES_H */

Lines 31-37 WINE_DEFAULT_DEBUG_CHANNEL(msxml); Link Here

(-)a/dlls/msxml3/xdr.c (+2 lines)
31		31
32	#ifdef HAVE_LIBXML2	32	#ifdef HAVE_LIBXML2
33		33
		34	#include "win_defines_save.h" /* icu workaround */
34	#include <libxml/tree.h>	35	#include <libxml/tree.h>
		36	#include "win_defines_restore.h" /* icu workaround */
35		37
36	static const xmlChar DT_prefix[] = "dt";	38	static const xmlChar DT_prefix[] = "dt";
37	static const xmlChar DT_href[] = "urn:schemas-microsoft-com:datatypes";	39	static const xmlChar DT_href[] = "urn:schemas-microsoft-com:datatypes";

Lines 31-39 Link Here

(-)a/dlls/msxml3/xslpattern.h (+2 lines)
31	#error You must have libxml2 to use this header	31	#error You must have libxml2 to use this header
32	#endif	32	#endif
33		33
		34	#include "win_defines_save.h" /* icu workaround */
34	#include <libxml/tree.h>	35	#include <libxml/tree.h>
35	#include <libxml/xmlstring.h>	36	#include <libxml/xmlstring.h>
36	#include <libxml/xpath.h>	37	#include <libxml/xpath.h>
		38	#include "win_defines_restore.h" /* icu workaround */
37		39
38	typedef struct _parser_param {	40	typedef struct _parser_param {
39	void* yyscanner;	41	void* yyscanner;

Lines 24-30 Link Here

(-)a/dlls/msxml3/xslpattern.y (-1 / +2 lines)
24		24
25	#ifdef HAVE_LIBXML2	25	#ifdef HAVE_LIBXML2
26	#include "xslpattern.h"	26	#include "xslpattern.h"
		27	#include "win_defines_save.h" /* icu workaround */
27	#include <libxml/xpathInternals.h>	28	#include <libxml/xpathInternals.h>
		29	#include "win_defines_restore.h" /* icu workaround */
28		30
29	WINE_DEFAULT_DEBUG_CHANNEL(msxml);	31	WINE_DEFAULT_DEBUG_CHANNEL(msxml);
30		32
31	-

Return to bug 354745

Lines 159-164 BOOL dispex_query_interface(DispatchEx,REFIID,void*); Link Here

(-)a/dlls/msxml3/msxml_private.h (+4 lines)
159		159
160	#ifdef HAVE_LIBXML2	160	#ifdef HAVE_LIBXML2
161		161
		162	#include "win_defines_save.h" /* icu workaround */
162	#ifdef HAVE_LIBXML_PARSER_H	163	#ifdef HAVE_LIBXML_PARSER_H
163	#include <libxml/parser.h>	164	#include <libxml/parser.h>
164	#endif	165	#endif
Lines 166-171 BOOL dispex_query_interface(DispatchEx,REFIID,void*); Link Here
166		167
167		168
168	#include <libxml/xmlerror.h>	169	#include <libxml/xmlerror.h>
		170	#include "win_defines_restore.h" /* icu workaround */
169		171
170	extern void schemasInit(void);	172	extern void schemasInit(void);
171	extern void schemasCleanup(void);	173	extern void schemasCleanup(void);
Lines 357-362 static inline HRESULT return_null_bstr(BSTR *p) Link Here
357		359
358	extern void* libxslt_handle;	360	extern void* libxslt_handle;
359	#ifdef SONAME_LIBXSLT	361	#ifdef SONAME_LIBXSLT
		362	# include "win_defines_save.h" /* icu workaround */
360	# ifdef HAVE_LIBXSLT_PATTERN_H	363	# ifdef HAVE_LIBXSLT_PATTERN_H
361	# include <libxslt/pattern.h>	364	# include <libxslt/pattern.h>
362	# endif	365	# endif
Lines 365-370 extern void* libxslt_handle; Link Here
365	# endif	368	# endif
366	# include <libxslt/xsltutils.h>	369	# include <libxslt/xsltutils.h>
367	# include <libxslt/xsltInternals.h>	370	# include <libxslt/xsltInternals.h>
		371	# include "win_defines_restore.h" /* icu workaround */
368		372
369	# define MAKE_FUNCPTR(f) extern typeof(f) * p##f	373	# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
370	MAKE_FUNCPTR(xsltApplyStylesheet);	374	MAKE_FUNCPTR(xsltApplyStylesheet);

Lines 49-58 WINE_DEFAULT_DEBUG_CHANNEL(msxml); Link Here

(-)a/dlls/msxml3/domdoc.c (+2 lines)
49		49
50	#ifdef HAVE_LIBXML2	50	#ifdef HAVE_LIBXML2
51		51
		52	#include "win_defines_save.h" /* icu workaround */
52	#include <libxml/xpathInternals.h>	53	#include <libxml/xpathInternals.h>
53	#include <libxml/xmlsave.h>	54	#include <libxml/xmlsave.h>
54	#include <libxml/SAX2.h>	55	#include <libxml/SAX2.h>
55	#include <libxml/parserInternals.h>	56	#include <libxml/parserInternals.h>
		57	#include "win_defines_restore.h" /* icu workaround */
56		58
57	/* not defined in older versions */	59	/* not defined in older versions */
58	#define XML_SAVE_FORMAT 1	60	#define XML_SAVE_FORMAT 1

Line 0 Link Here

(-)a/dlls/msxml3/win_defines_restore.h (+56 lines)
	1	/*
	2	* Restore previously saved WIN defines
	3	*
	4	* Copyright 2011 Alexandre Rostovtsev
	5	*
	6	* This library is free software; you can redistribute it and/or
	7	* modify it under the terms of the GNU Lesser General Public
	8	* License as published by the Free Software Foundation; either
	9	* version 2.1 of the License, or (at your option) any later version.
	10	*
	11	* This library is distributed in the hope that it will be useful,
	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	14	* Lesser General Public License for more details.
	15	*
	16	* You should have received a copy of the GNU Lesser General Public
	17	* License along with this library; if not, write to the Free Software
	18	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
	19	*/
	20
	21	/* libxml2 can be built with icu support, in which case libxml2 and libxslt
	22	* headers will pull in icu headers.
	23	* icu-4.6 (and perhaps other versions too) assumes that if WIN32, _WIN32,
	24	* WIN64, or _WIN64 are defined, then the platform lacks inttypes.h; it then
	25	* tries to define some standard integer types, which conflict with existing
	26	* definitions, and as a result, msxml3 will fail to build.
	27	* See http://bugs.gentoo.org/show_bug.cgi?id=354745
	28	*
	29	* We therefore need to wrap all libxml2 and libxslt include statements with
	30	* #include "win_defines_save.h" / #include "win_defines_restore.h"
	31	* which will save and then restore the WIN defines. */
	32
	33	#ifndef __WINE_CONFIG_H
	34	# error You must include config.h to use this header
	35	#endif
	36
	37	#ifdef HAVE_INTTYPES_H
	38
	39	#ifdef WIN32_DEFINE_SAVED
	40	# define WIN32 WIN32_DEFINE_SAVED
	41	# undef WIN32_DEFINE_SAVED
	42	#endif
	43	#ifdef _WIN32_DEFINE_SAVED
	44	# define _WIN32 _WIN32_DEFINE_SAVED
	45	# undef _WIN32_DEFINE_SAVED
	46	#endif
	47	#ifdef WIN64_DEFINE_SAVED
	48	# define WIN64 WIN64_DEFINE_SAVED
	49	# undef WIN64_DEFINE_SAVED
	50	#endif
	51	#ifdef _WIN64_DEFINE_SAVED
	52	# define _WIN64 _WIN64_DEFINE_SAVED
	53	# undef _WIN64_DEFINE_SAVED
	54	#endif
	55
	56	#endif /* HAVE_INTTYPES_H */

Line 0 Link Here

(-)a/dlls/msxml3/win_defines_save.h (+56 lines)
	1	/*
	2	* Filter and save certain WIN defines
	3	*
	4	* Copyright 2011 Alexandre Rostovtsev
	5	*
	6	* This library is free software; you can redistribute it and/or
	7	* modify it under the terms of the GNU Lesser General Public
	8	* License as published by the Free Software Foundation; either
	9	* version 2.1 of the License, or (at your option) any later version.
	10	*
	11	* This library is distributed in the hope that it will be useful,
	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	14	* Lesser General Public License for more details.
	15	*
	16	* You should have received a copy of the GNU Lesser General Public
	17	* License along with this library; if not, write to the Free Software
	18	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
	19	*/
	20
	21	/* libxml2 can be built with icu support, in which case libxml2 and libxslt
	22	* headers will pull in icu headers.
	23	* icu-4.6 (and perhaps other versions too) assumes that if WIN32, _WIN32,
	24	* WIN64, or _WIN64 are defined, then the platform lacks inttypes.h; it then
	25	* tries to define some standard integer types, which conflict with existing
	26	* definitions, and as a result, msxml3 will fail to build.
	27	* See http://bugs.gentoo.org/show_bug.cgi?id=354745
	28	*
	29	* We therefore need to wrap all libxml2 and libxslt include statements with
	30	* #include "win_defines_save.h" / #include "win_defines_restore.h"
	31	* which will save and then restore the WIN defines. */
	32
	33	#ifndef __WINE_CONFIG_H
	34	# error You must include config.h to use this header
	35	#endif
	36
	37	#ifdef HAVE_INTTYPES_H
	38
	39	#ifdef WIN32
	40	# define WIN32_DEFINE_SAVED WIN32
	41	# undef WIN32
	42	#endif
	43	#ifdef _WIN32
	44	# define _WIN32_DEFINE_SAVED _WIN32
	45	# undef _WIN32
	46	#endif
	47	#ifdef WIN64
	48	# define WIN64_DEFINE_SAVED WIN64
	49	# undef WIN64
	50	#endif
	51	#ifdef _WIN64
	52	# define _WIN64_DEFINE_SAVED _WIN64
	53	# undef _WIN64
	54	#endif
	55
	56	#endif /* HAVE_INTTYPES_H */