Skip to content

Commit

Permalink
thread_win32.c: reserved pattern name
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nobu committed Jun 17, 2012
1 parent 7cc9203 commit 34b6d06
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Sun Jun 17 16:20:50 2012 Nobuyoshi Nakada <[email protected]>

* 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 <[email protected]>

* ext/date/date_core.c: define date_sg_t.
Expand Down
6 changes: 3 additions & 3 deletions thread_win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 34b6d06

Please sign in to comment.