From 60cc4a848b48bd7817c3521ba6d8fc28bb976519 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 13 Jan 2014 13:16:57 +0000 Subject: [PATCH] [LIBSXLT] * Create a main header and move some inclusions to it. CORE-7716 svn path=/trunk/; revision=61617 --- reactos/dll/3rdparty/libxslt/attributes.c | 40 +----------- reactos/dll/3rdparty/libxslt/attrvt.c | 14 +---- reactos/dll/3rdparty/libxslt/config.h | 2 + reactos/dll/3rdparty/libxslt/documents.c | 19 +----- reactos/dll/3rdparty/libxslt/extensions.c | 19 +----- reactos/dll/3rdparty/libxslt/extra.c | 25 +------- reactos/dll/3rdparty/libxslt/functions.c | 30 +-------- reactos/dll/3rdparty/libxslt/imports.c | 39 +----------- reactos/dll/3rdparty/libxslt/keys.c | 20 +----- reactos/dll/3rdparty/libxslt/namespaces.c | 40 +----------- reactos/dll/3rdparty/libxslt/numbers.c | 19 +----- reactos/dll/3rdparty/libxslt/pattern.c | 21 +------ reactos/dll/3rdparty/libxslt/precomp.h | 75 +++++++++++++++++++++++ reactos/dll/3rdparty/libxslt/preproc.c | 26 +------- reactos/dll/3rdparty/libxslt/security.c | 35 +---------- reactos/dll/3rdparty/libxslt/templates.c | 20 +----- reactos/dll/3rdparty/libxslt/transform.c | 35 +---------- reactos/dll/3rdparty/libxslt/variables.c | 23 +------ reactos/dll/3rdparty/libxslt/xslt.c | 30 +-------- reactos/dll/3rdparty/libxslt/xsltlocale.c | 7 +-- reactos/dll/3rdparty/libxslt/xsltutils.c | 26 +------- 21 files changed, 96 insertions(+), 469 deletions(-) create mode 100644 reactos/dll/3rdparty/libxslt/precomp.h diff --git a/reactos/dll/3rdparty/libxslt/attributes.c b/reactos/dll/3rdparty/libxslt/attributes.c index 2fa86e3c963..4ce2ea58a06 100644 --- a/reactos/dll/3rdparty/libxslt/attributes.c +++ b/reactos/dll/3rdparty/libxslt/attributes.c @@ -9,45 +9,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_MATH_H -#include -#endif -#ifdef HAVE_FLOAT_H -#include -#endif -#ifdef HAVE_IEEEFP_H -#include -#endif -#ifdef HAVE_NAN_H -#include -#endif -#ifdef HAVE_CTYPE_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "attributes.h" -#include "namespaces.h" -#include "templates.h" -#include "imports.h" -#include "transform.h" -#include "preproc.h" +#include "precomp.h" #define WITH_XSLT_DEBUG_ATTRIBUTES #ifdef WITH_XSLT_DEBUG diff --git a/reactos/dll/3rdparty/libxslt/attrvt.c b/reactos/dll/3rdparty/libxslt/attrvt.c index 125159cedf3..a23b62a15f9 100644 --- a/reactos/dll/3rdparty/libxslt/attrvt.c +++ b/reactos/dll/3rdparty/libxslt/attrvt.c @@ -13,19 +13,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#include -#include -#include -#include -#include "xslt.h" -#include "xsltutils.h" -#include "xsltInternals.h" -#include "templates.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_AVT diff --git a/reactos/dll/3rdparty/libxslt/config.h b/reactos/dll/3rdparty/libxslt/config.h index 78375947a4d..33bd0c15a47 100644 --- a/reactos/dll/3rdparty/libxslt/config.h +++ b/reactos/dll/3rdparty/libxslt/config.h @@ -1 +1,3 @@ +#pragma once + #include diff --git a/reactos/dll/3rdparty/libxslt/documents.c b/reactos/dll/3rdparty/libxslt/documents.c index 3f3a7312ca8..4f4bb5d76ae 100644 --- a/reactos/dll/3rdparty/libxslt/documents.c +++ b/reactos/dll/3rdparty/libxslt/documents.c @@ -6,24 +6,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "documents.h" -#include "transform.h" -#include "imports.h" -#include "keys.h" -#include "security.h" +#include "precomp.h" #ifdef LIBXML_XINCLUDE_ENABLED #include diff --git a/reactos/dll/3rdparty/libxslt/extensions.c b/reactos/dll/3rdparty/libxslt/extensions.c index 30c3368def2..5235fea4a12 100644 --- a/reactos/dll/3rdparty/libxslt/extensions.c +++ b/reactos/dll/3rdparty/libxslt/extensions.c @@ -9,31 +9,14 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" +#include "precomp.h" -#include -#include - -#include -#include -#include -#include -#include -#include #ifdef WITH_MODULES #include #endif #include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "imports.h" -#include "extensions.h" #ifdef _WIN32 -#include /* for _MAX_PATH */ #ifndef PATH_MAX #define PATH_MAX _MAX_PATH #endif diff --git a/reactos/dll/3rdparty/libxslt/extra.c b/reactos/dll/3rdparty/libxslt/extra.c index 17df4baef77..bfcd953422a 100644 --- a/reactos/dll/3rdparty/libxslt/extra.c +++ b/reactos/dll/3rdparty/libxslt/extra.c @@ -10,30 +10,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include -#ifdef HAVE_TIME_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif - -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "extensions.h" -#include "variables.h" -#include "transform.h" -#include "extra.h" -#include "preproc.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_EXTRA diff --git a/reactos/dll/3rdparty/libxslt/functions.c b/reactos/dll/3rdparty/libxslt/functions.c index dc61994572e..6e3238023f1 100644 --- a/reactos/dll/3rdparty/libxslt/functions.c +++ b/reactos/dll/3rdparty/libxslt/functions.c @@ -10,37 +10,9 @@ * Bjorn Reese for number formatting */ -#define IN_LIBXSLT -#include "libxslt.h" +#include "precomp.h" -#include - -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_CTYPE_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "functions.h" -#include "extensions.h" -#include "numbersInternals.h" -#include "keys.h" -#include "documents.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_FUNCTION diff --git a/reactos/dll/3rdparty/libxslt/imports.c b/reactos/dll/3rdparty/libxslt/imports.c index 9277b4f64fd..3d254b72da2 100644 --- a/reactos/dll/3rdparty/libxslt/imports.c +++ b/reactos/dll/3rdparty/libxslt/imports.c @@ -9,44 +9,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_MATH_H -#include -#endif -#ifdef HAVE_FLOAT_H -#include -#endif -#ifdef HAVE_IEEEFP_H -#include -#endif -#ifdef HAVE_NAN_H -#include -#endif -#ifdef HAVE_CTYPE_H -#include -#endif - -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "preproc.h" -#include "imports.h" -#include "documents.h" -#include "security.h" -#include "pattern.h" - +#include "precomp.h" /************************************************************************ * * diff --git a/reactos/dll/3rdparty/libxslt/keys.c b/reactos/dll/3rdparty/libxslt/keys.c index b8f14556c4a..dc1ab6dfc67 100644 --- a/reactos/dll/3rdparty/libxslt/keys.c +++ b/reactos/dll/3rdparty/libxslt/keys.c @@ -9,25 +9,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "imports.h" -#include "templates.h" -#include "keys.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_KEYS diff --git a/reactos/dll/3rdparty/libxslt/namespaces.c b/reactos/dll/3rdparty/libxslt/namespaces.c index b3c9972c312..8d265c0aa7f 100644 --- a/reactos/dll/3rdparty/libxslt/namespaces.c +++ b/reactos/dll/3rdparty/libxslt/namespaces.c @@ -9,45 +9,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_MATH_H -#include -#endif -#ifdef HAVE_FLOAT_H -#include -#endif -#ifdef HAVE_IEEEFP_H -#include -#endif -#ifdef HAVE_NAN_H -#include -#endif -#ifdef HAVE_CTYPE_H -#include -#endif -#ifndef XSLT_NEED_TRIO -#include -#else -#include -#endif - -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "namespaces.h" -#include "imports.h" +#include "precomp.h" /************************************************************************ * * diff --git a/reactos/dll/3rdparty/libxslt/numbers.c b/reactos/dll/3rdparty/libxslt/numbers.c index 9cd1cf30591..55bea60f088 100644 --- a/reactos/dll/3rdparty/libxslt/numbers.c +++ b/reactos/dll/3rdparty/libxslt/numbers.c @@ -10,24 +10,7 @@ * Bjorn Reese */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include "xsltutils.h" -#include "pattern.h" -#include "templates.h" -#include "transform.h" -#include "numbersInternals.h" +#include "precomp.h" #ifndef FALSE # define FALSE (0 == 1) diff --git a/reactos/dll/3rdparty/libxslt/pattern.c b/reactos/dll/3rdparty/libxslt/pattern.c index 63ec25a31b7..1a1ac3d280f 100644 --- a/reactos/dll/3rdparty/libxslt/pattern.c +++ b/reactos/dll/3rdparty/libxslt/pattern.c @@ -14,26 +14,7 @@ * TODO: detect [number] at compilation, optimize accordingly */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "imports.h" -#include "templates.h" -#include "keys.h" -#include "pattern.h" -#include "documents.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_PATTERN diff --git a/reactos/dll/3rdparty/libxslt/precomp.h b/reactos/dll/3rdparty/libxslt/precomp.h new file mode 100644 index 00000000000..5c58c33463e --- /dev/null +++ b/reactos/dll/3rdparty/libxslt/precomp.h @@ -0,0 +1,75 @@ +#ifndef _LIBXSLT_PCH_ +#define _LIBXSLT_PCH_ + +#define IN_LIBXSLT +#include + +#ifndef XSLT_NEED_TRIO +#include +#else +#include +#endif + +#include +#include + +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_MATH_H +#include +#endif +#ifdef HAVE_FLOAT_H +#include +#endif +#ifdef HAVE_IEEEFP_H +#include +#endif +#ifdef HAVE_NAN_H +#include +#endif +#ifdef HAVE_CTYPE_H +#include +#endif +#ifdef HAVE_TIME_H +#include +#endif +#ifdef HAVE_STDLIB_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "xslt.h" +#include "xsltInternals.h" +#include "xsltutils.h" +#include "attributes.h" +#include "namespaces.h" +#include "templates.h" +#include "imports.h" +#include "transform.h" +#include "preproc.h" +#include "documents.h" +#include "keys.h" +#include "security.h" +#include "extensions.h" +#include "variables.h" +#include "extra.h" +#include "pattern.h" +#include "numbersInternals.h" +#include "functions.h" + +#endif /* _LIBXSLT_PCH_ */ diff --git a/reactos/dll/3rdparty/libxslt/preproc.c b/reactos/dll/3rdparty/libxslt/preproc.c index 4ef3f631d98..5675f6336e5 100644 --- a/reactos/dll/3rdparty/libxslt/preproc.c +++ b/reactos/dll/3rdparty/libxslt/preproc.c @@ -15,31 +15,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltutils.h" -#include "xsltInternals.h" -#include "transform.h" -#include "templates.h" -#include "variables.h" -#include "numbersInternals.h" -#include "preproc.h" -#include "extra.h" -#include "imports.h" -#include "extensions.h" -#include "pattern.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_PREPROC diff --git a/reactos/dll/3rdparty/libxslt/security.c b/reactos/dll/3rdparty/libxslt/security.c index 12c1b6f4dac..51b631cf8c1 100644 --- a/reactos/dll/3rdparty/libxslt/security.c +++ b/reactos/dll/3rdparty/libxslt/security.c @@ -6,36 +6,13 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" +#include "precomp.h" -#include - -#ifdef HAVE_SYS_TYPES_H -#include -#endif #ifdef HAVE_SYS_STAT_H #include #endif -#ifdef HAVE_MATH_H -#include -#endif -#ifdef HAVE_FLOAT_H -#include -#endif -#ifdef HAVE_IEEEFP_H -#include -#endif -#ifdef HAVE_NAN_H -#include -#endif -#ifdef HAVE_CTYPE_H -#include -#endif - #if defined(WIN32) && !defined(__CYGWIN__) -//#include #ifndef INVALID_FILE_ATTRIBUTES #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) #endif @@ -52,16 +29,6 @@ # endif #endif -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "extensions.h" -#include "security.h" - - struct _xsltSecurityPrefs { xsltSecurityCheck readFile; xsltSecurityCheck createFile; diff --git a/reactos/dll/3rdparty/libxslt/templates.c b/reactos/dll/3rdparty/libxslt/templates.c index 02193f7eef7..a4d7364d3d9 100644 --- a/reactos/dll/3rdparty/libxslt/templates.c +++ b/reactos/dll/3rdparty/libxslt/templates.c @@ -9,27 +9,9 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" +#include "precomp.h" -#include - -#include #include -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "variables.h" -#include "functions.h" -#include "templates.h" -#include "transform.h" -#include "namespaces.h" -#include "attributes.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_TEMPLATES diff --git a/reactos/dll/3rdparty/libxslt/transform.c b/reactos/dll/3rdparty/libxslt/transform.c index 35701deabb6..b6d99849878 100644 --- a/reactos/dll/3rdparty/libxslt/transform.c +++ b/reactos/dll/3rdparty/libxslt/transform.c @@ -16,42 +16,9 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" +#include "precomp.h" -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "pattern.h" -#include "transform.h" -#include "variables.h" -#include "numbersInternals.h" -#include "namespaces.h" -#include "attributes.h" -#include "templates.h" -#include "imports.h" -#include "keys.h" -#include "documents.h" -#include "extensions.h" -#include "extra.h" -#include "preproc.h" -#include "security.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_EXTRA diff --git a/reactos/dll/3rdparty/libxslt/variables.c b/reactos/dll/3rdparty/libxslt/variables.c index 3224116a137..677d28fd9be 100644 --- a/reactos/dll/3rdparty/libxslt/variables.c +++ b/reactos/dll/3rdparty/libxslt/variables.c @@ -9,28 +9,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "variables.h" -#include "transform.h" -#include "imports.h" -#include "preproc.h" -#include "keys.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_VARIABLE diff --git a/reactos/dll/3rdparty/libxslt/xslt.c b/reactos/dll/3rdparty/libxslt/xslt.c index 58d138674e5..c299af97777 100644 --- a/reactos/dll/3rdparty/libxslt/xslt.c +++ b/reactos/dll/3rdparty/libxslt/xslt.c @@ -13,35 +13,7 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "xslt.h" -#include "xsltInternals.h" -#include "pattern.h" -#include "variables.h" -#include "namespaces.h" -#include "attributes.h" -#include "xsltutils.h" -#include "imports.h" -#include "keys.h" -#include "documents.h" -#include "extensions.h" -#include "preproc.h" -#include "extra.h" -#include "security.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_PARSING diff --git a/reactos/dll/3rdparty/libxslt/xsltlocale.c b/reactos/dll/3rdparty/libxslt/xsltlocale.c index b5fe98632ba..2b39b0988c5 100644 --- a/reactos/dll/3rdparty/libxslt/xsltlocale.c +++ b/reactos/dll/3rdparty/libxslt/xsltlocale.c @@ -10,14 +10,9 @@ * winapi port: Roumen Petrov */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include -#include +#include "precomp.h" #include "xsltlocale.h" -#include "xsltutils.h" #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 2 #define newlocale __newlocale diff --git a/reactos/dll/3rdparty/libxslt/xsltutils.c b/reactos/dll/3rdparty/libxslt/xsltutils.c index ab981a42372..0f904f68ede 100644 --- a/reactos/dll/3rdparty/libxslt/xsltutils.c +++ b/reactos/dll/3rdparty/libxslt/xsltutils.c @@ -9,38 +9,14 @@ * daniel@veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" +#include "precomp.h" -#ifndef XSLT_NEED_TRIO -#include -#else -#include -#endif - -#include -#include #ifdef HAVE_SYS_TIME_H #include #endif #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STDLIB_H -#include -#endif -#include - -#include -#include -#include -#include -#include -#include "xsltutils.h" -#include "templates.h" -#include "xsltInternals.h" -#include "imports.h" -#include "transform.h" /* gettimeofday on Windows ??? */ #if defined(WIN32) && !defined(__CYGWIN__)