diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-02-06 12:21:38 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-02-06 12:21:38 -0800 |
| commit | ca0e0675a7d203cfd047fd9f3137b6713defef84 (patch) | |
| tree | b2759c5a4bb7d4c21d2d29425b9dca1fcf6586c6 | |
| parent | 8c28bbc6d989575388ac42e00ee852fc3666bb5f (diff) | |
| download | glibc-ca0e0675a7d203cfd047fd9f3137b6713defef84.tar.gz glibc-ca0e0675a7d203cfd047fd9f3137b6713defef84.tar.xz glibc-ca0e0675a7d203cfd047fd9f3137b6713defef84.zip | |
Clean up nptl/tst-join5 use of nanosleep.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/tst-join5.c | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 94a3907a27..c28f7e542e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2015-02-06 Roland McGrath <roland@hack.frob.com> + * nptl/tst-join5.c: Drop #include <sys/syscall.h>. + (wait_code): New function replaces macro. + Call nanosleep rather than syscall. + * nptl/pt-system.c: Rewritten. Put everything under [SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)]. Use IFUNC to redirect when possible. diff --git a/nptl/tst-join5.c b/nptl/tst-join5.c index e83f8958c0..b45d210629 100644 --- a/nptl/tst-join5.c +++ b/nptl/tst-join5.c @@ -22,15 +22,15 @@ #include <stdlib.h> #include <time.h> #include <unistd.h> -#include <sys/syscall.h> -#define wait_code() \ - do { \ - struct timespec ts = { .tv_sec = 0, .tv_nsec = 200000000 }; \ - while (syscall (__NR_nanosleep, &ts, &ts) < 0) \ - /* nothing */; \ - } while (0) +static void +wait_code (void) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 200000000 }; + while (nanosleep (&ts, &ts) < 0) + ; +} #ifdef WAIT_IN_CHILD |