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

Merge google internal changes. #1365

Closed
wants to merge 16 commits into from
Closed

Conversation

liujisi
Copy link
Contributor

@liujisi liujisi commented Mar 30, 2016

No description provided.

liujisi added 4 commits March 31, 2016 13:17
Referencing data member table_ in static functions break certain
platforms. Change it to refer to the declare type void** instead.
@grpc-kokoro
Copy link

Can one of the admins verify this patch?

liujisi added 6 commits March 31, 2016 14:47
stubs/common.h undefines the GetMessage macro introduced in windows.h
map_test however include stubs/common.h before windows.h is transitively
included. This hack force map_test.cc to include windows.h first, so we
have a chance to undefine the GetMessage macro.
@haberman
Copy link
Member

haberman commented Apr 1, 2016

add to whitelist

@liujisi
Copy link
Contributor Author

liujisi commented Apr 2, 2016

Merged into an internal temporary #1381 so @haberman can work on the fix for javascript. Closing this PR now.

@liujisi liujisi closed this Apr 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants