summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-07-09 13:42:26 +0000
committerUlrich Drepper <drepper@redhat.com>1998-07-09 13:42:26 +0000
commit6077fe6e4d860f5fc53c49a4266d50437f3a2817 (patch)
tree6d32d596c22d409fe3615d7d5980a56315317d69 /linuxthreads
parent4bae55673314ecad6127cc156b1e5e5bb3c88b57 (diff)
downloadglibc-6077fe6e4d860f5fc53c49a4266d50437f3a2817.tar.gz
glibc-6077fe6e4d860f5fc53c49a4266d50437f3a2817.tar.xz
glibc-6077fe6e4d860f5fc53c49a4266d50437f3a2817.zip
Update.
1998-07-09 13:39  Ulrich Drepper  <drepper@cygnus.com>

	* Versions: Add __pthread_mutexattr_gettype and
	__pthread_mutexattr_settype.
	* lockfile.c: Use __pthread_mutexattr_settype instead of
	__pthread_mutexattr_setkind_np.
	* mutex.c: Define __pthread_mutexattr_gettype and
	__pthread_mutexattr_settype.
	* weak.c: Likewise.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog10
-rw-r--r--linuxthreads/Versions1
-rw-r--r--linuxthreads/lockfile.c4
-rw-r--r--linuxthreads/mutex.c6
-rw-r--r--linuxthreads/weaks.c4
5 files changed, 19 insertions, 6 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index e5fff7590d..4c4cfdf84c 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,13 @@
+1998-07-09 13:39  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Versions: Add __pthread_mutexattr_gettype and
+	__pthread_mutexattr_settype.
+	* lockfile.c: Use __pthread_mutexattr_settype instead of
+	__pthread_mutexattr_setkind_np.
+	* mutex.c: Define __pthread_mutexattr_gettype and
+	__pthread_mutexattr_settype.
+	* weak.c: Likewise.
+
 1998-07-08 22:26  Ulrich Drepper  <drepper@cygnus.com>
 
 	* Versions: Add pthread_mutexattr_gettype, pthread_mutexattr_settype.
diff --git a/linuxthreads/Versions b/linuxthreads/Versions
index abb237962a..cc45a6ceb0 100644
--- a/linuxthreads/Versions
+++ b/linuxthreads/Versions
@@ -92,6 +92,7 @@ libpthread {
 
     pthread_getconcurrency; pthread_setconcurrency;
 
+    __pthread_mutexattr_gettype; __pthread_mutexattr_settype;
     pthread_mutexattr_gettype; pthread_mutexattr_settype;
   }
 }
diff --git a/linuxthreads/lockfile.c b/linuxthreads/lockfile.c
index b0cb2ca006..0c9cf27591 100644
--- a/linuxthreads/lockfile.c
+++ b/linuxthreads/lockfile.c
@@ -1,5 +1,5 @@
 /* lockfile - Handle locking and unlocking of stream.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -77,7 +77,7 @@ __fresetlockfiles (void)
   pthread_mutexattr_t attr;
 
   __pthread_mutexattr_init (&attr);
-  __pthread_mutexattr_setkind_np (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+  __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
 
   for (fp = _IO_list_all; fp != NULL; fp = fp->_chain)
     __pthread_mutex_init (fp->_lock, &attr);
diff --git a/linuxthreads/mutex.c b/linuxthreads/mutex.c
index 44a17d5b5a..a337bad758 100644
--- a/linuxthreads/mutex.c
+++ b/linuxthreads/mutex.c
@@ -154,7 +154,8 @@ int __pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind)
   return 0;
 }
 weak_alias (__pthread_mutexattr_setkind_np, pthread_mutexattr_setkind_np)
-weak_alias (__pthread_mutexattr_setkind_np, pthread_mutexattr_settype)
+strong_alias (__pthread_mutexattr_setkind_np, __pthread_mutexattr_settype)
+weak_alias (__pthread_mutexattr_settype, pthread_mutexattr_settype)
 
 int __pthread_mutexattr_getkind_np(const pthread_mutexattr_t *attr, int *kind)
 {
@@ -162,7 +163,8 @@ int __pthread_mutexattr_getkind_np(const pthread_mutexattr_t *attr, int *kind)
   return 0;
 }
 weak_alias (__pthread_mutexattr_getkind_np, pthread_mutexattr_getkind_np)
-weak_alias (__pthread_mutexattr_getkind_np, pthread_mutexattr_gettype)
+strong_alias (__pthread_mutexattr_getkind_np, __pthread_mutexattr_gettype)
+weak_alias (__pthread_mutexattr_gettype, pthread_mutexattr_gettype)
 
 /* Once-only execution */
 
diff --git a/linuxthreads/weaks.c b/linuxthreads/weaks.c
index ac8e1167d3..fc0873bdd9 100644
--- a/linuxthreads/weaks.c
+++ b/linuxthreads/weaks.c
@@ -50,8 +50,8 @@ weak_alias (__pthread_return_0, pthread_mutex_init)
 weak_alias (__pthread_return_0, pthread_mutex_destroy)
 weak_alias (__pthread_return_0, pthread_mutex_lock)
 weak_alias (__pthread_return_0, pthread_mutex_unlock)
-weak_alias (__pthread_return_0, pthread_mutexattr_setkind_np)
-weak_alias (__pthread_return_0, pthread_mutexattr_getkind_np)
+weak_alias (__pthread_return_0, __pthread_mutexattr_settype)
+weak_alias (__pthread_return_0, __pthread_mutexattr_gettype)
 weak_alias (__pthread_return_0, pthread_condattr_init)
 weak_alias (__pthread_return_0, pthread_condattr_destroy)
 weak_alias (__pthread_return_0, pthread_setschedparam)