diff options
Diffstat (limited to 'src/thread.c')
| -rw-r--r-- | src/thread.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/thread.c b/src/thread.c index 59845b6524f..ae2212e697d 100644 --- a/src/thread.c +++ b/src/thread.c | |||
| @@ -220,11 +220,10 @@ mutex_lock_callback (void *arg) | |||
| 220 | post_acquire_global_lock (self); | 220 | post_acquire_global_lock (self); |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | static Lisp_Object | 223 | static void |
| 224 | do_unwind_mutex_lock (Lisp_Object ignore) | 224 | do_unwind_mutex_lock (void) |
| 225 | { | 225 | { |
| 226 | current_thread->event_object = Qnil; | 226 | current_thread->event_object = Qnil; |
| 227 | return Qnil; | ||
| 228 | } | 227 | } |
| 229 | 228 | ||
| 230 | DEFUN ("mutex-lock", Fmutex_lock, Smutex_lock, 1, 1, 0, | 229 | DEFUN ("mutex-lock", Fmutex_lock, Smutex_lock, 1, 1, 0, |
| @@ -244,7 +243,7 @@ Note that calls to `mutex-lock' and `mutex-unlock' must be paired. */) | |||
| 244 | lmutex = XMUTEX (mutex); | 243 | lmutex = XMUTEX (mutex); |
| 245 | 244 | ||
| 246 | current_thread->event_object = mutex; | 245 | current_thread->event_object = mutex; |
| 247 | record_unwind_protect (do_unwind_mutex_lock, Qnil); | 246 | record_unwind_protect_void (do_unwind_mutex_lock); |
| 248 | flush_stack_call_func (mutex_lock_callback, lmutex); | 247 | flush_stack_call_func (mutex_lock_callback, lmutex); |
| 249 | return unbind_to (count, Qnil); | 248 | return unbind_to (count, Qnil); |
| 250 | } | 249 | } |