Move the code to force Expat linking into common code.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83713 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index adcd6ecff370ed246dd98932561efc25ca29782b..48bf6b600b04c4fe24fc7ac49f477464debd3309 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1630,12 +1630,3 @@ module MODULE_VAR_EXPORT mpm_dexter_module = {
     dexter_hooks               /* register_hooks */
 };
 
-/* force Expat to be linked into the server executable */
-#if defined(USE_EXPAT) && !defined(SHARED_CORE_BOOTSTRAP)
-#include "xmlparse.h"
-const XML_LChar *suck_in_expat(void);
-const XML_LChar *suck_in_expat(void)
-{
-    return XML_ErrorString(XML_ERROR_NONE);
-}
-#endif /* USE_EXPAT */

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index db12ce492186cf6f6d38ca00e9c212c1a683ac10..c9128a84425d44563e77777a6986dfee23f73d8a 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -1698,12 +1698,3 @@ module MODULE_VAR_EXPORT mpm_mpmt_pthread_module = {
     mpmt_pthread_hooks         /* register_hooks */
 };
 
-/* force Expat to be linked into the server executable */
-#if defined(USE_EXPAT) && !defined(SHARED_CORE_BOOTSTRAP)
-#include "xmlparse.h"
-const XML_LChar *suck_in_expat(void);
-const XML_LChar *suck_in_expat(void)
-{
-    return XML_ErrorString(XML_ERROR_NONE);
-}
-#endif /* USE_EXPAT */

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 8c9c25897c8a117eacb50a8eac9d655d64f15adf..f76bbe75cf9da962b6eefad57cf598e7feb1189b 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1589,13 +1589,3 @@ module MODULE_VAR_EXPORT mpm_winnt_module = {
     NULL,                      /* handlers */
     winnt_hooks                /* register_hooks */
 };
-
-/* force Expat to be linked into the server executable */
-#if defined(USE_EXPAT) && !defined(SHARED_CORE_BOOTSTRAP)
-#include "xmlparse.h"
-const XML_LChar *suck_in_expat(void);
-const XML_LChar *suck_in_expat(void)
-{
-    return XML_ErrorString(XML_ERROR_NONE);
-}
-#endif /* USE_EXPAT */