lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-20 02:42:09 +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

14
src/libssh2_priv.h
View File

@@ -78,8 +78,12 @@
# endif
#endif /* WIN32 */
#ifdef HAVE_WS2TCPIP_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
#include <stdio.h>
@@ -164,14 +168,6 @@ struct iovec {
#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
#if _WIN64
#define SIZE_MAX 0xFFFFFFFFFFFFFFFF