From 1f0453f71546071d13c1cb06b7b6799e63fd4f9f Mon Sep 17 00:00:00 2001 From: Roumen Petrov Date: Mon, 13 Aug 2012 16:56:11 +0800 Subject: [PATCH] minimize use of HAVE_CONFIG_H as build process for supported platforms provide "config.h" header file --- libxml.h | 5 +++++ runsuite.c | 3 --- runtest.c | 3 --- runxmlconf.c | 3 --- testapi.c | 3 --- testrecurse.c | 3 --- win32/VC10/runsuite.vcxproj | 2 +- 7 files changed, 6 insertions(+), 16 deletions(-) diff --git a/libxml.h b/libxml.h index fa3aea4f..efe285bc 100644 --- a/libxml.h +++ b/libxml.h @@ -29,6 +29,11 @@ #include #include #else +/* + * Currently supported platforms use either autoconf or + * copy to config.h own "preset" configuration file. + * As result ifdef HAVE_CONFIG_H is omited here. + */ #include "config.h" #include #endif diff --git a/runsuite.c b/runsuite.c index d1dc2ca9..8ba5f6f9 100644 --- a/runsuite.c +++ b/runsuite.c @@ -6,11 +6,8 @@ * daniel@veillard.com */ -#ifdef HAVE_CONFIG_H #include "libxml.h" -#else #include -#endif #if !defined(_WIN32) || defined(__CYGWIN__) #include diff --git a/runtest.c b/runtest.c index c7214f2b..7cde25b1 100644 --- a/runtest.c +++ b/runtest.c @@ -11,11 +11,8 @@ * daniel@veillard.com */ -#ifdef HAVE_CONFIG_H #include "libxml.h" -#else #include -#endif #if !defined(_WIN32) || defined(__CYGWIN__) #include diff --git a/runxmlconf.c b/runxmlconf.c index 52d50d77..a271343e 100644 --- a/runxmlconf.c +++ b/runxmlconf.c @@ -6,11 +6,8 @@ * daniel@veillard.com */ -#ifdef HAVE_CONFIG_H #include "libxml.h" -#else #include -#endif #ifdef LIBXML_XPATH_ENABLED diff --git a/testapi.c b/testapi.c index 25e47be7..99c536f8 100644 --- a/testapi.c +++ b/testapi.c @@ -8,11 +8,8 @@ * daniel@veillard.com */ -#ifdef HAVE_CONFIG_H #include "libxml.h" -#else #include -#endif #include /* for putenv() */ #include diff --git a/testrecurse.c b/testrecurse.c index 5cfcc2c6..efdccc06 100644 --- a/testrecurse.c +++ b/testrecurse.c @@ -10,11 +10,8 @@ * daniel@veillard.com */ -#ifdef HAVE_CONFIG_H #include "libxml.h" -#else #include -#endif #if !defined(_WIN32) || defined(__CYGWIN__) #include diff --git a/win32/VC10/runsuite.vcxproj b/win32/VC10/runsuite.vcxproj index b4ccc370..83cc991a 100644 --- a/win32/VC10/runsuite.vcxproj +++ b/win32/VC10/runsuite.vcxproj @@ -46,7 +46,7 @@ Disabled $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) 4996 - HAVE_CONFIG_H;_UNICODE;UNICODE;%(PreprocessorDefinitions) + _UNICODE;UNICODE;%(PreprocessorDefinitions) /MP %(AdditionalOptions) false