diff options
| author | Roland McGrath <roland@hack.frob.com> | 2016-09-02 16:56:35 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2016-09-02 16:59:45 -0700 |
| commit | 537067248021228861ec88bb1feb8922e9818701 (patch) | |
| tree | 0cacf623b76cb52baebf954f7c268c7a3474fadd | |
| parent | 8c716c2e2f916bc18a3857129c181b96990a87d6 (diff) | |
| download | glibc-537067248021228861ec88bb1feb8922e9818701.tar.gz glibc-537067248021228861ec88bb1feb8922e9818701.tar.xz glibc-537067248021228861ec88bb1feb8922e9818701.zip | |
NaCl: Fix compile error in clock function.
* sysdeps/nacl/clock.c (clock): nacl_abi_clock_t -> nacl_irt_clock_t (cherry picked from commit 307c2c2dfff76330a29a3ab69a0177b118142145)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/nacl/clock.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 3af5852df4..0127244609 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-09-02 Roland McGrath <roland@hack.frob.com> + + * sysdeps/nacl/clock.c (clock): nacl_abi_clock_t -> nacl_irt_clock_t + 2016-08-17 Florian Weimer <fweimer@redhat.com> Reduce time to expected nptl/tst-once5 failure. diff --git a/sysdeps/nacl/clock.c b/sysdeps/nacl/clock.c index 664ad650c3..b6fbcfd2dd 100644 --- a/sysdeps/nacl/clock.c +++ b/sysdeps/nacl/clock.c @@ -24,6 +24,6 @@ clock_t clock (void) { - nacl_abi_clock_t result; + nacl_irt_clock_t result; return NACL_CALL (__nacl_irt_basic.clock (&result), result); } |