Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

delete redundant HAVE_WS2TCPIP_H #910

Merged
merged 1 commit into from
Apr 1, 2023

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Apr 1, 2023

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.

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`.
@vszakats vszakats merged commit b66d731 into libssh2:master Apr 1, 2023
@vszakats vszakats deleted the win-del-have-ws2tcpip branch April 1, 2023 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant