aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2016-09-02 16:56:35 -0700
committerRoland McGrath <roland@hack.frob.com>2016-09-02 16:59:45 -0700
commit537067248021228861ec88bb1feb8922e9818701 (patch)
tree0cacf623b76cb52baebf954f7c268c7a3474fadd
parent8c716c2e2f916bc18a3857129c181b96990a87d6 (diff)
downloadglibc-537067248021228861ec88bb1feb8922e9818701.zip
glibc-537067248021228861ec88bb1feb8922e9818701.tar.gz
glibc-537067248021228861ec88bb1feb8922e9818701.tar.bz2
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--ChangeLog4
-rw-r--r--sysdeps/nacl/clock.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3af5852..0127244 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 664ad65..b6fbcfd 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);
}