cmake: drop HAVE_LIBWINMM and HAVE_LIBWS2_32 feature checks#11612
Closed
vszakats wants to merge 2 commits intocurl:masterfrom
Closed
cmake: drop HAVE_LIBWINMM and HAVE_LIBWS2_32 feature checks#11612vszakats wants to merge 2 commits intocurl:masterfrom
HAVE_LIBWINMM and HAVE_LIBWS2_32 feature checks#11612vszakats wants to merge 2 commits intocurl:masterfrom
Conversation
- `HAVE_LIBWINMM` was detected but unused. - `HAVE_LIBWS2_32` detected `ws2_32` lib on Windows. This lib is present since Windows 95 OSR2 (AFAIR). Let's assume it's available, delete the check and replace the detection variable with `WIN32`. Closes #xxxxx
bagder
approved these changes
Aug 7, 2023
ptitSeb
pushed a commit
to wasix-org/curl
that referenced
this pull request
Sep 25, 2023
- `HAVE_LIBWINMM` was detected but unused. The `winmm` system library is also not used by curl, but it is by its optional dependency `librtmp`. Change the logic to always add `winmm` when `USE_LIBRTMP` is set. This library has been available since the early days of Windows. - `HAVE_LIBWS2_32` detected `ws2_32` lib on Windows. This lib is present since Windows 95 OSR2 (AFAIR). Winsock1 already wasn't supported and other existing logic already assumed this lib being present, so delete the check and replace the detection variable with `WIN32` and always add `ws2_32` on Windows. Closes curl#11612
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
HAVE_LIBWINMMwas detected but unused. Thewinmmsystem libraryis not used by curl, but it is by its optional dependency
librtmp. Changethe logic to add
winmmwhenUSE_LIBRTMPis set. This library has beenavailable since the early days of Windows.
HAVE_LIBWS2_32detectedws2_32lib on Windows. This lib is presentsince Windows 95 OSR2 (AFAIR). Winsock1 already wasn't supported and
other existing logic already assumed this lib being present, so delete the
check and replace the detection variable with
WIN32and always addws2_32on Windows.Closes #11612