-
Notifications
You must be signed in to change notification settings - Fork 74k
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
Fix Windows build due to winsock2.h conflicts #25447
Conversation
@perfinion Can you help me to trigger CI test so that I can check if this does fix Windows CI? |
@rongjiecomputer Just to be clear, do you want |
9390d32
to
31f10d2
Compare
Done. |
I'll approve this once @perfinion has approved it, if needed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good!
PiperOrigin-RevId: 236176304
Adding FYI @gunan , this caused the failure
|
@meteorcloudy I don't think it is easy to figure out which files that need A workaround is for files that need header filtered by Here is a test: #define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <WinIoCtl.h>
#ifndef FSCTL_GET_REPARSE_POINT
#error "Hello"
#else
#error "World"
#endif`
|
@rongjiecomputer Thank you! |
Some abseil header files include
windows.h
. WithoutWIN32_LEAN_AND_MEAN
macro,windows.h
will includewinsock.h
which will conflict with other files that want to includewinsock2.h
instead.We should be able to revert these rollbacks after this PR.