Skip to content

Remove leftover WinSock v1 checks - #7778

Closed
MarcelRaad wants to merge 3 commits into
curl:masterfrom
MarcelRaad:remove_winsock1_checks
Closed

MarcelRaad wants to merge 3 commits into
curl:masterfrom
MarcelRaad:remove_winsock1_checks

Conversation

@MarcelRaad

Copy link
Copy Markdown
Member

We require Winsock 2.2 since commit 3e4b32a,

It's not supported anymore.

Closes curl#7778
That's the only version we support.

Closes curl#7778
WinSock 2.2 is supported by Windows CE .NET 4.1 (from 2002, out of
support since 2013).

Ref: https://docs.microsoft.com/en-us/previous-versions/windows/embedded/ms899586(v=msdn.10)

Closes curl#7778
@MarcelRaad
MarcelRaad force-pushed the remove_winsock1_checks branch from bb87d95 to e66035f Compare September 27, 2021 08:45

@bagder bagder left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Comment thread lib/setup-win32.h
MarcelRaad added a commit that referenced this pull request Sep 28, 2021
That's the only version we support.

Closes #7778
MarcelRaad added a commit that referenced this pull request Sep 28, 2021
WinSock 2.2 is supported by Windows CE .NET 4.1 (from 2002, out of
support since 2013).

Ref: https://docs.microsoft.com/en-us/previous-versions/windows/embedded/ms899586(v=msdn.10)

Closes #7778
@MarcelRaad
MarcelRaad deleted the remove_winsock1_checks branch September 28, 2021 17:31
@MarcelRaad

Copy link
Copy Markdown
Member Author

Thanks for the reviews and comments!

@mback2k

mback2k commented Sep 28, 2021

Copy link
Copy Markdown
Member

@MarcelRaad didn't you check that all Windows CI passes at least the build stage? There are quite some compilation errors. Please take another look.

@bagder

bagder commented Sep 28, 2021

Copy link
Copy Markdown
Member

#7788 fixes the problem I ran into after this was merged

@MarcelRaad

MarcelRaad commented Sep 28, 2021

Copy link
Copy Markdown
Member Author

I actually did in my fork, and the change from #7788 is present in my local branch, just not in what landed on master and was pushed somewhere else. No idea how that could happen. Sorry about that, and thanks for the fix!

@mback2k

mback2k commented Sep 29, 2021

Copy link
Copy Markdown
Member

That fix doesn’t seem to fix the compilation errors. Most Azure and Cirrus Windows CI builds still fail due to:

configure: error: Cannot find a type to use in place of in_addr_t

Maybe the old header is still needed after all?

@bagder

bagder commented Sep 29, 2021

Copy link
Copy Markdown
Member

Yeah, #7788 gets lots of CI build failures on Windows with that in_addr_t problem. I'm thinking we need to revert that commit until we have this fixed correctly: #7790

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants