aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--linuxthreads/ChangeLog2
-rw-r--r--linuxthreads/spinlock.c1
-rw-r--r--string/string.h1
4 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b23ac99..44b2dff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-04 Andreas Jaeger <aj@suse.de>
+
+ * string/string.h: Remove __strdup prototype, it's not needed in
+ this file anymore.
+
2000-05-28 Ulrich Drepper <drepper@redhat.com>
* posix/Makefile (tests): Add tst-fork.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 38cbe58..952815c 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,7 @@
2000-05-28 Ulrich Drepper <drepper@redhat.com>
+ * spinlock.c (__pthread_lock): Remove ASSERT.
+
* Makefile (tests): Add ex8.
* Examples/ex8.c: New file.
diff --git a/linuxthreads/spinlock.c b/linuxthreads/spinlock.c
index 50edfa3..3f5b823 100644
--- a/linuxthreads/spinlock.c
+++ b/linuxthreads/spinlock.c
@@ -52,7 +52,6 @@ void internal_function __pthread_lock(struct _pthread_fastlock * lock,
newstatus = (long) self;
}
if (self != NULL) {
- ASSERT(self->p_nextlock == NULL);
THREAD_SETMEM(self, p_nextlock, (pthread_descr) oldstatus);
/* Make sure the store in p_nextlock completes before performing
the compare-and-swap */
diff --git a/string/string.h b/string/string.h
index 8b9a357..d4d3e44 100644
--- a/string/string.h
+++ b/string/string.h
@@ -116,7 +116,6 @@ extern size_t __strxfrm_l (char *__dest, __const char *__src, size_t __n,
#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
/* Duplicate S, returning an identical malloc'd string. */
-extern char *__strdup (__const char *__s) __THROW __attribute_malloc__;
extern char *strdup (__const char *__s) __THROW __attribute_malloc__;
#endif