summaryrefslogtreecommitdiff
path: root/nptl/sysdeps/pthread/posix-timer.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-05-31 07:50:12 +0000
committerUlrich Drepper <drepper@redhat.com>2003-05-31 07:50:12 +0000
commit49b650430eb51350cc96adf7dd621560eb40af04 (patch)
treea92d6034074c3d710e835d64088beb65c38216e1 /nptl/sysdeps/pthread/posix-timer.h
parent5d4f57bd9398d5b4d0ed26af9d4bf6e65c28c73c (diff)
downloadglibc-49b650430eb51350cc96adf7dd621560eb40af04.tar.gz
Update.
2003-05-31 Ulrich Drepper <drepper@redhat.com> * libio/fileops.c (_IO_file_open): Don't mark as inline. * sysdeps/ia64/elf/initfini.c ((gmon_initializer): Mark with attribute used.
Diffstat (limited to 'nptl/sysdeps/pthread/posix-timer.h')
-rw-r--r--nptl/sysdeps/pthread/posix-timer.h22
1 files changed, 2 insertions, 20 deletions
diff --git a/nptl/sysdeps/pthread/posix-timer.h b/nptl/sysdeps/pthread/posix-timer.h
index bfa8f65c40..5a58b5a814 100644
--- a/nptl/sysdeps/pthread/posix-timer.h
+++ b/nptl/sysdeps/pthread/posix-timer.h
@@ -101,26 +101,8 @@ extern struct thread_node __timer_signal_thread_tclk;
/* Return pointer to timer structure corresponding to ID. */
-#if 0
-static inline struct timer_node *
-timer_id2ptr (timer_t timerid)
-{
- if (timerid >= 0 && timerid < TIMER_MAX)
- return &__timer_array[timerid];
-
- return NULL;
-}
-
-/* Return ID of TIMER. */
-static inline int
-timer_ptr2id (struct timer_node *timer)
-{
- return timer - __timer_array;
-}
-#else
-# define timer_id2ptr(timerid) ((struct timer_node *) timerid)
-# define timer_ptr2id(timerid) ((void *) timerid)
-#endif
+#define timer_id2ptr(timerid) ((struct timer_node *) timerid)
+#define timer_ptr2id(timerid) ((void *) timerid)
/* Check whether timer is valid; global mutex must be held. */
static inline int