From owner-svn-src-head@FreeBSD.ORG Tue Aug 6 15:49:18 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CF2F95BE; Tue, 6 Aug 2013 15:49:18 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC6D42530; Tue, 6 Aug 2013 15:49:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r76FnIQJ054060; Tue, 6 Aug 2013 15:49:18 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r76FnImt054058; Tue, 6 Aug 2013 15:49:18 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201308061549.r76FnImt054058@svn.freebsd.org> From: Hiroki Sato Date: Tue, 6 Aug 2013 15:49:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253995 - in head/usr.sbin: rtadvd rtsold X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Aug 2013 15:49:18 -0000 Author: hrs Date: Tue Aug 6 15:49:18 2013 New Revision: 253995 URL: http://svnweb.freebsd.org/changeset/base/253995 Log: Fix build on arm and mips. Modified: head/usr.sbin/rtadvd/timer.c head/usr.sbin/rtsold/rtsold.c Modified: head/usr.sbin/rtadvd/timer.c ============================================================================== --- head/usr.sbin/rtadvd/timer.c Tue Aug 6 15:34:11 2013 (r253994) +++ head/usr.sbin/rtadvd/timer.c Tue Aug 6 15:49:18 2013 (r253995) @@ -59,11 +59,8 @@ void rtadvd_timer_init(void) { /* Generate maximum time in timespec. */ - memset(&tm_limit.tv_sec, 0xff, sizeof(tm_limit.tv_sec)); - memset(&tm_limit.tv_nsec, 0xff, sizeof(tm_limit.tv_nsec)); - tm_limit.tv_sec &= ~(1UL << (sizeof(tm_limit.tv_sec) * 8 - 1)); - tm_limit.tv_nsec &= ~(1UL << (sizeof(tm_limit.tv_nsec) * 8 - 1)); - + tm_limit.tv_sec = (-1) & ~((time_t)1 << ((sizeof(tm_max.tv_sec) * 8) - 1)); + tm_limit.tv_nsec = (-1) & ~((long)1 << ((sizeof(tm_max.tv_nsec) * 8) - 1)); tm_max = tm_limit; TAILQ_INIT(&ra_timer); } Modified: head/usr.sbin/rtsold/rtsold.c ============================================================================== --- head/usr.sbin/rtsold/rtsold.c Tue Aug 6 15:34:11 2013 (r253994) +++ head/usr.sbin/rtsold/rtsold.c Tue Aug 6 15:49:18 2013 (r253995) @@ -188,10 +188,8 @@ main(int argc, char **argv) } /* Generate maximum time in timespec. */ - memset(&tm_max.tv_sec, 0xff, sizeof(tm_max.tv_sec)); - memset(&tm_max.tv_nsec, 0xff, sizeof(tm_max.tv_nsec)); - tm_max.tv_sec &= ~(1UL << (sizeof(tm_max.tv_sec) * 8 - 1)); - tm_max.tv_nsec &= ~(1UL << (sizeof(tm_max.tv_nsec) * 8 - 1)); + tm_max.tv_sec = (-1) & ~((time_t)1 << ((sizeof(tm_max.tv_sec) * 8) - 1)); + tm_max.tv_nsec = (-1) & ~((long)1 << ((sizeof(tm_max.tv_nsec) * 8) - 1)); /* set log level */ if (dflag > 1)