980626

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 13 deletions

diff --git a/process.c b/process.c
index 4ecfae8da9..ffb1fdf3b3 100644
--- a/process.c
+++ b/process.c
@@ -81,7 +81,7 @@ rb_waitpid(pid, flags, st)
     int result;
 #if defined(THREAD) && (defined(HAVE_WAITPID) || defined(HAVE_WAIT4))
     int oflags = flags;
-    if (!thred_alone()) {	/* there're other threads to run */
+    if (!thread_alone()) {	/* there're other threads to run */
 	flags |= WNOHANG;
     }
 #endif
@@ -92,7 +92,7 @@ rb_waitpid(pid, flags, st)
     if (result < 0) {
 	if (errno == EINTR) {
 #ifdef THREAD
-	    thred_schedule();
+	    thread_schedule();
 #endif
 	    goto retry;
 	}
@@ -101,8 +101,8 @@ rb_waitpid(pid, flags, st)
 #ifdef THREAD
     if (result == 0) {
 	if (oflags & WNOHANG) return 0;
-	thred_schedule();
-	if (thred_alone()) flags = oflags;
+	thread_schedule();
+	if (thread_alone()) flags = oflags;
 	goto retry;
     }
 #endif
@@ -120,8 +120,8 @@ rb_waitpid(pid, flags, st)
 #ifdef THREAD
     if (result == 0) {
 	if (oflags & WNOHANG) return 0;
-	thred_schedule();
-	if (thred_alone()) flags = oflags;
+	thread_schedule();
+	if (thread_alone()) flags = oflags;
 	goto retry;
     }
 #endif
@@ -141,7 +141,7 @@ rb_waitpid(pid, flags, st)
 	if (result < 0) {
 	    if (errno == EINTR) {
 #ifdef THREAD
-		thred_schedule();
+		thread_schedule();
 #endif
 		continue;
 	    }
@@ -197,7 +197,7 @@ f_wait()
     while ((pid = wait(&state)) < 0) {
 	if (errno == EINTR) {
 #ifdef THREAD
-	    thred_schedule();
+	    thread_schedule();
 #endif
 	    continue;
 	}
@@ -257,8 +257,6 @@ static void
 security(str)
     char *str;
 {
-    extern VALUE eSecurityError;
-
     if (rb_safe_level() > 0) {
 #ifndef USE_CWGUSI
 	if (env_path_tainted()) {
@@ -728,7 +726,7 @@ f_system(argc, argv)
       case -1:
 	if (errno == EAGAIN) {
 #ifdef THREAD
-	    thred_sleep(1);
+	    thread_sleep(1);
 #else
 	    sleep(1);
 #endif
@@ -758,10 +756,10 @@ f_sleep(argc, argv)
     beg = time(0);
 #ifdef THREAD
     if (argc == 0) {
-	thred_sleep_forever();
+	thread_sleep_forever();
     }
     else if (argc == 1) {
-	thred_wait_for(time_timeval(argv[0]));
+	thread_wait_for(time_timeval(argv[0]));
     }
 #else
     if (argc == 0) {