diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-04-01 17:43:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-01 17:43:45 +0000 |
| commit | 7e7ff38a79fe1dea63a26157f5b0a144c52eb831 (patch) | |
| tree | eb06b0bbc6002a5d94544541a939c3ae57646ad8 | |
| parent | 410705bbd5a68a035dfd0c559440797b834b1790 (diff) | |
| parent | bc9d27d41f5be6351069ac82b0cc0bb557c3829f (diff) | |
| download | libweave-7e7ff38a79fe1dea63a26157f5b0a144c52eb831.tar.gz | |
libuweave: Fix break on Android toolchain
am: bc9d27d
* commit 'bc9d27d41f5be6351069ac82b0cc0bb557c3829f':
libuweave: Fix break on Android toolchain
Change-Id: I332e7e677cdb9d7d0a81720fb00a93226ee707a2
| -rw-r--r-- | third_party/libuweave/src/macaroon.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ static inline time_t uw_macaroon_j2000_to_unix_epoch(time_t j2000) { } /** 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; } /** |