summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2021-09-29 08:16:42 +0200
committerDaniel Stenberg <daniel@haxx.se>2021-09-29 10:42:49 +0200
commit180180a44d8e7a54b772af02eb90e0eab1c61d37 (patch)
treedc6559efeb0d2f911b8c781b4ab8499536136ec0 /m4
parent12246eddc5d844efec16141d259092fd69f89bc4 (diff)
downloadcurl-180180a44d8e7a54b772af02eb90e0eab1c61d37.tar.gz
Revert "build: remove checks for WinSock 1"
Due to CI issues This reverts commit c2ea04f92b00b6271627cb218647527b5a50f2fc. Closes #7790
Diffstat (limited to 'm4')
-rw-r--r--m4/curl-functions.m47
1 files changed, 6 insertions, 1 deletions
diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index b21bbd1e2..d3ffaea9f 100644
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@@ -486,7 +486,7 @@ curl_includes_unistd="\
dnl CURL_INCLUDES_WINSOCK2
dnl -------------------------------------------------
dnl Set up variable with list of headers that must be
-dnl included when winsock2.h is to be included.
+dnl included when winsock(2).h is to be included.
AC_DEFUN([CURL_INCLUDES_WINSOCK2], [
curl_includes_winsock2="\
@@ -498,10 +498,15 @@ curl_includes_winsock2="\
# include <windows.h>
# ifdef HAVE_WINSOCK2_H
# include <winsock2.h>
+# else
+# ifdef HAVE_WINSOCK_H
+# include <winsock.h>
+# endif
# endif
#endif
/* includes end */"
CURL_CHECK_HEADER_WINDOWS
+ CURL_CHECK_HEADER_WINSOCK
CURL_CHECK_HEADER_WINSOCK2
])