diff options
| author | Ken Takata <kentkt@csc.jp> | 2023-10-19 17:22:24 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-10-19 17:24:02 +0200 |
| commit | c6944913f0aa56cdfd9ad7464ab05d2815d9d815 (patch) | |
| tree | be9c1284d88d47e8bd20ea206c1f8e59717d2420 | |
| parent | 00b55370b3adfc386ab27154df5c51410a099910 (diff) | |
patch 9.0.2052: win32: using deprecated wsock32 apiv9.0.2052
Problem: win32: using deprecated wsock32 api
Solution: Use winsock2 (ws2_32) consistently
win32: Stop using wsock32
We have already used ws2_32 (winsock2) and already dropped support for
Windows 95 and NT4. So, we don't need to care about wsock32.
Use ws2_32 consistently.
closes: #13383
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Ken Takata <kentkt@csc.jp>
| -rw-r--r-- | src/Make_cyg_ming.mak | 2 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 3 | ||||
| -rw-r--r-- | src/channel.c | 7 | ||||
| -rw-r--r-- | src/if_perl.xs | 11 | ||||
| -rw-r--r-- | src/os_win32.h | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
6 files changed, 8 insertions, 21 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 2363080259..7afb6e03ce 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -923,7 +923,7 @@ endif ifeq ($(CHANNEL),yes) OBJ += $(OUTDIR)/job.o $(OUTDIR)/channel.o -LIB += -lwsock32 -lws2_32 +LIB += -lws2_32 endif ifeq ($(DIRECTX),yes) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 618821d690..5573a585f9 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -420,7 +420,6 @@ NBDEBUG_DEFS = -DNBDEBUG NBDEBUG_INCL = nbdebug.h NBDEBUG_SRC = nbdebug.c ! endif -NETBEANS_LIB = WSock32.lib ! endif # DirectWrite (DirectX) @@ -473,7 +472,7 @@ CHANNEL_PRO = proto/job.pro proto/channel.pro CHANNEL_OBJ = $(OBJDIR)/job.obj $(OBJDIR)/channel.obj CHANNEL_DEFS = -DFEAT_JOB_CHANNEL -DFEAT_IPV6 -DHAVE_INET_NTOP -NETBEANS_LIB = WSock32.lib Ws2_32.lib +NETBEANS_LIB = Ws2_32.lib !endif # need advapi32.lib for GetUserName() diff --git a/src/channel.c b/src/channel.c index 38f610a9fb..8d850c656f 100644 --- a/src/channel.c +++ b/src/channel.c @@ -10,13 +10,6 @@ * Implements communication through a socket or any file handle. */ -#ifdef WIN32 -// Must include winsock2.h before windows.h since it conflicts with winsock.h -// (included in windows.h). -# include <winsock2.h> -# include <ws2tcpip.h> -#endif - #include "vim.h" #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) diff --git a/src/if_perl.xs b/src/if_perl.xs index d88c3f3d99..dd504d384b 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -24,17 +24,6 @@ # define _USE_32BIT_TIME_T #endif -/* - * Prevent including winsock.h. perl.h tries to detect whether winsock.h is - * already included before including winsock2.h, because winsock2.h isn't - * compatible with winsock.h. However the detection doesn't work with some - * versions of MinGW. If WIN32_LEAN_AND_MEAN is defined, windows.h will not - * include winsock.h. - */ -#ifdef WIN32 -# define WIN32_LEAN_AND_MEAN -#endif - #include "vim.h" #ifdef _MSC_VER diff --git a/src/os_win32.h b/src/os_win32.h index 87555b7896..5995e70af2 100644 --- a/src/os_win32.h +++ b/src/os_win32.h @@ -85,6 +85,10 @@ # define COBJMACROS // For OLE: Enable "friendlier" access to objects #endif #ifndef PROTO +// Must include winsock2.h before windows.h since it conflicts with winsock.h +// (included in windows.h). +# include <winsock2.h> +# include <ws2tcpip.h> # include <windows.h> // Weird: rpcndr.h defines "small" to "char", which causes trouble diff --git a/src/version.c b/src/version.c index 87ed0b23bf..34eb37a5f3 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2052, +/**/ 2051, /**/ 2050, |