Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 34b6d066291fb54972c71033c856b78f9eac4ab4 1 parent 7cc9203
Nobuyoshi Nakada nobu authored

Showing 2 changed files with 8 additions and 3 deletions. Show diff stats Hide diff stats

  1. +5 0 ChangeLog
  2. +3 3 thread_win32.c
5 ChangeLog
... ... @@ -1,3 +1,8 @@
  1 +Sun Jun 17 16:20:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
  2 +
  3 + * thread_win32.c (native_cond_timedwait_ms): rename reserved pattern
  4 + name. user defined symbols should not start with __.
  5 +
1 6 Sat Jun 16 19:24:01 2012 Tadayoshi Funaba <tadf@dotrb.org>
2 7
3 8 * ext/date/date_core.c: define date_sg_t.
6 thread_win32.c
@@ -448,7 +448,7 @@ native_cond_broadcast(rb_thread_cond_t *cond)
448 448
449 449
450 450 static int
451   -__cond_timedwait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, unsigned long msec)
  451 +native_cond_timedwait_ms(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, unsigned long msec)
452 452 {
453 453 DWORD r;
454 454 struct cond_event_entry entry;
@@ -481,7 +481,7 @@ __cond_timedwait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, unsigned long
481 481 static int
482 482 native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex)
483 483 {
484   - return __cond_timedwait(cond, mutex, INFINITE);
  484 + return native_cond_timedwait_ms(cond, mutex, INFINITE);
485 485 }
486 486
487 487 static unsigned long
@@ -509,7 +509,7 @@ native_cond_timedwait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, struct ti
509 509 if (!timeout_ms)
510 510 return ETIMEDOUT;
511 511
512   - return __cond_timedwait(cond, mutex, timeout_ms);
  512 + return native_cond_timedwait_ms(cond, mutex, timeout_ms);
513 513 }
514 514
515 515 #if SIZEOF_TIME_T == SIZEOF_LONG

0 comments on commit 34b6d06

Please sign in to comment.
Something went wrong with that request. Please try again.