From 9ec1573d2b9463043df79b9a2cb30acc6afaeaaa Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 22 May 2011 15:23:27 -0400 Subject: [PATCH] Don't call scm_lock_mutex and scm_unlock_mutex via pointer of wrong type * libguile/threads.c (lock_mutex_return_void, unlock_mutex_return_void): New static functions that simply call scm_lock_mutex and scm_unlock_mutex, respectively, but return void instead of SCM. (scm_dynwind_lock_mutex): Pass unlock_mutex_return_void to scm_dynwind_unwind_handler_with_scm, and lock_mutex_return_void to scm_dynwind_rewind_handler_with_scm. Previously, we passed scm_unlock_mutex and scm_lock_mutex (which return SCM), but the scm_dynwind_* functions expect pointers to functions which return void. When SCM is of type union, this changes the calling conventions of the functions on some platforms (e.g. GCC 4.5.2 and 4.5.3 on x86). --- libguile/threads.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libguile/threads.c b/libguile/threads.c index 468d1f8bb..07138a5f8 100644 --- a/libguile/threads.c +++ b/libguile/threads.c @@ -1456,12 +1456,24 @@ SCM_DEFINE (scm_lock_mutex_timed, "lock-mutex", 1, 2, 0, } #undef FUNC_NAME +static void +lock_mutex_return_void (SCM mx) +{ + (void) scm_lock_mutex (mx); +} + +static void +unlock_mutex_return_void (SCM mx) +{ + (void) scm_unlock_mutex (mx); +} + void scm_dynwind_lock_mutex (SCM mutex) { - scm_dynwind_unwind_handler_with_scm ((void(*)(SCM))scm_unlock_mutex, mutex, + scm_dynwind_unwind_handler_with_scm (unlock_mutex_return_void, mutex, SCM_F_WIND_EXPLICITLY); - scm_dynwind_rewind_handler_with_scm ((void(*)(SCM))scm_lock_mutex, mutex, + scm_dynwind_rewind_handler_with_scm (lock_mutex_return_void, mutex, SCM_F_WIND_EXPLICITLY); } -- 2.20.1