From 9e537937a69591d89a56c1b251a3cd7b85610106 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 21 Mar 2002 13:08:08 +0000 Subject: [PATCH] applied 2 fixups from Igor Daniel * xmlcatalog.c include/libxml/xmlversion.h.in: applied 2 fixups from Igor Daniel --- ChangeLog | 5 +++++ include/libxml/xmlversion.h.in | 2 -- xmlcatalog.c | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fc129b3..305da87a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 21 14:07:13 CET 2002 Daniel Veillard + + * xmlcatalog.c include/libxml/xmlversion.h.in: applied 2 fixups + from Igor + Thu Mar 21 13:30:06 CET 2002 Daniel Veillard * xpath.c: fixing #75619, related to a problem when trying diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in index 7b273c18..d99c58af 100644 --- a/include/libxml/xmlversion.h.in +++ b/include/libxml/xmlversion.h.in @@ -167,11 +167,9 @@ extern void xmlCheckVersion(int version); * * Whether iconv support is available */ -#if !defined(WIN32) || defined(__CYGWIN__) #if @WITH_ICONV@ #define LIBXML_ICONV_ENABLED #endif -#endif /** * LIBXML_DEBUG_ENABLED: diff --git a/xmlcatalog.c b/xmlcatalog.c index 78781f07..37969f01 100644 --- a/xmlcatalog.c +++ b/xmlcatalog.c @@ -6,7 +6,6 @@ * daniel@veillard.com */ -#define IN_LIBXML #include "libxml.h" #include