diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-17 07:20:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-17 07:20:53 +0000 |
| commit | 34b6d066291fb54972c71033c856b78f9eac4ab4 (patch) | |
| tree | 78efc860a2f9171a7fc20b2ce04a9181c3fae33e | |
| parent | 7cc92034be348d72edfa769801a2e23f14233049 (diff) | |
| download | ruby-34b6d066291fb54972c71033c856b78f9eac4ab4.tar.gz | |
thread_win32.c: reserved pattern name
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | thread_win32.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -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. diff --git a/thread_win32.c b/thread_win32.c index 459ae4c097..2410cfae81 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -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 |