diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-05-31 07:50:12 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-05-31 07:50:12 +0000 |
| commit | 49b650430eb51350cc96adf7dd621560eb40af04 (patch) | |
| tree | a92d6034074c3d710e835d64088beb65c38216e1 /nptl/sysdeps | |
| parent | 5d4f57bd9398d5b4d0ed26af9d4bf6e65c28c73c (diff) | |
| download | glibc-49b650430eb51350cc96adf7dd621560eb40af04.zip glibc-49b650430eb51350cc96adf7dd621560eb40af04.tar.gz glibc-49b650430eb51350cc96adf7dd621560eb40af04.tar.bz2 | |
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')
| -rw-r--r-- | nptl/sysdeps/pthread/posix-timer.h | 22 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/timer_create.c | 2 |
2 files changed, 3 insertions, 21 deletions
diff --git a/nptl/sysdeps/pthread/posix-timer.h b/nptl/sysdeps/pthread/posix-timer.h index bfa8f65..5a58b5a 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 diff --git a/nptl/sysdeps/pthread/timer_create.c b/nptl/sysdeps/pthread/timer_create.c index 795f94c..4ee0966 100644 --- a/nptl/sysdeps/pthread/timer_create.c +++ b/nptl/sysdeps/pthread/timer_create.c @@ -81,7 +81,7 @@ timer_create (clock_id, evp, timerid) { newtimer->event.sigev_notify = SIGEV_SIGNAL; newtimer->event.sigev_signo = SIGALRM; - newtimer->event.sigev_value.sival_int = timer_ptr2id (newtimer); + newtimer->event.sigev_value.sival_ptr = timer_ptr2id (newtimer); newtimer->event.sigev_notify_function = 0; } |