github-migration/mysql2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Declare the selector function pointer as per ISO C90 spec + address brian's concern / comment re. rb_thread_alone()

Browse Source
This commit is contained in:
Lourens Naudé 2010-08-07 21:33:52 +01:00 committed by Brian Lopez
parent 0190457dbd
commit 9a63a587c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/mysql2/client.c
View File

@ -248,6 +248,7 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
int fd, retval; int fd, retval;
int async = 0; int async = 0;
VALUE opts, defaults, active; VALUE opts, defaults, active;
int(*selector)(int, fd_set *, fd_set *, fd_set *, struct timeval *) = NULL;
GET_CLIENT(self) GET_CLIENT(self)
REQUIRE_OPEN_DB(client); REQUIRE_OPEN_DB(client);
@ -290,8 +291,7 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
// the below code is largely from do_mysql // the below code is largely from do_mysql
// http://github.com/datamapper/do // http://github.com/datamapper/do
fd = client->net.fd; fd = client->net.fd;
int(*selector)(int, fd_set *, fd_set *, fd_set *, struct timeval *) = NULL; selector = rb_thread_alone() ? *select : *rb_thread_select;
selector = rb_thread_alone ? *select : *rb_thread_select;
for(;;) { for(;;) {
FD_ZERO(&fdset); FD_ZERO(&fdset);
FD_SET(fd, &fdset); FD_SET(fd, &fdset);