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.

Sign up for GitHub

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

Jump to bottom

windows: simplify detecting and using system headers #12495

Closed
wants to merge 27 commits into from
Closed

windows: simplify detecting and using system headers #12495

wants to merge 27 commits into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Dec 9, 2023 •
edited

  • autotools, cmake: assume that if we detect Windows, windows.h,
    winsock2.h and ws2tcpip.h do exist.
  • lib: fix 3 outlier #if conditions to use USE_WINSOCK instead of
    looking for winsock2.h.
  • autotools: merge 3 Windows check methods into one.
  • move Watt-32 and lwIP socket support to setup-win32.h from
    config-win32.h. It opens up using these with all build tools. Also
    merge logic with Windows Sockets.
  • fix to assume Windows sockets with the mingw32ce toolchain.
    Follow-up to: 2748c64
  • cmake: delete unused variable signature_call_conv since
    eb33ccd.
  • autotools: simplify CURL_CHECK_WIN32_LARGEFILE detection.
  • examples/externalsocket: fix header order.
  • cmake/OtherTests.cmake: delete Windows-specific _source_epilogue
    that wasn't used anymore.
  • cmake/OtherTests.cmake: set WIN32_LEAN_AND_MEAN for test
    SIZEOF_STRUCT_SOCKADDR_STORAGE.

After this patch curl universally uses _WIN32 to guard
Windows-specific logic. It guards Windows Sockets-specific logic with
USE_WINSOCK (this might need further work).

Closes #12495

TODO:

https://github.com/curl/curl/pull/12495/files?w=1

@vszakats vszakats added build Windows Windows-specific tidy-up labels Dec 9, 2023
@vszakats vszakats marked this pull request as draft December 9, 2023 23:29
@vszakats vszakats marked this pull request as ready for review December 10, 2023 02:30
@vszakats vszakats changed the title windows: cleanup/dedupe detecting/using system/socket headers windows: simplify detecting and using system headers Dec 10, 2023
@vszakats
lib: stop relying on HAVE_WINDOWS_H
15b3650
@vszakats
cmake: stop relying on HAVE_WINDOWS_H
08f2e75
@vszakats
autotools: stop relying on HAVE_WINDOWS_H
bb525a6
@vszakats
autotools: merge native windows and windows.h checks
c47de81
@vszakats
autotools: dedupe another Windows-check
89d7e67
@vszakats
cmake: stop relying on HAVE_WINSOCK2_H
08a3b2c
@vszakats
windows: move alternative socket init to setup-win32.h
5f08062
@vszakats
setup-win32.h: init HAVE_WINSOCK2_H
daf7495
@vszakats
fix conditions for Windows socket hdrs and __MINGW32CE__
d7c09f0 
It seems like this was a mistake, as it contradicts the original
commit message in 2748c64. These
headers exist in a mingw32ce release from 2009. Though the commit
predates that by 1 year, it seems unlikely these weren't present
in earlier releases.
@vszakats
autotools: stop relying on HAVE_WINSOCK2_H
411f45e
@vszakats
setup-win32.h: init HAVE_WS2TCPIP_H
ad9d124
@vszakats
cmake: stop relying on HAVE_WS2TCPIP_H
9a0aff8
@vszakats
autotools: stop relying on HAVE_WS2TCPIP_H
4c51538
@vszakats
replace stray winsock header checks with USE_WINSOCK
376942b
@vszakats
drop HAVE_WINSOCK2_H and HAVE_WS2TCPIP_H completely
63cae73 
These are always available for _WIN32, no need keeping a tab of them.
Use existing USE_WINSOCK to decide if we actually want to use the
default Windows TCP/IP stack.
@vszakats
setup-win32.h: streamline socket-backend selection
1a6b9af
@vszakats
setup-win32.h: streamline socket-backend selection formatting
3cc6272
@vszakats
autotools: align native Windows detection with rest of code
7caaaf7
@vszakats
OtherTests.cmake: formatting
9a634d2
@vszakats
OtherTests.cmake: delete unused variable
038716e 
Since eb33ccd curl#9592 (2022-09-26)
@vszakats
autotools: simplify CURL_CHECK_WIN32_LARGEFILE detection
c3a0689
@vszakats vszakats closed this in c1bc090 Dec 16, 2023
@vszakats vszakats deleted the winguards branch December 16, 2023 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jay jay jay approved these changes

Assignees
No one assigned
Labels
build libcurl API tidy-up Windows Windows-specific
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@vszakats @jay