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

cmake: drop HAVE_LIBWINMM and HAVE_LIBWS2_32 feature checks #11612

Closed
wants to merge 2 commits into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Aug 7, 2023

  • HAVE_LIBWINMM was detected but unused. The winmm system library
    is not used by curl, but it is by its optional dependency librtmp. Change
    the logic to 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 #11612

- `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
@vszakats vszakats added cmake Windows Windows-specific labels Aug 7, 2023
@vszakats vszakats closed this in 762740f Aug 8, 2023
@vszakats vszakats deleted the cmake-win-tidy-1 branch August 8, 2023 09:13
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cmake Windows Windows-specific
Development

Successfully merging this pull request may close these issues.

None yet

2 participants