From f0445d156caf032135777f4c3974a4adc945470e Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 28 Nov 2010 05:55:49 +0000 Subject: [PATCH] * thread_win32.c (gvl_release, gvl_init): suppress warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ thread_win32.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 124bebf076..88a255dca2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Nov 28 14:55:42 2010 Nobuyoshi Nakada + + * thread_win32.c (gvl_release, gvl_init): suppress warnings. + Sun Nov 28 14:48:24 2010 Nobuyoshi Nakada * thread_pthread.c (gvl_release, gvl_init): suppress warnings. diff --git a/thread_win32.c b/thread_win32.c index 51f74298fa..26516e4cf3 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -32,6 +32,7 @@ static void native_cond_broadcast(rb_thread_cond_t *cond); static void native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex); static void native_cond_initialize(rb_thread_cond_t *cond); static void native_cond_destroy(rb_thread_cond_t *cond); +static int w32_wait_events(HANDLE *events, int count, DWORD timeout, rb_thread_t *th); static void w32_error(const char *func) @@ -79,7 +80,7 @@ w32_mutex_lock(HANDLE lock) rb_bug("win32_mutex_lock: WAIT_ABANDONED"); break; default: - rb_bug("win32_mutex_lock: unknown result (%d)", result); + rb_bug("win32_mutex_lock: unknown result (%ld)", result); break; } } @@ -120,7 +121,6 @@ gvl_atfork(rb_vm_t *vm) static void gvl_init(rb_vm_t *vm) { - int r; if (GVL_DEBUG) fprintf(stderr, "gvl init\n"); vm->gvl.lock = w32_mutex_create(); }