From a04b282ef264c58aadff623ff648a67aeeb9d876 Mon Sep 17 00:00:00 2001 From: Yann Sionneau Date: Mon, 12 Jun 2023 09:47:40 +0200 Subject: Revert "librt: avoid compilation error" This reverts commit 08d46f1ce21e4ec51b2b1626beeaea6cbe7fdc6b. Signed-off-by: Yann Sionneau --- librt/clock_nanosleep.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/librt/clock_nanosleep.c b/librt/clock_nanosleep.c index 1515cf5b0..4cf1e06b4 100644 --- a/librt/clock_nanosleep.c +++ b/librt/clock_nanosleep.c @@ -36,9 +36,9 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, if (clock_id == CLOCK_PROCESS_CPUTIME_ID) clock_id = MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED); -#if defined(SINGLE_THREAD_P) + if (SINGLE_THREAD_P) r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, rem); -#else + else { int oldstate = LIBC_CANCEL_ASYNC (); @@ -47,7 +47,6 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, LIBC_CANCEL_RESET (oldstate); } -#endif return (INTERNAL_SYSCALL_ERROR_P (r, err) ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); -- cgit v1.2.3