Now all I386 symbols in lib-common/ws2_32.def.in file are defined with stdcall @<num> suffixes. These suffixes are automatically removed for non-I386 builds by Makefile.am rule during processing of lib-common/*.def.in files.
During merging of lib32/ws2_32.def and lib-common/ws2_32.def.in files, all symbols were sorted in the final file. --- mingw-w64-crt/Makefile.am | 5 +- mingw-w64-crt/lib-common/ws2_32.def.in | 362 ++++++++++++------------- mingw-w64-crt/lib32/ws2_32.def | 188 ------------- 3 files changed, 184 insertions(+), 371 deletions(-) delete mode 100644 mingw-w64-crt/lib32/ws2_32.def diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index 1c53e10809c5..f6a718bb9b42 100644 --- a/mingw-w64-crt/Makefile.am +++ b/mingw-w64-crt/Makefile.am @@ -1401,9 +1401,10 @@ lib32_libgdiplus_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes) lib32_libgdiplus_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS) lib32_LIBRARIES += lib32/libws2_32.a -lib32_libws2_32_a_SOURCES = $(src_libws2_32) +lib32_libws2_32_a_SOURCES = $(src_libws2_32) lib-common/ws2_32.def.in lib32_libws2_32_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes) -lib32_libws2_32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS) +lib32_libws2_32_a_AR = $(DTDEF32) lib32/ws2_32.def && $(AR) $(ARFLAGS) +EXTRA_lib32_libws2_32_a_DEPENDENCIES=lib32/ws2_32.def lib32_LIBRARIES += lib32/libtaskschd.a lib32_libtaskschd_a_SOURCES = $(src_libtaskschd) diff --git a/mingw-w64-crt/lib-common/ws2_32.def.in b/mingw-w64-crt/lib-common/ws2_32.def.in index b49c4b87d3b2..e816d9f22455 100644 --- a/mingw-w64-crt/lib-common/ws2_32.def.in +++ b/mingw-w64-crt/lib-common/ws2_32.def.in @@ -2,200 +2,200 @@ LIBRARY "WS2_32.dll" EXPORTS -accept -bind -closesocket -connect -getpeername -getsockname -getsockopt -htonl -htons -ioctlsocket -inet_addr -inet_ntoa -listen -ntohl -ntohs -recv -recvfrom -select -send -sendto -setsockopt -shutdown -socket -WSApSetPostRoutine -FreeAddrInfoEx -FreeAddrInfoExW -FreeAddrInfoW -GetAddrInfoExA -GetAddrInfoExCancel -GetAddrInfoExOverlappedResult -GetAddrInfoExW -GetAddrInfoW -GetHostNameW -GetNameInfoW -InetNtopW -InetPtonW -ProcessSocketNotifications -SetAddrInfoExA -SetAddrInfoExW -WPUCompleteOverlappedRequest -WPUGetProviderPathEx -WSAAccept -WSAAddressToStringA -WSAAddressToStringW -WSAAdvertiseProvider -WSACloseEvent -WSAConnect -WSAConnectByList -WSAConnectByNameA -WSAConnectByNameW -WSACreateEvent -gethostbyaddr -gethostbyname -getprotobyname -getprotobynumber -getservbyname -getservbyport -gethostname -WSADuplicateSocketA -WSADuplicateSocketW -WSAEnumNameSpaceProvidersA -WSAEnumNameSpaceProvidersExA -WSAEnumNameSpaceProvidersExW -WSAEnumNameSpaceProvidersW -WSAEnumNetworkEvents -WSAEnumProtocolsA -WSAEnumProtocolsW -WSAEventSelect -WSAGetOverlappedResult -WSAGetQOSByName -WSAGetServiceClassInfoA -WSAGetServiceClassInfoW -WSAGetServiceClassNameByClassIdA -WSAGetServiceClassNameByClassIdW -WSAHtonl -WSAHtons -WSAInstallServiceClassA -WSAInstallServiceClassW -WSAIoctl -WSAJoinLeaf -WSALookupServiceBeginA -WSALookupServiceBeginW -WSALookupServiceEnd -WSALookupServiceNextA -WSALookupServiceNextW -WSANSPIoctl -WSANtohl -WSANtohs -WSAPoll -WSAProviderCompleteAsyncCall -WSAProviderConfigChange -WSARecv -WSARecvDisconnect -WSARecvFrom -WSARemoveServiceClass -WSAResetEvent -WSASend -WSASendDisconnect -WSASendMsg -WSASendTo -WSASetEvent -WSAAsyncSelect -WSAAsyncGetHostByAddr -WSAAsyncGetHostByName -WSAAsyncGetProtoByNumber -WSAAsyncGetProtoByName -WSAAsyncGetServByPort -WSAAsyncGetServByName -WSACancelAsyncRequest -WSASetBlockingHook -WSAUnhookBlockingHook -WSAGetLastError -WSASetLastError -WSACancelBlockingCall -WSAIsBlocking -WSAStartup -WSACleanup -WSASetServiceA -WSASetServiceW -WSASocketA -WSASocketW -WSAStringToAddressA -WSAStringToAddressW -WSAUnadvertiseProvider -WSAWaitForMultipleEvents -WSCDeinstallProvider +__WSAFDIsSet@8 +FreeAddrInfoEx@4 +FreeAddrInfoExW@4 +FreeAddrInfoW@4 +GetAddrInfoExA@40 +GetAddrInfoExCancel@4 +GetAddrInfoExOverlappedResult@4 +GetAddrInfoExW@40 +GetAddrInfoW@16 +GetHostNameW@8 +GetNameInfoW@28 +InetNtopW@16 +InetPtonW@12 +ProcessSocketNotifications@28 +SetAddrInfoExA@48 +SetAddrInfoExW@48 +WEP@0 +WPUCompleteOverlappedRequest@20 +WPUGetProviderPathEx@20 +WSAAccept@20 +WSAAddressToStringA@20 +WSAAddressToStringW@20 +WSAAdvertiseProvider@8 +WSAAsyncGetHostByAddr@28 +WSAAsyncGetHostByName@20 +WSAAsyncGetProtoByName@20 +WSAAsyncGetProtoByNumber@20 +WSAAsyncGetServByName@24 +WSAAsyncGetServByPort@24 +WSAAsyncSelect@16 +WSACancelAsyncRequest@4 +WSACancelBlockingCall@0 +WSACleanup@0 +WSACloseEvent@4 +WSAConnect@28 +WSAConnectByList@32 +WSAConnectByNameA@36 +WSAConnectByNameW@36 +WSACreateEvent@0 +WSADuplicateSocketA@12 +WSADuplicateSocketW@12 +WSAEnumNameSpaceProvidersA@8 +WSAEnumNameSpaceProvidersExA@8 +WSAEnumNameSpaceProvidersExW@8 +WSAEnumNameSpaceProvidersW@8 +WSAEnumNetworkEvents@12 +WSAEnumProtocolsA@12 +WSAEnumProtocolsW@12 +WSAEventSelect@12 +WSAGetLastError@0 +WSAGetOverlappedResult@20 +WSAGetQOSByName@12 +WSAGetServiceClassInfoA@16 +WSAGetServiceClassInfoW@16 +WSAGetServiceClassNameByClassIdA@12 +WSAGetServiceClassNameByClassIdW@12 +WSAHtonl@12 +WSAHtons@12 +WSAInstallServiceClassA@4 +WSAInstallServiceClassW@4 +WSAIoctl@36 +WSAIsBlocking@0 +WSAJoinLeaf@32 +WSALookupServiceBeginA@12 +WSALookupServiceBeginW@12 +WSALookupServiceEnd@4 +WSALookupServiceNextA@16 +WSALookupServiceNextW@16 +WSANSPIoctl@32 +WSANtohl@12 +WSANtohs@12 +WSAPoll@12 +WSAProviderCompleteAsyncCall@8 +WSAProviderConfigChange@12 +WSARecv@28 +WSARecvDisconnect@8 +WSARecvFrom@36 +WSARemoveServiceClass@4 +WSAResetEvent@4 +WSASend@28 +WSASendDisconnect@8 +WSASendMsg@24 +WSASendTo@36 +WSASetBlockingHook@4 +WSASetEvent@4 +WSASetLastError@4 +WSASetServiceA@12 +WSASetServiceW@12 +WSASocketA@24 +WSASocketW@24 +WSAStartup@8 +WSAStringToAddressA@20 +WSAStringToAddressW@20 +WSAUnadvertiseProvider@4 +WSAUnhookBlockingHook@0 +WSAWaitForMultipleEvents@20 +WSApSetPostRoutine@4 +WSCDeinstallProvider@8 F64(WSCDeinstallProvider32) -WSCDeinstallProviderEx -WSCEnableNSProvider +WSCDeinstallProviderEx@12 +WSCEnableNSProvider@8 F64(WSCEnableNSProvider32) F64(WSCEnumNameSpaceProviders32) F64(WSCEnumNameSpaceProvidersEx32) -WSCEnumProtocols -WSCEnumProtocolsEx +WSCEnumProtocols@16 F64(WSCEnumProtocols32) -WSCGetApplicationCategory -WSCGetApplicationCategoryEx -WSCGetProviderInfo +WSCEnumProtocolsEx@20 +WSCGetApplicationCategory@24 +WSCGetApplicationCategoryEx@28 +WSCGetProviderInfo@24 F64(WSCGetProviderInfo32) -WSCGetProviderPath +WSCGetProviderPath@16 F64(WSCGetProviderPath32) -WSCInstallNameSpace +WSCInstallNameSpace@20 F64(WSCInstallNameSpace32) -WSCInstallNameSpaceEx -WSCInstallNameSpaceEx2 +WSCInstallNameSpaceEx@24 +WSCInstallNameSpaceEx2@28 F64(WSCInstallNameSpaceEx32) -WSCInstallProvider +WSCInstallProvider@20 F64(WSCInstallProvider64_32) -WSCInstallProviderAndChains +WSCInstallProviderAndChains@32 F64(WSCInstallProviderAndChains64_32) -WSCInstallProviderEx -WSCSetApplicationCategory -WSCSetApplicationCategoryEx -WSCSetProviderInfo +WSCInstallProviderEx@28 +WSCSetApplicationCategory@28 +WSCSetApplicationCategoryEx@32 +WSCSetProviderInfo@24 F64(WSCSetProviderInfo32) -WSCUnInstallNameSpace +WSCUnInstallNameSpace@4 F64(WSCUnInstallNameSpace32) -WSCUnInstallNameSpaceEx2 -WSCUpdateProvider +WSCUnInstallNameSpaceEx2@8 +WSCUpdateProvider@20 F64(WSCUpdateProvider32) -WSCUpdateProviderEx -WSCWriteNameSpaceOrder +WSCUpdateProviderEx@24 +WSCWriteNameSpaceOrder@8 F64(WSCWriteNameSpaceOrder32) -WSCWriteProviderOrder +WSCWriteProviderOrder@8 F64(WSCWriteProviderOrder32) -WSCWriteProviderOrderEx -WahCloseApcHelper -__WSAFDIsSet -WahCloseHandleHelper -WahCloseNotificationHandleHelper -WahCloseSocketHandle -WahCloseThread -WahCompleteRequest -WahCreateHandleContextTable -WahCreateNotificationHandle -WahCreateSocketHandle -WahDestroyHandleContextTable -WahDisableNonIFSHandleSupport -WahEnableNonIFSHandleSupport -WahEnumerateHandleContexts -WahInsertHandleContext -WahNotifyAllProcesses -WahOpenApcHelper -WahOpenCurrentThread -WahOpenHandleHelper -WahOpenNotificationHandleHelper -WahQueueUserApc -WahReferenceContextByHandle -WahRemoveHandleContext -WahWaitForNotification -WahWriteLSPEvent -freeaddrinfo -getaddrinfo -getnameinfo -inet_ntop -inet_pton -WEP +WSCWriteProviderOrderEx@12 +WahCloseApcHelper@4 +WahCloseHandleHelper@4 +WahCloseNotificationHandleHelper@4 +WahCloseSocketHandle@8 +WahCloseThread@8 +WahCompleteRequest@20 +WahCreateHandleContextTable@4 +WahCreateNotificationHandle@8 +WahCreateSocketHandle@8 +WahDestroyHandleContextTable@4 +WahDisableNonIFSHandleSupport@0 +WahEnableNonIFSHandleSupport@0 +WahEnumerateHandleContexts@12 +WahInsertHandleContext@8 +WahNotifyAllProcesses@4 +WahOpenApcHelper@4 +WahOpenCurrentThread@8 +WahOpenHandleHelper@4 +WahOpenNotificationHandleHelper@4 +WahQueueUserApc@16 +WahReferenceContextByHandle@8 +WahRemoveHandleContext@8 +WahWaitForNotification@16 +WahWriteLSPEvent@8 +accept@12 +bind@12 +closesocket@4 +connect@12 +freeaddrinfo@4 +getaddrinfo@16 +gethostbyaddr@12 +gethostbyname@4 +gethostname@8 +getnameinfo@28 +getpeername@12 +getprotobyname@4 +getprotobynumber@4 +getservbyname@8 +getservbyport@8 +getsockname@12 +getsockopt@20 +htonl@4 +htons@4 +inet_addr@4 +inet_ntoa@4 +inet_ntop@16 +inet_pton@12 +ioctlsocket@12 +listen@8 +ntohl@4 +ntohs@4 +recv@16 +recvfrom@24 +select@20 +send@16 +sendto@24 +setsockopt@20 +shutdown@8 +socket@12 diff --git a/mingw-w64-crt/lib32/ws2_32.def b/mingw-w64-crt/lib32/ws2_32.def deleted file mode 100644 index f78defcfb1f0..000000000000 --- a/mingw-w64-crt/lib32/ws2_32.def +++ /dev/null @@ -1,188 +0,0 @@ -; -; Definition file of WS2_32.dll -; Automatic generated by gendef -; written by Kai Tietz 2008 -; -LIBRARY "WS2_32.dll" -EXPORTS -accept@12 -bind@12 -closesocket@4 -connect@12 -getpeername@12 -getsockname@12 -getsockopt@20 -htonl@4 -htons@4 -ioctlsocket@12 -inet_addr@4 -inet_ntoa@4 -listen@8 -ntohl@4 -ntohs@4 -recv@16 -recvfrom@24 -select@20 -send@16 -sendto@24 -setsockopt@20 -shutdown@8 -socket@12 -WSApSetPostRoutine@4 -FreeAddrInfoEx@4 -FreeAddrInfoExW@4 -FreeAddrInfoW@4 -GetAddrInfoExA@40 -GetAddrInfoExCancel@4 -GetAddrInfoExOverlappedResult@4 -GetAddrInfoExW@40 -GetAddrInfoW@16 -GetHostNameW@8 -GetNameInfoW@28 -InetNtopW@16 -InetPtonW@12 -ProcessSocketNotifications@28 -SetAddrInfoExA@48 -SetAddrInfoExW@48 -WPUCompleteOverlappedRequest@20 -WPUGetProviderPathEx@20 -WSAAccept@20 -WSAAddressToStringA@20 -WSAAddressToStringW@20 -WSAAdvertiseProvider@8 -WSACloseEvent@4 -WSAConnect@28 -WSAConnectByList@32 -WSAConnectByNameA@36 -WSAConnectByNameW@36 -WSACreateEvent@0 -WSADuplicateSocketA@12 -WSADuplicateSocketW@12 -WSAEnumNameSpaceProvidersA@8 -WSAEnumNameSpaceProvidersExA@8 -gethostbyaddr@12 -gethostbyname@4 -getprotobyname@4 -getprotobynumber@4 -getservbyname@8 -getservbyport@8 -gethostname@8 -WSAEnumNameSpaceProvidersExW@8 -WSAEnumNameSpaceProvidersW@8 -WSAEnumNetworkEvents@12 -WSAEnumProtocolsA@12 -WSAEnumProtocolsW@12 -WSAEventSelect@12 -WSAGetOverlappedResult@20 -WSAGetQOSByName@12 -WSAGetServiceClassInfoA@16 -WSAGetServiceClassInfoW@16 -WSAGetServiceClassNameByClassIdA@12 -WSAGetServiceClassNameByClassIdW@12 -WSAHtonl@12 -WSAHtons@12 -WSAInstallServiceClassA@4 -WSAInstallServiceClassW@4 -WSAIoctl@36 -WSAJoinLeaf@32 -WSALookupServiceBeginA@12 -WSALookupServiceBeginW@12 -WSALookupServiceEnd@4 -WSALookupServiceNextA@16 -WSALookupServiceNextW@16 -WSANSPIoctl@32 -WSANtohl@12 -WSANtohs@12 -WSAPoll@12 -WSAProviderCompleteAsyncCall@8 -WSAProviderConfigChange@12 -WSARecv@28 -WSARecvDisconnect@8 -WSARecvFrom@36 -WSARemoveServiceClass@4 -WSAResetEvent@4 -WSASend@28 -WSASendDisconnect@8 -WSASendMsg@24 -WSASendTo@36 -WSASetEvent@4 -WSASetServiceA@12 -WSASetServiceW@12 -WSASocketA@24 -WSASocketW@24 -WSAAsyncSelect@16 -WSAAsyncGetHostByAddr@28 -WSAAsyncGetHostByName@20 -WSAAsyncGetProtoByNumber@20 -WSAAsyncGetProtoByName@20 -WSAAsyncGetServByPort@24 -WSAAsyncGetServByName@24 -WSACancelAsyncRequest@4 -WSASetBlockingHook@4 -WSAUnhookBlockingHook@0 -WSAGetLastError@0 -WSASetLastError@4 -WSACancelBlockingCall@0 -WSAIsBlocking@0 -WSAStartup@8 -WSACleanup@0 -WSAStringToAddressA@20 -WSAStringToAddressW@20 -WSAUnadvertiseProvider@4 -WSAWaitForMultipleEvents@20 -WSCDeinstallProvider@8 -WSCDeinstallProviderEx@12 -WSCEnableNSProvider@8 -WSCEnumProtocols@16 -WSCEnumProtocolsEx@20 -WSCGetApplicationCategory@24 -WSCGetApplicationCategoryEx@28 -WSCGetProviderInfo@24 -WSCGetProviderPath@16 -WSCInstallNameSpace@20 -WSCInstallNameSpaceEx2@28 -WSCInstallNameSpaceEx@24 -WSCInstallProvider@20 -WSCInstallProviderAndChains@32 -WSCInstallProviderEx@28 -WSCSetApplicationCategory@28 -WSCSetApplicationCategoryEx@32 -WSCSetProviderInfo@24 -WSCUnInstallNameSpace@4 -WSCUnInstallNameSpaceEx2@8 -WSCUpdateProvider@20 -WSCUpdateProviderEx@24 -WSCWriteNameSpaceOrder@8 -WSCWriteProviderOrder@8 -WSCWriteProviderOrderEx@12 -WahCloseApcHelper@4 -WahCloseHandleHelper@4 -WahCloseNotificationHandleHelper@4 -WahCloseSocketHandle@8 -WahCloseThread@8 -WahCompleteRequest@20 -WahCreateHandleContextTable@4 -WahCreateNotificationHandle@8 -WahCreateSocketHandle@8 -WahDestroyHandleContextTable@4 -WahDisableNonIFSHandleSupport@0 -WahEnableNonIFSHandleSupport@0 -WahEnumerateHandleContexts@12 -WahInsertHandleContext@8 -__WSAFDIsSet@8 -WahNotifyAllProcesses@4 -WahOpenApcHelper@4 -WahOpenCurrentThread@8 -WahOpenHandleHelper@4 -WahOpenNotificationHandleHelper@4 -WahQueueUserApc@16 -WahReferenceContextByHandle@8 -WahRemoveHandleContext@8 -WahWaitForNotification@16 -WahWriteLSPEvent@8 -freeaddrinfo@4 -getaddrinfo@16 -getnameinfo@28 -inet_ntop@16 -inet_pton@12 -WEP@0 -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
