diff options
author | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:00 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:00 +0200 |
commit | 273a2a2ae8b097672cdc8e9888548b134955af42 (patch) | |
tree | a944110b3bfa9a0578aea7c5fc1994d801aee719 /sysdeps/unix/sysv/linux/kernel-posix-timers.h | |
parent | d7d0efec47e76c022c3bcb30cdb4b0501d7a9b2a (diff) | |
download | glibc-273a2a2ae8b097672cdc8e9888548b134955af42.tar glibc-273a2a2ae8b097672cdc8e9888548b134955af42.tar.gz glibc-273a2a2ae8b097672cdc8e9888548b134955af42.tar.bz2 glibc-273a2a2ae8b097672cdc8e9888548b134955af42.zip |
Linux: Move timer_create, timer_delete from librt to libc
The symbols were moved using scripts/move-symbol-to-libc.py.
timer_create and timer_delete are tied together via the int/timer_t
compatibility code. The way the ABI intransition is implemented
is changed with this commit: the implementation is now consolidated
in one file with a TIMER_T_WAS_INT_COMPAT check.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux/kernel-posix-timers.h')
-rw-r--r-- | sysdeps/unix/sysv/linux/kernel-posix-timers.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/kernel-posix-timers.h b/sysdeps/unix/sysv/linux/kernel-posix-timers.h index 86aa8a2ded..94e6d8c1d2 100644 --- a/sysdeps/unix/sysv/linux/kernel-posix-timers.h +++ b/sysdeps/unix/sysv/linux/kernel-posix-timers.h @@ -48,6 +48,11 @@ libc_hidden_proto (__timer_active_sigev_thread) extern pthread_mutex_t __timer_active_sigev_thread_lock; libc_hidden_proto (__timer_active_sigev_thread_lock) +extern __typeof (timer_create) __timer_create; +libc_hidden_proto (__timer_create) +extern __typeof (timer_delete) __timer_delete; +libc_hidden_proto (__timer_delete) + /* Type of timers in the kernel. */ typedef int kernel_timer_t; @@ -107,3 +112,9 @@ timerid_to_kernel_timer (timer_t timerid) /* New targets use int instead of timer_t. The difference only matters on 64-bit targets. */ #include <timer_t_was_int_compat.h> + +#if TIMER_T_WAS_INT_COMPAT +# define OLD_TIMER_MAX 256 +extern timer_t __timer_compat_list[OLD_TIMER_MAX]; +libc_hidden_proto (__timer_compat_list) +#endif |