From: Roy Marples Date: Sat, 2 Aug 2008 19:59:13 +0000 (+0000) Subject: Fix compile on Darwin. X-Git-Tag: v4.0.2~92 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f150036c930d1ebf68e07a4e7f6bf347fd55211;p=thirdparty%2Fdhcpcd.git Fix compile on Darwin. --- diff --git a/common.c b/common.c index b509390f..f27bb482 100644 --- a/common.c +++ b/common.c @@ -231,15 +231,15 @@ get_monotonic(struct timeval *tp) } if (clock_monotonic) { nano = mach_absolute_time(); - if ((info.denom != 1 ¦¦ info.numer != 1) && factor != 0.0) + if ((info.denom != 1 || info.numer != 1) && factor != 0.0) nano *= factor; - tp.tv_sec = nano / NSEC_PER_SEC; + tp->tv_sec = nano / NSEC_PER_SEC; rem = nano % NSEC_PER_SEC; if (rem < 0) { - tp.tv_sec--; + tp->tv_sec--; rem += NSEC_PER_SEC; } - tp.tv_usec = rem / 1000; + tp->tv_usec = rem / 1000; return 0; } #endif