diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/include/posix-threads.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6ce5ae0..f43d80e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 1999-09-21 Tom Tromey <tromey@cygnus.com> + * include/posix-threads.h (_Jv_MutexDestroy): Use + _Jv_PthreadGetMutex. + (_Jv_MutexLock): Likewise. + (_Jv_MutexUnlock): Likewise. + * java/io/OutputStreamWriter.java (OutputStreamWriter): Reverted previous patch; it too was incorrect. * java/io/PrintStream.java (PrintStream): Likewise. diff --git a/libjava/include/posix-threads.h b/libjava/include/posix-threads.h index 38629f4..5c6cc7b 100644 --- a/libjava/include/posix-threads.h +++ b/libjava/include/posix-threads.h @@ -194,7 +194,7 @@ void _Jv_MutexInit (_Jv_Mutex_t *mu); inline void _Jv_MutexDestroy (_Jv_Mutex_t *mu) { - pthread_mutex_destroy (mu); + pthread_mutex_destroy (_Jv_PthreadGetMutex (mu)); } #else /* HAVE_RECURSIVE_MUTEX */ @@ -209,7 +209,7 @@ extern void _Jv_MutexDestroy (_Jv_Mutex_t *mu); inline int _Jv_MutexLock (_Jv_Mutex_t *mu) { - int r = pthread_mutex_lock (mu); + int r = pthread_mutex_lock (_Jv_PthreadGetMutex (mu)); #ifdef PTHREAD_MUTEX_IS_STRUCT if (! r) ++mu->count; @@ -220,7 +220,7 @@ _Jv_MutexLock (_Jv_Mutex_t *mu) inline int _Jv_MutexUnlock (_Jv_Mutex_t *mu) { - int r = pthread_mutex_unlock (mu); + int r = pthread_mutex_unlock (_Jv_PthreadGetMutex (mu)); #ifdef PTHREAD_MUTEX_IS_STRUCT if (! r) --mu->count; |