diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index cc915c1d6..08907250f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2005-09-05 Corinna Vinschen + + * thread.h (pthread_mutex::get_pthread_self): Remove. + (pthread_mutex::lock): Use ::pthread_self as self parameter. + (pthread_mutex::trylock): Ditto. + (pthread_mutex::unlock): Ditto. + (pthread_mutex::destroy): Ditto. + 2005-09-02 Dave Korn * Makefile.in (CXXFLAGS): Use 'override' to correctly set flags to diff --git a/winsup/cygwin/thread.h b/winsup/cygwin/thread.h index c15ded478..f8ab9da8b 100644 --- a/winsup/cygwin/thread.h +++ b/winsup/cygwin/thread.h @@ -301,27 +301,21 @@ public: int type; int pshared; - pthread_t get_pthread_self () const - { - return PTHREAD_MUTEX_NORMAL == type ? MUTEX_OWNER_ANONYMOUS : - ::pthread_self (); - } - int lock () { - return _lock (get_pthread_self ()); + return _lock (::pthread_self ()); } int trylock () { - return _trylock (get_pthread_self ()); + return _trylock (::pthread_self ()); } int unlock () { - return _unlock (get_pthread_self ()); + return _unlock (::pthread_self ()); } int destroy () { - return _destroy (get_pthread_self ()); + return _destroy (::pthread_self ()); } void set_owner (pthread_t self)