[前][次][番号順一覧][スレッド一覧]

ruby-changes:13771

From: usa <ko1@a...>
Date: Fri, 30 Oct 2009 13:01:56 +0900 (JST)
Subject: [ruby-changes:13771] Ruby:r25567 (trunk): * thread.c (rb_thread_blocking_region): standard C doesn't accept

usa	2009-10-30 13:01:46 +0900 (Fri, 30 Oct 2009)

  New Revision: 25567

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25567

  Log:
    * thread.c (rb_thread_blocking_region): standard C doesn't accept
      preprosessing directive within macro expansion.

  Modified files:
    trunk/thread.c

Index: thread.c
===================================================================
--- thread.c	(revision 25566)
+++ thread.c	(revision 25567)
@@ -1097,15 +1097,17 @@
 	data2 = th;
     }
 
+#if PROHIBIT_FUNCTION_CAST
     BLOCKING_REGION({
-#if PROHIBIT_FUNCTION_CAST
 	args.func = func;
 	args.data = data1;
 	val = rb_protect(call_blocking_function, (VALUE)&args, &status);
+    }, ubf, data2);
 #else
+    BLOCKING_REGION({
 	val = rb_protect((VALUE (*)(VALUE))func, (VALUE)data1, &status);
+    }, ubf, data2);
 #endif
-    }, ubf, data2);
     if (status) rb_jump_tag(status);
 
     return val;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]