nobu	2008-10-26 18:01:23 +0900 (Sun, 26 Oct 2008)

  New Revision: 19945

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

  Log:
    * thread.c (blocking_region_{begin,end}): declared as inline.
    * util.c (freedtoa): used only when MULTIPLE_THREADS is not defined.
    
    * win32/win32.c (rb_w32_pipe): serial is DWORD.

  Modified files:
    trunk/ChangeLog
    trunk/thread.c
    trunk/util.c
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19944)
+++ ChangeLog	(revision 19945)
@@ -1,3 +1,11 @@
+Sun Oct 26 18:01:06 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* thread.c (blocking_region_{begin,end}): declared as inline.
+
+	* util.c (freedtoa): used only when MULTIPLE_THREADS is not defined.
+
+	* win32/win32.c (rb_w32_pipe): serial is DWORD.
+
 Sun Oct 26 13:30:28 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (read_all): use the given buffer to read when needs readconv.
Index: thread.c
===================================================================
--- thread.c	(revision 19944)
+++ thread.c	(revision 19945)
@@ -95,9 +95,9 @@
 				 struct rb_unblock_callback *old);
 static void reset_unblock_function(rb_thread_t *th, const struct rb_unblock_callback *old);
 
-static void blocking_region_begin(rb_thread_t *th, struct rb_blocking_region_buffer *region,
-				  rb_unblock_function_t *func, void *arg);
-static void blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region);
+static void inline blocking_region_begin(rb_thread_t *th, struct rb_blocking_region_buffer *region,
+					 rb_unblock_function_t *func, void *arg);
+static void inline blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region);
 
 #define GVL_UNLOCK_BEGIN() do { \
   rb_thread_t *_th_stored = GET_THREAD(); \
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 19944)
+++ win32/win32.c	(revision 19945)
@@ -4182,7 +4182,7 @@
 	return _pipe(fds, 65536L, _O_NOINHERIT);
 
     p = strchr(name, '0');
-    snprintf(p, strlen(p) + 1, "%x-%x", rb_w32_getpid(), serial++);
+    snprintf(p, strlen(p) + 1, "%x-%lx", rb_w32_getpid(), serial++);
 
     sec.nLength = sizeof(sec);
     sec.lpSecurityDescriptor = NULL;
Index: util.c
===================================================================
--- util.c	(revision 19944)
+++ util.c	(revision 19945)
@@ -3086,6 +3086,7 @@
     return rv;
 }
 
+#ifndef MULTIPLE_THREADS
 /* freedtoa(s) must be used to free values s returned by dtoa
  * when MULTIPLE_THREADS is #defined.  It should be used in all cases,
  * but for consistency with earlier versions of dtoa, it is optional
@@ -3098,11 +3099,8 @@
     Bigint *b = (Bigint *)((int *)s - 1);
     b->maxwds = 1 << (b->k = *(int*)b);
     Bfree(b);
-#ifndef MULTIPLE_THREADS
-    if (s == dtoa_result)
-        dtoa_result = 0;
-#endif
 }
+#endif
 
 /* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
  *

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