lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-07-31 00:03:08 +03:00
Code Activity

delete redundant HAVE_WS2TCPIP_H

Browse Source 
It was used once in `src/libssh2_priv.h`, but without any effect.
The header included `ws2tcpip.h` twice, once guarded by
`HAVE_WS2TCPIP_H` and another time by `HAVE_WINSOCK2_H`.

Dedupe these to not use `HAVE_WS2TCPIP_H`. Then delete detection
of this feature from all build methods.

TODO: Replace `HAVE_WINSOCK2_H` with `_WIN32`/`WIN32`.
This commit is contained in:
Viktor Szakats
2023-04-01 01:02:06 +00:00
committed by Viktor Szakats
parent 0d1ef8a7cb
commit b66d7317ca
5 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -130,7 +130,6 @@ check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H) check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H)
check_include_files(sys/time.h HAVE_SYS_TIME_H) check_include_files(sys/time.h HAVE_SYS_TIME_H)
check_include_files(sys/un.h HAVE_SYS_UN_H) check_include_files(sys/un.h HAVE_SYS_UN_H)
check_include_files(ws2tcpip.h HAVE_WS2TCPIP_H)
check_include_files(winsock2.h HAVE_WINSOCK2_H) check_include_files(winsock2.h HAVE_WINSOCK2_H)
# for example and tests # for example and tests

2
configure.ac
View File

@ -289,7 +289,7 @@ case $host in
# These are POSIX-like systems using BSD-like sockets API. # These are POSIX-like systems using BSD-like sockets API.
;; ;;
*) *)
AC_CHECK_HEADERS([windows.h winsock2.h ws2tcpip.h]) AC_CHECK_HEADERS([windows.h winsock2.h])
;; ;;
esac esac

3
os400/libssh2_config.h
View File

@ -137,9 +137,6 @@
/* Define to 1 if you have the <winsock2.h> header file. */ /* Define to 1 if you have the <winsock2.h> header file. */
#undef HAVE_WINSOCK2_H #undef HAVE_WINSOCK2_H
/* Define to 1 if you have the <ws2tcpip.h> header file. */
#undef HAVE_WS2TCPIP_H
/* to make a symbol visible */ /* to make a symbol visible */
#undef LIBSSH2_API #undef LIBSSH2_API

1
src/libssh2_config_cmake.h.in
View File

@ -45,7 +45,6 @@
#cmakedefine HAVE_SYS_IOCTL_H #cmakedefine HAVE_SYS_IOCTL_H
#cmakedefine HAVE_SYS_TIME_H #cmakedefine HAVE_SYS_TIME_H
#cmakedefine HAVE_SYS_UN_H #cmakedefine HAVE_SYS_UN_H
#cmakedefine HAVE_WS2TCPIP_H
#cmakedefine HAVE_WINSOCK2_H #cmakedefine HAVE_WINSOCK2_H
/* for example and tests */ /* for example and tests */

14
src/libssh2_priv.h
View File

@ -78,8 +78,12 @@
# endif # endif
#endif /* WIN32 */ #endif /* WIN32 */
#ifdef HAVE_WS2TCPIP_H #ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
/* Force parameter type. */
#define recv(s, b, l, f) recv((s), (b), (int)(l), (f))
#define send(s, b, l, f) send((s), (b), (int)(l), (f))
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -164,14 +168,6 @@ struct iovec {
#include "crypto.h" #include "crypto.h"
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
#include <ws2tcpip.h>
/* Force parameter type. */
#define recv(s, b, l, f) recv((s), (b), (int)(l), (f))
#define send(s, b, l, f) send((s), (b), (int)(l), (f))
#endif
#ifndef SIZE_MAX #ifndef SIZE_MAX
#if _WIN64 #if _WIN64
#define SIZE_MAX 0xFFFFFFFFFFFFFFFF #define SIZE_MAX 0xFFFFFFFFFFFFFFFF