shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-02-05 05:47:00 +03:00
Code

minimize use of HAVE_CONFIG_H

Browse Source 
as build process for supported platforms provide "config.h" header file
This commit is contained in:
Roumen Petrov 2012-08-13 16:56:11 +08:00 committed by Daniel Veillard
parent 8886f335c7
commit 1f0453f715
7 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libxml.h
View File

@ -29,6 +29,11 @@
#include <win32config.h> #include <win32config.h>
#include <libxml/xmlversion.h> #include <libxml/xmlversion.h>
#else #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 "config.h"
#include <libxml/xmlversion.h> #include <libxml/xmlversion.h>
#endif #endif

3
runsuite.c
View File

@ -6,11 +6,8 @@
* daniel@veillard.com * daniel@veillard.com
*/ */
#ifdef HAVE_CONFIG_H
#include "libxml.h" #include "libxml.h"
#else
#include <stdio.h> #include <stdio.h>
#endif
#if !defined(_WIN32) || defined(__CYGWIN__) #if !defined(_WIN32) || defined(__CYGWIN__)
#include <unistd.h> #include <unistd.h>

3
runtest.c
View File

@ -11,11 +11,8 @@
* daniel@veillard.com * daniel@veillard.com
*/ */
#ifdef HAVE_CONFIG_H
#include "libxml.h" #include "libxml.h"
#else
#include <stdio.h> #include <stdio.h>
#endif
#if !defined(_WIN32) || defined(__CYGWIN__) #if !defined(_WIN32) || defined(__CYGWIN__)
#include <unistd.h> #include <unistd.h>

3
runxmlconf.c
View File

@ -6,11 +6,8 @@
* daniel@veillard.com * daniel@veillard.com
*/ */
#ifdef HAVE_CONFIG_H
#include "libxml.h" #include "libxml.h"
#else
#include <stdio.h> #include <stdio.h>
#endif
#ifdef LIBXML_XPATH_ENABLED #ifdef LIBXML_XPATH_ENABLED

3
testapi.c
View File

@ -8,11 +8,8 @@
* daniel@veillard.com * daniel@veillard.com
*/ */
#ifdef HAVE_CONFIG_H
#include "libxml.h" #include "libxml.h"
#else
#include <stdio.h> #include <stdio.h>
#endif
#include <stdlib.h> /* for putenv() */ #include <stdlib.h> /* for putenv() */
#include <string.h> #include <string.h>

3
testrecurse.c
View File

@ -10,11 +10,8 @@
* daniel@veillard.com * daniel@veillard.com
*/ */
#ifdef HAVE_CONFIG_H
#include "libxml.h" #include "libxml.h"
#else
#include <stdio.h> #include <stdio.h>
#endif
#if !defined(_WIN32) || defined(__CYGWIN__) #if !defined(_WIN32) || defined(__CYGWIN__)
#include <unistd.h> #include <unistd.h>

2
win32/VC10/runsuite.vcxproj
View File

@ -46,7 +46,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<PreprocessorDefinitions>HAVE_CONFIG_H;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>