From f61858b1164eab2afd67c3814b79d50a386a92c0 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 24 Jun 1998 04:38:10 +0000 Subject: thread->thred git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/gtk/gtk.c | 2 +- ext/socket/socket.c | 30 +++++++++++++++--------------- ext/tcltklib/tcltklib.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'ext') diff --git a/ext/gtk/gtk.c b/ext/gtk/gtk.c index 21079026fc..cc552c15b4 100644 --- a/ext/gtk/gtk.c +++ b/ext/gtk/gtk.c @@ -5779,7 +5779,7 @@ idle() { CHECK_INTS; #ifdef THREAD - if (!thread_critical) thread_schedule(); + if (!thred_critical) thred_schedule(); #endif return TRUE; } diff --git a/ext/socket/socket.c b/ext/socket/socket.c index d527e308e8..6748655ff3 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -24,7 +24,7 @@ #ifdef USE_CWGUSI extern int fileno(FILE *stream); /* */ -extern int thread_select(int, fd_set*, fd_set*, fd_set*, struct timeval*); /* thread.c */ +extern int thred_select(int, fd_set*, fd_set*, fd_set*, struct timeval*); /* thread.c */ # include # include #endif @@ -243,7 +243,7 @@ bsock_send(argc, argv, sock) fd = fileno(f); retry: #ifdef THREAD - thread_fd_writable(fd); + thred_fd_writable(fd); #endif m = str2cstr(msg, &mlen); if (RTEST(to)) { @@ -262,7 +262,7 @@ bsock_send(argc, argv, sock) case EAGAIN: #endif #ifdef THREAD - thread_schedule(); + thred_schedule(); #endif goto retry; } @@ -309,7 +309,7 @@ s_recv(sock, argc, argv, from) GetOpenFile(sock, fptr); fd = fileno(fptr->f); #ifdef THREAD - thread_wait_fd(fd); + thred_wait_fd(fd); #endif TRAP_BEG; retry: @@ -325,7 +325,7 @@ s_recv(sock, argc, argv, from) case EAGAIN: #endif #ifdef THREAD - thread_schedule(); + thred_schedule(); #endif goto retry; } @@ -370,7 +370,7 @@ bsock_recv(argc, argv, sock) #if defined(THREAD) && defined(HAVE_FCNTL) static int -thread_connect(fd, sockaddr, len, type) +thred_connect(fd, sockaddr, len, type) int fd; struct sockaddr *sockaddr; int len; @@ -412,9 +412,9 @@ thread_connect(fd, sockaddr, len, type) FD_ZERO(&fds); FD_SET(fd, &fds); #ifndef USE_CWGUSI - thread_select(fd+1, 0, &fds, 0, 0, 0); + thred_select(fd+1, 0, &fds, 0, 0, 0); #else - thread_select(fd+1, 0, &fds, 0, 0); + thred_select(fd+1, 0, &fds, 0, 0); #endif continue; #endif @@ -535,8 +535,8 @@ open_inet(class, h, serv, type) } else { #if defined(THREAD) && defined(HAVE_FCNTL) - status = thread_connect(fd, (struct sockaddr*)&sockaddr, - sizeof(sockaddr), type); + status = thred_connect(fd, (struct sockaddr*)&sockaddr, + sizeof(sockaddr), type); #else #ifdef SOCKS if (type == INET_SOCKS) { @@ -611,7 +611,7 @@ s_accept(class, fd, sockaddr, len) retry: #ifdef THREAD - thread_wait_fd(fd); + thred_wait_fd(fd); #endif TRAP_BEG; fd2 = accept(fd, sockaddr, len); @@ -624,7 +624,7 @@ s_accept(class, fd, sockaddr, len) case EAGAIN: #endif #ifdef THREAD - thread_schedule(); + thred_schedule(); #endif goto retry; } @@ -889,7 +889,7 @@ udp_connect(sock, host, port) case EAGAIN: #endif #ifdef THREAD - thread_schedule(); + thred_schedule(); #endif goto retry; } @@ -948,7 +948,7 @@ udp_send(argc, argv, sock) case EAGAIN: #endif #ifdef THREAD - thread_schedule(); + thred_schedule(); #endif goto retry; } @@ -1203,7 +1203,7 @@ sock_connect(sock, addr) case EAGAIN: #endif #ifdef THREAD - thread_schedule(); + thred_schedule(); #endif goto retry; } diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index 7d2abb8e80..1eb2a48c55 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/tcltklib.c @@ -52,7 +52,7 @@ void _timer_for_tcl (ClientData clientData) timer->flag = 0; CHECK_INTS; #ifdef THREAD - if (!thread_critical) thread_schedule(); + if (!thred_critical) thred_schedule(); #endif timer->token = Tk_CreateTimerHandler(200, _timer_for_tcl, -- cgit v1.2.3