[libxslt] Fix redundant includes already in libexslt.h
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxslt] Fix redundant includes already in libexslt.h
- Date: Tue, 11 Feb 2020 10:13:34 +0000 (UTC)
commit 53174e798d74cf78e59193c9de5cbf9796f34f9d
Author: David Kilzer <ddkilzer apple com>
Date: Fri Jan 24 13:21:36 2020 -0800
Fix redundant includes already in libexslt.h
Remove includes of "config.h", <libxslt/xsltconfig.h> and
<libxml/xmlversion.h> in libexslt C sources since they are
already included with "libexslt/libexslt.h".
libexslt/common.c | 7 -------
libexslt/crypto.c | 7 -------
libexslt/date.c | 7 -------
libexslt/dynamic.c | 7 -------
libexslt/exslt.c | 5 -----
libexslt/functions.c | 6 ------
libexslt/math.c | 7 -------
libexslt/saxon.c | 7 -------
libexslt/sets.c | 6 ------
libexslt/strings.c | 7 -------
10 files changed, 66 deletions(-)
---
diff --git a/libexslt/common.c b/libexslt/common.c
index 1a444f32..54405f68 100644
--- a/libexslt/common.c
+++ b/libexslt/common.c
@@ -1,17 +1,10 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
-#include "config.h"
-#endif
-
#include <libxml/tree.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
-#include <libxslt/xsltconfig.h>
#include <libxslt/xsltutils.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/extensions.h>
diff --git a/libexslt/crypto.c b/libexslt/crypto.c
index c6bf34f4..35d1f4fe 100644
--- a/libexslt/crypto.c
+++ b/libexslt/crypto.c
@@ -1,12 +1,6 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
-#include "config.h"
-#endif
-
#include <libxml/tree.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
@@ -14,7 +8,6 @@
#include <libxml/encoding.h>
#include <libxml/uri.h>
-#include <libxslt/xsltconfig.h>
#include <libxslt/xsltutils.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/extensions.h>
diff --git a/libexslt/date.c b/libexslt/date.c
index 7e805bd7..e3c86322 100644
--- a/libexslt/date.c
+++ b/libexslt/date.c
@@ -22,12 +22,6 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
-#include "config.h"
-#endif
-
#if defined(HAVE_LOCALTIME_R) && defined(__GLIBC__) /* _POSIX_SOURCE required by gnu libc */
#ifndef _AIX51 /* but on AIX we're not using gnu libc */
#define _POSIX_SOURCE
@@ -38,7 +32,6 @@
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
-#include <libxslt/xsltconfig.h>
#include <libxslt/xsltutils.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/extensions.h>
diff --git a/libexslt/dynamic.c b/libexslt/dynamic.c
index 4dd02c31..91ceb409 100644
--- a/libexslt/dynamic.c
+++ b/libexslt/dynamic.c
@@ -23,17 +23,10 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
-#include "config.h"
-#endif
-
#include <libxml/tree.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
-#include <libxslt/xsltconfig.h>
#include <libxslt/xsltutils.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/extensions.h>
diff --git a/libexslt/exslt.c b/libexslt/exslt.c
index 0bccf178..13cda683 100644
--- a/libexslt/exslt.c
+++ b/libexslt/exslt.c
@@ -1,11 +1,6 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#include <libxml/xmlversion.h>
-
-#include "config.h"
-
-#include <libxslt/xsltconfig.h>
#include <libxslt/extensions.h>
#include <libexslt/exsltconfig.h>
diff --git a/libexslt/functions.c b/libexslt/functions.c
index 2f744311..958bf60e 100644
--- a/libexslt/functions.c
+++ b/libexslt/functions.c
@@ -1,12 +1,6 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
-#include "config.h"
-#endif
-
#include <string.h>
#include <libxml/tree.h>
diff --git a/libexslt/math.c b/libexslt/math.c
index f1aa0ba5..b70f2eb5 100644
--- a/libexslt/math.c
+++ b/libexslt/math.c
@@ -1,17 +1,10 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
-#include "config.h"
-#endif
-
#include <libxml/tree.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
-#include <libxslt/xsltconfig.h>
#include <libxslt/xsltutils.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/extensions.h>
diff --git a/libexslt/saxon.c b/libexslt/saxon.c
index e8b64406..8512c6de 100644
--- a/libexslt/saxon.c
+++ b/libexslt/saxon.c
@@ -1,19 +1,12 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
-#include "config.h"
-#endif
-
#include <libxml/tree.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
#include <libxml/parser.h>
#include <libxml/hash.h>
-#include <libxslt/xsltconfig.h>
#include <libxslt/xsltutils.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/extensions.h>
diff --git a/libexslt/sets.c b/libexslt/sets.c
index c7142ff1..a4b55460 100644
--- a/libexslt/sets.c
+++ b/libexslt/sets.c
@@ -1,12 +1,6 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
-#include "config.h"
-#endif
-
#include <libxml/tree.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
diff --git a/libexslt/strings.c b/libexslt/strings.c
index 14d9172f..5d429ec6 100644
--- a/libexslt/strings.c
+++ b/libexslt/strings.c
@@ -1,12 +1,6 @@
#define IN_LIBEXSLT
#include "libexslt/libexslt.h"
-#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
-#include "config.h"
-#endif
-
#include <libxml/tree.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
@@ -14,7 +8,6 @@
#include <libxml/encoding.h>
#include <libxml/uri.h>
-#include <libxslt/xsltconfig.h>
#include <libxslt/xsltutils.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/extensions.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]