diff options
| author |  murgatroid99 <michael.lumish@gmail.com> | 2015-01-23 09:11:39 -0800 |
|---|---|---|
| committer | murgatroid99 <michael.lumish@gmail.com> | 2015-01-23 09:11:39 -0800 |
| commit | d10c0abaf646f7635c1c0cb292c44036c6b64c05 (patch) | |
| tree | 7553a277e129ee2e03782f5c1f6460219cfbc7ab /src/ruby/ext | |
| parent | b2c86aa8c4a0833fb434e679d2a7dbc93e6fc670 (diff) | |
| parent | ac139dead15bf9cb8da75340c6fb93225a11ef7c (diff) | |
Merge branch 'master' of github.com:google/grpc into merge_new_invoke_api
Diffstat (limited to 'src/ruby/ext')
| -rw-r--r-- | src/ruby/ext/grpc/extconf.rb | 8 | ||||
| -rw-r--r-- | src/ruby/ext/grpc/rb_completion_queue.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/ruby/ext/grpc/extconf.rb b/src/ruby/ext/grpc/extconf.rb index a6dbbf3aca..cbf41eda8b 100644 --- a/src/ruby/ext/grpc/extconf.rb +++ b/src/ruby/ext/grpc/extconf.rb @@ -68,13 +68,9 @@ $CFLAGS << ' -Wno-return-type ' $CFLAGS << ' -Wall ' $CFLAGS << ' -pedantic ' -$LDFLAGS << ' -lgrpc -lgpr' - -# crash('need grpc lib') unless have_library('grpc', 'grpc_channel_destroy') -# -# TODO(temiola): figure out why this stopped working, but the so is built OK -# and the tests pass +$LDFLAGS << ' -lgrpc -lgpr -ldl' +crash('need grpc lib') unless have_library('grpc', 'grpc_channel_destroy') have_library('grpc', 'grpc_channel_destroy') crash('need gpr lib') unless have_library('gpr', 'gpr_now') create_makefile('grpc/grpc') diff --git a/src/ruby/ext/grpc/rb_completion_queue.c b/src/ruby/ext/grpc/rb_completion_queue.c index c1b74e2606..47776a991a 100644 --- a/src/ruby/ext/grpc/rb_completion_queue.c +++ b/src/ruby/ext/grpc/rb_completion_queue.c @@ -75,7 +75,7 @@ static void grpc_rb_completion_queue_shutdown_drain(grpc_completion_queue *cq) { grpc_completion_queue_shutdown(cq); next_call.cq = cq; next_call.event = NULL; - /* TODO(temiola): the timeout should be a module level constant that defaults + /* TODO: the timeout should be a module level constant that defaults * to gpr_inf_future. * * - at the moment this does not work, it stalls. Using a small timeout like |