Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grpc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

c6d8f5a3

Commit c6d8f5a3 authored 10 years ago by Nicolas "Pixel" Noble

Downloads
- Plain Diff

Merge branch 'master' of github.com:google/grpc into win32

parents 94964fd0 7db49ff5

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 38 additions, 5 deletions

Makefile
src/core/debug/trace.c 1 addition, 1 deletion

src/core/debug/trace.c
src/core/iomgr/pollset_multipoller_with_poll_posix.c 2 additions, 2 deletions

src/core/iomgr/pollset_multipoller_with_poll_posix.c
src/core/iomgr/pollset_posix.c 4 additions, 4 deletions

src/core/iomgr/pollset_posix.c
src/core/iomgr/resolve_address_posix.c 1 addition, 1 deletion

src/core/iomgr/resolve_address_posix.c
templates/Makefile.template 38 additions, 5 deletions

templates/Makefile.template

with 84 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment