posix-threads.h (_Jv_MutexDestroy): Use _Jv_PthreadGetMutex.
* include/posix-threads.h (_Jv_MutexDestroy): Use _Jv_PthreadGetMutex. (_Jv_MutexLock): Likewise. (_Jv_MutexUnlock): Likewise. From-SVN: r29569
This commit is contained in:
parent
1eb1464424
commit
5057b5e8d1
2 changed files with 8 additions and 3 deletions
|
@ -1,5 +1,10 @@
|
||||||
1999-09-21 Tom Tromey <tromey@cygnus.com>
|
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
|
* java/io/OutputStreamWriter.java (OutputStreamWriter): Reverted
|
||||||
previous patch; it too was incorrect.
|
previous patch; it too was incorrect.
|
||||||
* java/io/PrintStream.java (PrintStream): Likewise.
|
* java/io/PrintStream.java (PrintStream): Likewise.
|
||||||
|
|
|
@ -194,7 +194,7 @@ void _Jv_MutexInit (_Jv_Mutex_t *mu);
|
||||||
inline void
|
inline void
|
||||||
_Jv_MutexDestroy (_Jv_Mutex_t *mu)
|
_Jv_MutexDestroy (_Jv_Mutex_t *mu)
|
||||||
{
|
{
|
||||||
pthread_mutex_destroy (mu);
|
pthread_mutex_destroy (_Jv_PthreadGetMutex (mu));
|
||||||
}
|
}
|
||||||
|
|
||||||
#else /* HAVE_RECURSIVE_MUTEX */
|
#else /* HAVE_RECURSIVE_MUTEX */
|
||||||
|
@ -209,7 +209,7 @@ extern void _Jv_MutexDestroy (_Jv_Mutex_t *mu);
|
||||||
inline int
|
inline int
|
||||||
_Jv_MutexLock (_Jv_Mutex_t *mu)
|
_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
|
#ifdef PTHREAD_MUTEX_IS_STRUCT
|
||||||
if (! r)
|
if (! r)
|
||||||
++mu->count;
|
++mu->count;
|
||||||
|
@ -220,7 +220,7 @@ _Jv_MutexLock (_Jv_Mutex_t *mu)
|
||||||
inline int
|
inline int
|
||||||
_Jv_MutexUnlock (_Jv_Mutex_t *mu)
|
_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
|
#ifdef PTHREAD_MUTEX_IS_STRUCT
|
||||||
if (! r)
|
if (! r)
|
||||||
--mu->count;
|
--mu->count;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue