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

Escape GetObject macro inside protoc-generated code #9739

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Escape GetObject macro inside protoc-generated code #9739

merged 1 commit into from
Apr 5, 2022

Conversation

smertnik3sh
Copy link
Contributor

@smertnik3sh smertnik3sh commented Apr 5, 2022 •
edited
Loading

GetObject macro is defined in wingdi.h (included transitively in windows.h):

#define GetObject  GetObjectW
#else
#define GetObject  GetObjectA
#endif

This can cause unexpected problems when compiling "GetObject" contains proto for windows.

Also "GetObject" looks like common method name for grpc. Here I want to wrap grpc-generated code with port_def/port_undef

@fowles fowles self-assigned this Apr 5, 2022
@fowles
Copy link
Member

fowles commented Apr 5, 2022

Thanks for the contribution. I will merge after the tests finish

@fowles
Copy link
Member

fowles commented Apr 5, 2022

Failures are unrelated. mergign

@fowles fowles merged commit 6d068f8 into protocolbuffers:main Apr 5, 2022
@smertnik3sh
Copy link
Contributor Author

thnx

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

@fowles fowles fowles approved these changes

Assignees

@fowles fowles

Labels
c++
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@smertnik3sh @fowles @protobuf-kokoro