summaryrefslogtreecommitdiff
path: root/libpthread/linuxthreads/queue.h
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-14 23:00:19 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-14 23:00:19 -0600
commit6b6ede3d15f04fe825cfa9f697507457e3640344 (patch)
treeefe9bf75eaf2200f89087ed0ef2ef350549ccd6d /libpthread/linuxthreads/queue.h
parentf972c2262fd4efc2bbf9789dce145bb705acec24 (diff)
resolve merge
Diffstat (limited to 'libpthread/linuxthreads/queue.h')
-rw-r--r--libpthread/linuxthreads/queue.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/libpthread/linuxthreads/queue.h b/libpthread/linuxthreads/queue.h
index e50517f77..01d18d16e 100644
--- a/libpthread/linuxthreads/queue.h
+++ b/libpthread/linuxthreads/queue.h
@@ -21,7 +21,6 @@
static __inline__ void enqueue(pthread_descr * q, pthread_descr th)
{
int prio = th->p_priority;
- ASSERT(th->p_nextwaiting == NULL);
for (; *q != NULL; q = &((*q)->p_nextwaiting)) {
if (prio > (*q)->p_priority) {
th->p_nextwaiting = *q;