From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 9 Jun 2000 04:33:00 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc_2-1-91~268
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=f2a5974b324203d7db39d9261dd802a35fec55ef;p=glibc.git

Update.

	* sysdeps/pthread/posix-timer.h (timer_ptr2id): Operands in
	subtraction were switched.
---

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 168d1f2583..d8bc2cfd90 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/pthread/posix-timer.h (timer_ptr2id): Operands in
+	subtraction were switched.
+
 	* sysdeps/pthread/timer_routines.c (init_module): Use
 	THREAD_MAXNODES threads.
 
diff --git a/linuxthreads/sysdeps/pthread/posix-timer.h b/linuxthreads/sysdeps/pthread/posix-timer.h
index b10ae736d6..fc56ba61aa 100644
--- a/linuxthreads/sysdeps/pthread/posix-timer.h
+++ b/linuxthreads/sysdeps/pthread/posix-timer.h
@@ -50,7 +50,6 @@ struct thread_node
 /* Internal representation of a timer.  */
 struct timer_node
 {
-  pid_t creator_pid;
   struct list_links links;
   struct sigevent event;
   clockid_t clock;
@@ -61,6 +60,7 @@ struct timer_node
   unsigned int armed;
   unsigned int inuse;
   struct thread_node *thread;
+  pid_t creator_pid;
 };
 
 
@@ -94,7 +94,7 @@ timer_id2ptr (timer_t timerid)
 static inline int
 timer_ptr2id (struct timer_node *timer)
 {
-  return __timer_array - timer;
+  return timer - __timer_array;
 }