summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2021-09-29 14:53:04 +0200
committerMarcel Raad <Marcel.Raad@teamviewer.com>2021-09-29 15:54:40 +0200
commite2b3f9eaea6d1c8e549e3e1cf9c6281a6eba1bb6 (patch)
treed75801bf227d2e52dca72fefa75574ca227fa186 /acinclude.m4
parent2bde1774fff9e88958238c0ff1dec0de76f97f8b (diff)
downloadcurl-e2b3f9eaea6d1c8e549e3e1cf9c6281a6eba1bb6.tar.gz
configure: remove `HAVE_WINSOCK_H` definition
It's not used anymore. Closes https://github.com/curl/curl/pull/7795
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m480
1 files changed, 0 insertions, 80 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 277902dac..0e86bcd06 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -235,43 +235,6 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [
])
-dnl CURL_CHECK_HEADER_WINSOCK
-dnl -------------------------------------------------
-dnl Check for compilable and valid winsock.h header
-
-AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
- AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
- AC_CACHE_CHECK([for winsock.h], [curl_cv_header_winsock_h], [
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-#undef inline
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#include <winsock.h>
- ]],[[
-#if defined(__CYGWIN__) || defined(__CEGCC__)
- HAVE_WINSOCK_H shall not be defined.
-#else
- int dummy=WSACleanup();
-#endif
- ]])
- ],[
- curl_cv_header_winsock_h="yes"
- ],[
- curl_cv_header_winsock_h="no"
- ])
- ])
- case "$curl_cv_header_winsock_h" in
- yes)
- AC_DEFINE_UNQUOTED(HAVE_WINSOCK_H, 1,
- [Define to 1 if you have the winsock.h header file.])
- ;;
- esac
-])
-
-
dnl CURL_CHECK_HEADER_WINSOCK2
dnl -------------------------------------------------
dnl Check for compilable and valid winsock2.h header
@@ -1043,7 +1006,6 @@ dnl and RECV_TYPE_ARG4, defining the type of the function
dnl return value in RECV_TYPE_RETV.
AC_DEFUN([CURL_CHECK_FUNC_RECV], [
- AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
AC_CHECK_HEADERS(sys/types.h sys/socket.h)
#
@@ -1058,10 +1020,6 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#else
#ifdef HAVE_PROTO_BSDSOCKET_H
@@ -1106,10 +1064,6 @@ struct Library *SocketBase = NULL;
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#define RECVCALLCONV PASCAL
#else
@@ -1187,7 +1141,6 @@ dnl return value in SEND_TYPE_RETV, and also defining the
dnl type qualifier of second argument in SEND_QUAL_ARG2.
AC_DEFUN([CURL_CHECK_FUNC_SEND], [
- AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
AC_CHECK_HEADERS(sys/types.h sys/socket.h)
#
@@ -1202,10 +1155,6 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#else
#ifdef HAVE_PROTO_BSDSOCKET_H
@@ -1250,10 +1199,6 @@ struct Library *SocketBase = NULL;
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#define SENDCALLCONV PASCAL
#else
@@ -1368,10 +1313,6 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#else
#ifdef HAVE_PROTO_BSDSOCKET_H
@@ -1408,7 +1349,6 @@ dnl -------------------------------------------------
dnl Check for timeval struct
AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
- AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
AC_CHECK_HEADERS(sys/types.h sys/time.h sys/socket.h)
AC_CACHE_CHECK([for struct timeval], [curl_cv_struct_timeval], [
@@ -1422,10 +1362,6 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#endif
#ifdef HAVE_SYS_TYPES_H
@@ -1481,10 +1417,6 @@ AC_DEFUN([TYPE_IN_ADDR_T], [
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#else
#ifdef HAVE_SYS_TYPES_H
@@ -1527,10 +1459,6 @@ AC_DEFUN([TYPE_IN_ADDR_T], [
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#else
#ifdef HAVE_SYS_TYPES_H
@@ -1823,10 +1751,6 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#endif
#ifdef HAVE_SYS_TYPES_H
@@ -1881,10 +1805,6 @@ struct Library *SocketBase = NULL;
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
-#else
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
#endif
#define SELECTCALLCONV PASCAL
#endif