commit | bc9d27d41f5be6351069ac82b0cc0bb557c3829f | [log] [tgz] |
---|---|---|
author | Alex Vakulenko <avakulenko@google.com> | Fri Apr 01 10:33:17 2016 -0700 |
committer | Alex Vakulenko <avakulenko@google.com> | Fri Apr 01 17:40:48 2016 +0000 |
tree | a7ca26ed27cbe1882c84acb0679800af1d642b95 | |
parent | 9fd3adb463ad97dfb41f2265e8836af32a37d2c2 [diff] |
libuweave: Fix break on Android toolchain Android toolchain defines "unix" to be 1 which breaks one function prototype in libuweave code. Changed the param name from "unix" to "unix_timestamp". Change-Id: Ic484d74aa3af1459af7cf6d15da4bc5b20226cf8 Reviewed-on: https://weave-review.googlesource.com/3120 Reviewed-by: Alex Vakulenko <avakulenko@google.com> (cherry picked from commit 2fd3e553fbbb93eefb4d09e5f516d5931bb47802) Reviewed-on: https://weave-review.googlesource.com/3121
diff --git a/third_party/libuweave/src/macaroon.h b/third_party/libuweave/src/macaroon.h index 310f988..09c0459 100644 --- a/third_party/libuweave/src/macaroon.h +++ b/third_party/libuweave/src/macaroon.h
@@ -110,8 +110,8 @@ } /** Converts a unix timestamp to a j2000 timestamp. */ -static inline time_t uw_macaroon_unix_epoch_to_j2000(time_t unix) { - return unix - J2000_EPOCH_OFFSET; +static inline time_t uw_macaroon_unix_epoch_to_j2000(time_t unix_timestamp) { + return unix_timestamp - J2000_EPOCH_OFFSET; } /**