summaryrefslogtreecommitdiff
path: root/lib/setup-win32.h
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2021-09-18 01:25:20 +0200
committerMarcel Raad <Marcel.Raad@teamviewer.com>2021-09-28 19:29:27 +0200
commitc2ea04f92b00b6271627cb218647527b5a50f2fc (patch)
tree7240ef0000633673b5c11bdddcd72a224d3a113c /lib/setup-win32.h
parentacfe94c08f2573edc2ae52bf0097130deea299ff (diff)
downloadcurl-c2ea04f92b00b6271627cb218647527b5a50f2fc.tar.gz
build: remove checks for WinSock 1
It's not supported anymore. Closes https://github.com/curl/curl/pull/7778
Diffstat (limited to 'lib/setup-win32.h')
-rw-r--r--lib/setup-win32.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/setup-win32.h b/lib/setup-win32.h
index c35dec88c..12d95e9d5 100644
--- a/lib/setup-win32.h
+++ b/lib/setup-win32.h
@@ -25,11 +25,11 @@
/*
* Include header files for windows builds before redefining anything.
* Use this preprocessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
+ * winsock2.h or ws2tcpip.h. Any other windows thing belongs
* to any other further and independent block. Under Cygwin things work
* just as under linux (e.g. <sys/socket.h>) and the winsock headers should
* never be included when __CYGWIN__ is defined. configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
+ * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK2_H,
* neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
*/
@@ -47,10 +47,6 @@
# ifdef HAVE_WS2TCPIP_H
# include <ws2tcpip.h>
# endif
-# else
-# ifdef HAVE_WINSOCK_H
-# include <winsock.h>
-# endif
# endif
# include <tchar.h>
# ifdef UNICODE
@@ -67,10 +63,6 @@
#ifdef HAVE_WINSOCK2_H
# define USE_WINSOCK 2
-#else
-# ifdef HAVE_WINSOCK_H
-# error "WinSock version 1 is no longer supported, version 2 is required!"
-# endif
#endif
/*