1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 20:30:28 +02:00

(do_unlock): Renamed from "unlock", which is defined

in unistd.h on QNX.  (Reported by Matt Kraai.)
This commit is contained in:
Neil Jerram 2006-03-10 23:04:46 +00:00
parent e610622906
commit b82115b8ba
3 changed files with 8 additions and 2 deletions

1
THANKS
View file

@ -45,6 +45,7 @@ For fixes or providing information which led to a fix:
Richard Kim Richard Kim
Bruce Korb Bruce Korb
Matthias Köppe Matthias Köppe
Matt Kraai
Jeff Long Jeff Long
Han-Wen Nienhuys Han-Wen Nienhuys
Jan Nieuwenhuizen Jan Nieuwenhuizen

View file

@ -1,3 +1,8 @@
2006-03-10 Neil Jerram <neil@ossau.uklinux.net>
* threads.c (do_unlock): Renamed from "unlock", which is defined
in unistd.h on QNX. (Reported by Matt Kraai.)
2006-03-04 Kevin Ryde <user42@zip.com.au> 2006-03-04 Kevin Ryde <user42@zip.com.au>
* deprecated.c (scm_i_defer_ints_etc): Show SCM_DEFER_INTS in message, * deprecated.c (scm_i_defer_ints_etc): Show SCM_DEFER_INTS in message,

View file

@ -1397,7 +1397,7 @@ scm_pthread_mutex_lock (scm_i_pthread_mutex_t *mutex)
} }
static void static void
unlock (void *data) do_unlock (void *data)
{ {
scm_i_pthread_mutex_unlock ((scm_i_pthread_mutex_t *)data); scm_i_pthread_mutex_unlock ((scm_i_pthread_mutex_t *)data);
} }
@ -1406,7 +1406,7 @@ void
scm_dynwind_pthread_mutex_lock (scm_i_pthread_mutex_t *mutex) scm_dynwind_pthread_mutex_lock (scm_i_pthread_mutex_t *mutex)
{ {
scm_i_scm_pthread_mutex_lock (mutex); scm_i_scm_pthread_mutex_lock (mutex);
scm_dynwind_unwind_handler (unlock, mutex, SCM_F_WIND_EXPLICITLY); scm_dynwind_unwind_handler (do_unlock, mutex, SCM_F_WIND_EXPLICITLY);
} }
int int