diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/config-os400.h | 3 | ||||
| -rw-r--r-- | lib/config-riscos.h | 3 | ||||
| -rw-r--r-- | lib/config-tpf.h | 3 | ||||
| -rw-r--r-- | lib/config-vxworks.h | 3 | ||||
| -rw-r--r-- | lib/config-win32.h | 5 | ||||
| -rw-r--r-- | lib/config-win32ce.h | 3 | ||||
| -rw-r--r-- | lib/connect.c | 2 | ||||
| -rw-r--r-- | lib/curl_config.h.cmake | 3 | ||||
| -rw-r--r-- | lib/curl_setup.h | 1 | ||||
| -rw-r--r-- | lib/setup-win32.h | 12 |
10 files changed, 35 insertions, 3 deletions
diff --git a/lib/config-os400.h b/lib/config-os400.h index d68cb4b18..47b09465a 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -328,6 +328,9 @@ /* Define if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H +/* Define if you have the <winsock.h> header file. */ +#undef HAVE_WINSOCK_H + /* Define if you have the <x509.h> header file. */ #undef HAVE_X509_H diff --git a/lib/config-riscos.h b/lib/config-riscos.h index 9986b20fb..6c6ff45ea 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -305,6 +305,9 @@ /* Define if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H +/* Define if you have the <winsock.h> header file. */ +#undef HAVE_WINSOCK_H + /* Define if you have the <x509.h> header file. */ #undef HAVE_X509_H diff --git a/lib/config-tpf.h b/lib/config-tpf.h index cce06cedd..0562ec91e 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -483,6 +483,9 @@ /* Define to 1 if you have the <winsock2.h> header file. */ /* #undef HAVE_WINSOCK2_H */ +/* Define to 1 if you have the <winsock.h> header file. */ +/* #undef HAVE_WINSOCK_H */ + /* Define this symbol if your OS supports changing the contents of argv */ /* #undef HAVE_WRITABLE_ARGV */ diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index af1d87345..042e67ee9 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -601,6 +601,9 @@ /* Define to 1 if you have the winsock2.h header file. */ /* #undef HAVE_WINSOCK2_H */ +/* Define to 1 if you have the winsock.h header file. */ +/* #undef HAVE_WINSOCK_H */ + /* Define this symbol if your OS supports changing the contents of argv */ #define HAVE_WRITABLE_ARGV 1 diff --git a/lib/config-win32.h b/lib/config-win32.h index 89593a815..b6a6ced59 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -132,6 +132,9 @@ /* Define if you have the <windows.h> header file. */ #define HAVE_WINDOWS_H 1 +/* Define if you have the <winsock.h> header file. */ +#define HAVE_WINSOCK_H 1 + /* Define if you have the <winsock2.h> header file. */ #ifndef __SALFORDC__ #define HAVE_WINSOCK2_H 1 @@ -378,6 +381,7 @@ #ifdef USE_LWIPSOCK # undef USE_WINSOCK +# undef HAVE_WINSOCK_H # undef HAVE_WINSOCK2_H # undef HAVE_WS2TCPIP_H # undef HAVE_ERRNO_H @@ -408,6 +412,7 @@ #undef byte #undef word #undef USE_WINSOCK + #undef HAVE_WINSOCK_H #undef HAVE_WINSOCK2_H #undef HAVE_WS2TCPIP_H #define HAVE_GETADDRINFO diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index 889028b26..70b7ae7b5 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -110,6 +110,9 @@ /* Define if you have the <windows.h> header file. */ #define HAVE_WINDOWS_H 1 +/* Define if you have the <winsock.h> header file. */ +#define HAVE_WINSOCK_H 1 + /* Define if you have the <winsock2.h> header file. */ #define HAVE_WINSOCK2_H 1 diff --git a/lib/connect.c b/lib/connect.c index 48c98ebd4..d61b0374e 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -85,7 +85,7 @@ static bool verifyconnect(curl_socket_t sockfd, int *error); -#if defined(__DragonFly__) || defined(HAVE_WINSOCK2_H) +#if defined(__DragonFly__) || defined(HAVE_WINSOCK_H) /* DragonFlyBSD and Windows use millisecond units */ #define KEEPALIVE_FACTOR(x) (x *= 1000) #else diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index d2a0f438c..4ef4883b2 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -710,6 +710,9 @@ /* Define to 1 if you have the winsock2.h header file. */ #cmakedefine HAVE_WINSOCK2_H 1 +/* Define to 1 if you have the winsock.h header file. */ +#cmakedefine HAVE_WINSOCK_H 1 + /* Define this symbol if your OS supports changing the contents of argv */ #cmakedefine HAVE_WRITABLE_ARGV 1 diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 3840636f6..99048c489 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -717,6 +717,7 @@ int netware_init(void); #if defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H) # if defined(SOCKET) || \ defined(USE_WINSOCK) || \ + defined(HAVE_WINSOCK_H) || \ defined(HAVE_WINSOCK2_H) || \ defined(HAVE_WS2TCPIP_H) # error "WinSock and lwIP TCP/IP stack definitions shall not coexist!" diff --git a/lib/setup-win32.h b/lib/setup-win32.h index 12d95e9d5..c35dec88c 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 or ws2tcpip.h. Any other windows thing belongs + * winsock2.h, ws2tcpip.h or winsock.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_WINSOCK2_H, + * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H, * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined. */ @@ -47,6 +47,10 @@ # ifdef HAVE_WS2TCPIP_H # include <ws2tcpip.h> # endif +# else +# ifdef HAVE_WINSOCK_H +# include <winsock.h> +# endif # endif # include <tchar.h> # ifdef UNICODE @@ -63,6 +67,10 @@ #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 /* |