From dc4ce52b9fd62dad25d0c22d8a6cb2f454fd03d5 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Sat, 6 Feb 2016 19:13:42 +0000 Subject: [PATCH] Netware: pull up ws2nlm imports from all (most) proxy module makefiles to the main proxy makefile. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728874 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/NWGNUmakefile | 6 ++++++ modules/proxy/NWGNUproxy | 6 ------ modules/proxy/NWGNUproxyajp | 6 ------ modules/proxy/NWGNUproxybalancer | 6 ------ modules/proxy/NWGNUproxyexpress | 6 ------ modules/proxy/NWGNUproxyfcgi | 6 ------ modules/proxy/NWGNUproxyftp | 6 ------ modules/proxy/NWGNUproxyhcheck | 6 ------ modules/proxy/NWGNUproxyhtp | 6 ------ modules/proxy/NWGNUproxyscgi | 6 ------ modules/proxy/NWGNUserf | 6 ------ 11 files changed, 6 insertions(+), 60 deletions(-) diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile index f740d50e63..b1f38e1ce0 100644 --- a/modules/proxy/NWGNUmakefile +++ b/modules/proxy/NWGNUmakefile @@ -228,6 +228,12 @@ FILE_nlm_copyright = FILES_nlm_Ximports = \ $(EOLIST) +# Don't link with Winsock if standard sockets are being used +ifndef USE_STDSOCKETS +FILES_nlm_Ximports += @ws2nlm.imp \ + $(EOLIST) +endif + # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index c9c0782653..39b28410bb 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -210,12 +210,6 @@ FILES_nlm_Ximports = \ @libc.imp \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp index 8ea3a6b554..3cbdc694af 100644 --- a/modules/proxy/NWGNUproxyajp +++ b/modules/proxy/NWGNUproxyajp @@ -213,12 +213,6 @@ FILES_nlm_Ximports = \ @libc.imp \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer index 76c91ee7f3..26727fd472 100644 --- a/modules/proxy/NWGNUproxybalancer +++ b/modules/proxy/NWGNUproxybalancer @@ -209,12 +209,6 @@ FILES_nlm_Ximports = \ @libc.imp \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUproxyexpress b/modules/proxy/NWGNUproxyexpress index d9786de0d2..01536124d0 100644 --- a/modules/proxy/NWGNUproxyexpress +++ b/modules/proxy/NWGNUproxyexpress @@ -208,12 +208,6 @@ FILES_nlm_Ximports = \ @libc.imp \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi index a7074626e5..5e38e7598d 100644 --- a/modules/proxy/NWGNUproxyfcgi +++ b/modules/proxy/NWGNUproxyfcgi @@ -210,12 +210,6 @@ FILES_nlm_Ximports = \ @libc.imp \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp index b82108a00d..5d133ff2fa 100644 --- a/modules/proxy/NWGNUproxyftp +++ b/modules/proxy/NWGNUproxyftp @@ -209,12 +209,6 @@ FILES_nlm_Ximports = \ @libc.imp \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUproxyhcheck b/modules/proxy/NWGNUproxyhcheck index 5f9e2b2b6d..78c7f69d25 100644 --- a/modules/proxy/NWGNUproxyhcheck +++ b/modules/proxy/NWGNUproxyhcheck @@ -209,12 +209,6 @@ FILES_nlm_Ximports = \ @libc.imp \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp index 83eff11356..c79585b211 100644 --- a/modules/proxy/NWGNUproxyhtp +++ b/modules/proxy/NWGNUproxyhtp @@ -209,12 +209,6 @@ FILES_nlm_Ximports = \ @libc.imp \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi index d80968731c..b03280505d 100644 --- a/modules/proxy/NWGNUproxyscgi +++ b/modules/proxy/NWGNUproxyscgi @@ -209,12 +209,6 @@ FILES_nlm_Ximports = \ @libc.imp \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf index a08a9efbb0..5992ba4e46 100644 --- a/modules/proxy/NWGNUserf +++ b/modules/proxy/NWGNUserf @@ -296,12 +296,6 @@ FILES_nlm_Ximports = \ GetSuperHighResolutionTimer \ $(EOLIST) -# Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS -FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) -endif - # # Any symbols exported to here # -- 2.40.0