summary refs log tree commit diff
path: root/include
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
commita1d6ed027b7f3ee603fba77c16508c7edc78d00a (patch)
tree82263a780b938b5173d5b47d2acfd3f1a97f5be6 /include
parentdf6d227e69082c5cab33b60aa676aebf08b7585e (diff)
downloadglibc-a1d6ed027b7f3ee603fba77c16508c7edc78d00a.tar.gz
glibc-a1d6ed027b7f3ee603fba77c16508c7edc78d00a.tar.xz
glibc-a1d6ed027b7f3ee603fba77c16508c7edc78d00a.zip
Linux: Move timer_gettime, __timer_gettime64 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.

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