kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

thread_win32.c: reserved pattern name

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-06-17 07:20:53 +00:00
parent 7cc92034be
commit 34b6d06629
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Jun 17 16:20:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@dotrb.org>
* ext/date/date_core.c: define date_sg_t.

6
thread_win32.c
View file

@ -448,7 +448,7 @@ native_cond_broadcast(rb_thread_cond_t *cond)
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 @@ __cond_timedwait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, unsigned long
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 @@ native_cond_timedwait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, struct ti
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