summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Le Moal <damien.lemoal@wdc.com>2020-09-09 07:18:04 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2020-09-13 13:32:46 (GMT)
commit08d46f1ce21e4ec51b2b1626beeaea6cbe7fdc6b (patch)
tree0e5ab2497d9c7ffd2d77fd29ffb807edc3d1f677
parentb1ed80b54e19345f8846d250098128aea49c1b67 (diff)
librt: avoid compilation error
For NOMMU builds, LIBC_CANCEL_ASYNC and LIBC_CANCEL_RESET are not defined. Prevent these macros from being visible by the compiler in clock_nanosleep() by replacing "if (SINGLE_THREAD_P) {" with the pre-compiler directive "#if defined(SINGLE_THREAD_P)". Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
-rw-r--r--librt/clock_nanosleep.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/librt/clock_nanosleep.c b/librt/clock_nanosleep.c
index 4cf1e06..1515cf5 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 (SINGLE_THREAD_P)
+#if defined(SINGLE_THREAD_P)
r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, rem);
- else
+#else
{
int oldstate = LIBC_CANCEL_ASYNC ();
@@ -47,6 +47,7 @@ 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);