am 898fd6a1: am 777a4ee6: Merge "Fix 32-bit build."

* commit '898fd6a1f0d8a540a3b8950f18e0858042279001':
  Fix 32-bit build.
This commit is contained in:
Elliott Hughes 2013-10-08 18:46:10 -07:00 committed by Android Git Automerger
commit 7c98d1304d

View File

@ -335,7 +335,9 @@ differ_by_repeat(const time_t t1, const time_t t0)
{
if (TYPE_BIT(time_t) - TYPE_SIGNED(time_t) < SECSPERREPEAT_BITS)
return 0;
#if __LP64__ // 32-bit Android only has a signed 32-bit time_t; 64-bit Android is fixed.
return t1 - t0 == SECSPERREPEAT;
#endif
}
static int