about summary refs log tree commit diff
path: root/include/time.h
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-06-28 09:51:01 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-06-28 09:51:01 +0200
commit477910b83e5ef3b3aa78b11808433846989461c8 (patch)
tree48e855cdf2c9a0a92ca1aef958a38ed85ddcc833 /include/time.h
parenta1d6ed027b7f3ee603fba77c16508c7edc78d00a (diff)
downloadglibc-477910b83e5ef3b3aa78b11808433846989461c8.tar.gz
glibc-477910b83e5ef3b3aa78b11808433846989461c8.tar.xz
glibc-477910b83e5ef3b3aa78b11808433846989461c8.zip
Linux: Move timer_settime, __timer_settime64 from librt to libc
The symbols were moved using scripts/move-symbol-to-libc.py.

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.

The shared librt is now empty, so this commit adds a placeholder
symbol at the base version, GLIBC_2.2, and potentially at the
GLIBC_2.3.3 version as well (the leftover from the int/timer_t ABI
transition).

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'include/time.h')
-rw-r--r--include/time.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/time.h b/include/time.h
index 3f4ff44ac3..22b29ca583 100644
--- a/include/time.h
+++ b/include/time.h
@@ -236,7 +236,11 @@ extern int __timer_settime64 (timer_t timerid, int flags,
 extern int __timerfd_settime64 (int fd, int flags,
                                 const struct __itimerspec64 *value,
                                 struct __itimerspec64 *ovalue);
-librt_hidden_proto (__timer_settime64);
+# if PTHREAD_IN_LIBC
+libc_hidden_proto (__timer_settime64)
+#else
+librt_hidden_proto (__timer_settime64)
+#endif
 libc_hidden_proto (__timerfd_settime64);
 #endif