Keep 64 bit specific functions (like WSCDeinstallProvider32) only
when building for 64 bit mode.
Signed-off-by: Martin Storsjö <mar...@martin.st>
---
mingw-w64-crt/Makefile.am | 15 +-
.../ws2_32.def => lib-common/ws2_32.def.in} | 23 ++-
mingw-w64-crt/lib64/ws2_32.def | 189 ---------------------
3 files changed, 27 insertions(+), 200 deletions(-)
rename mingw-w64-crt/{libarm32/ws2_32.def => lib-common/ws2_32.def.in} (86%)
delete mode 100644 mingw-w64-crt/lib64/ws2_32.def
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index f48fa5a..ef98c3f 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -850,9 +850,10 @@ lib64_libgdiplus_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
lib64_libgdiplus_a_AR = $(DTDEF64) $(top_srcdir)/lib-common/gdiplus.def &&
$(AR) $(ARFLAGS)
lib64_LIBRARIES += lib64/libws2_32.a
-lib64_libws2_32_a_SOURCES = $(src_libws2_32)
+lib64_libws2_32_a_SOURCES = $(src_libws2_32) lib-common/ws2_32.def.in
lib64_libws2_32_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
-lib64_libws2_32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
+lib64_libws2_32_a_AR = $(DTDEF64) lib64/ws2_32.def && $(AR) $(ARFLAGS)
+EXTRA_lib64_libws2_32_a_DEPENDENCIES=lib64/ws2_32.def
lib64_LIBRARIES += lib64/libtaskschd.a
lib64_libtaskschd_a_SOURCES = $(src_libtaskschd)
@@ -897,7 +898,7 @@ processed_defs += lib64/msvcrt.def lib64/msvcr80.def
lib64/msvcr90.def lib64/msv
lib64/msvcr100.def lib64/msvcr110.def
lib64/msvcr120.def lib64/msvcr120d.def \
lib64/msvcr120_app.def lib64/msvcp120_app.def
\
lib64/advapi32.def lib64/clbcatq.def
lib64/kernel32.def lib64/ole32.def \
- lib64/user32.def
+ lib64/user32.def lib64/ws2_32.def
endif
@@ -1152,9 +1153,10 @@ libarm32_libgdiplus_a_CPPFLAGS=$(CPPFLAGSARM32)
$(sysincludes)
libarm32_libgdiplus_a_AR = $(DTDEFARM32) $(top_srcdir)/lib-common/gdiplus.def
&& $(AR) $(ARFLAGS)
libarm32_LIBRARIES += libarm32/libws2_32.a
-libarm32_libws2_32_a_SOURCES = $(src_libws2_32)
+libarm32_libws2_32_a_SOURCES = $(src_libws2_32) lib-common/libws2_32.def.in
libarm32_libws2_32_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
-libarm32_libws2_32_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
+libarm32_libws2_32_a_AR = $(DTDEFARM32) libarm32/ws2_32.def && $(AR) $(ARFLAGS)
+EXTRA_libarm32_libws2_32_a_DEPENDENCIES=libarm32/ws2_32.def
if !W32API
libarm32_LIBRARIES += libarm32/libdelayimp.a
@@ -1192,7 +1194,8 @@ libarm32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
libarm32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
processed_defs += libarm32/msvcrt.def libarm32/msvcr80.def
libarm32/msvcr90.def libarm32/msvcr90d.def libarm32/msvcr100.def
libarm32/msvcr110.def \
- libarm32/advapi32.def libarm32/clbcatq.def
libarm32/kernel32.def libarm32/ole32.def libarm32/user32.def
+ libarm32/advapi32.def libarm32/clbcatq.def
libarm32/kernel32.def libarm32/ole32.def libarm32/user32.def \
+ libarm32/ws2_32.def
endif
diff --git a/mingw-w64-crt/libarm32/ws2_32.def
b/mingw-w64-crt/lib-common/ws2_32.def.in
similarity index 86%
rename from mingw-w64-crt/libarm32/ws2_32.def
rename to mingw-w64-crt/lib-common/ws2_32.def.in
index 709b13a..4789b77 100644
--- a/mingw-w64-crt/libarm32/ws2_32.def
+++ b/mingw-w64-crt/lib-common/ws2_32.def.in
@@ -1,8 +1,5 @@
-;
-; Definition file of WS2_32.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
-;
+#include "func.def.in"
+
LIBRARY "WS2_32.dll"
EXPORTS
accept
@@ -130,29 +127,45 @@ WSAStringToAddressW
WSAUnadvertiseProvider
WSAWaitForMultipleEvents
WSCDeinstallProvider
+F64(WSCDeinstallProvider32)
WSCDeinstallProviderEx
WSCEnableNSProvider
+F64(WSCEnableNSProvider32)
+F64(WSCEnumNameSpaceProviders32)
+F64(WSCEnumNameSpaceProvidersEx32)
WSCEnumProtocols
WSCEnumProtocolsEx
+F64(WSCEnumProtocols32)
WSCGetApplicationCategory
WSCGetApplicationCategoryEx
WSCGetProviderInfo
+F64(WSCGetProviderInfo32)
WSCGetProviderPath
+F64(WSCGetProviderPath32)
WSCInstallNameSpace
+F64(WSCInstallNameSpace32)
WSCInstallNameSpaceEx
WSCInstallNameSpaceEx2
+F64(WSCInstallNameSpaceEx32)
WSCInstallProvider
+F64(WSCInstallProvider64_32)
WSCInstallProviderAndChains
+F64(WSCInstallProviderAndChains64_32)
WSCInstallProviderEx
WSCSetApplicationCategory
WSCSetApplicationCategoryEx
WSCSetProviderInfo
+F64(WSCSetProviderInfo32)
WSCUnInstallNameSpace
+F64(WSCUnInstallNameSpace32)
WSCUnInstallNameSpaceEx2
WSCUpdateProvider
+F64(WSCUpdateProvider32)
WSCUpdateProviderEx
WSCWriteNameSpaceOrder
+F64(WSCWriteNameSpaceOrder32)
WSCWriteProviderOrder
+F64(WSCWriteProviderOrder32)
WSCWriteProviderOrderEx
WahCloseApcHelper
__WSAFDIsSet
diff --git a/mingw-w64-crt/lib64/ws2_32.def b/mingw-w64-crt/lib64/ws2_32.def
deleted file mode 100644
index 5693913..0000000
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
