nobu	2012-06-17 16:20:53 +0900 (Sun, 17 Jun 2012)

  New Revision: 36116

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

  Log:
    thread_win32.c: reserved pattern name
    
    * thread_win32.c (native_cond_timedwait_ms): rename reserved pattern
      name.  user defined symbols should not start with __.

  Modified files:
    trunk/ChangeLog
    trunk/thread_win32.c

Index: thread_win32.c
===================================================================
--- thread_win32.c	(revision 36115)
+++ thread_win32.c	(revision 36116)
@@ -448,7 +448,7 @@
 
 
 static int
-__cond_timedwait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, unsigned long msec)
+native_cond_timedwait_ms(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, unsigned long msec)
 {
     DWORD r;
     struct cond_event_entry entry;
@@ -481,7 +481,7 @@
 static int
 native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex)
 {
-    return __cond_timedwait(cond, mutex, INFINITE);
+    return native_cond_timedwait_ms(cond, mutex, INFINITE);
 }
 
 static unsigned long
@@ -509,7 +509,7 @@
     if (!timeout_ms)
 	return ETIMEDOUT;
 
-    return __cond_timedwait(cond, mutex, timeout_ms);
+    return native_cond_timedwait_ms(cond, mutex, timeout_ms);
 }
 
 #if SIZEOF_TIME_T == SIZEOF_LONG
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36115)
+++ ChangeLog	(revision 36116)
@@ -1,3 +1,8 @@
+Sun Jun 17 16:20:50 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* thread_win32.c (native_cond_timedwait_ms): rename reserved pattern
+	  name.  user defined symbols should not start with __.
+
 Sat Jun 16 19:24:01 2012  Tadayoshi Funaba  <tadf@d...>
 
 	* ext/date/date_core.c: define date_sg_t.

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