From owner-svn-src-all@freebsd.org Mon Nov 14 00:33:04 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3695C3F97E; Mon, 14 Nov 2016 00:33:04 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0540119C; Mon, 14 Nov 2016 00:33:04 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAE0X4Zj084500; Mon, 14 Nov 2016 00:33:04 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAE0X31u084497; Mon, 14 Nov 2016 00:33:03 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201611140033.uAE0X31u084497@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 14 Nov 2016 00:33:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r308619 - in head/contrib/amd: amd amq include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Nov 2016 00:33:05 -0000 Author: cy Date: Mon Nov 14 00:33:03 2016 New Revision: 308619 URL: https://svnweb.freebsd.org/changeset/base/308619 Log: Fix mips 32-bit buildworld. Reported by: adrian MFC after: 6 weeks X-MFC with: r308493 Modified: head/contrib/amd/amd/readdir.c head/contrib/amd/amq/amq.c head/contrib/amd/include/amq_defs.h Modified: head/contrib/amd/amd/readdir.c ============================================================================== --- head/contrib/amd/amd/readdir.c Sun Nov 13 21:49:51 2016 (r308618) +++ head/contrib/amd/amd/readdir.c Mon Nov 14 00:33:03 2016 (r308619) @@ -38,6 +38,7 @@ */ +#include #ifdef HAVE_CONFIG_H # include #endif /* HAVE_CONFIG_H */ @@ -201,7 +202,7 @@ make_entry_chain(am_node *mp, const nfse static int amfs_readdir_browsable(am_node *mp, nfscookie cookie, nfsdirlist *dp, nfsentry *ep, u_int count, int fully_browsable) { - u_int gen = *(u_int *) cookie; + u_int gen = *(u_int *) (uintptr_t) cookie; int chain_length, i; static nfsentry *te, *te_next; static int j; @@ -364,7 +365,7 @@ amfs_readdir_browsable(am_node *mp, nfsc static int amfs_readdir(am_node *mp, nfscookie cookie, nfsdirlist *dp, nfsentry *ep, u_int count) { - u_int gen = *(u_int *) cookie; + u_int gen = *(u_int *) (uintptr_t) cookie; am_node *xp; dp->dl_eof = FALSE; /* assume readdir not done */ @@ -639,7 +640,7 @@ amfs_readdir3_browsable(am_node *mp, am_ am_dirlist3 *dp, am_entry3 *ep, u_int count, int fully_browsable) { - uint64 gen = *(uint64 *) cookie; + uint64 gen = *(uint64 *) (uintptr_t) cookie; int chain_length, i; static am_entry3 *te, *te_next; static int j; @@ -796,7 +797,7 @@ static int amfs_readdir3(am_node *mp, am_cookie3 cookie, am_dirlist3 *dp, am_entry3 *ep, u_int count) { - uint64 gen = *(uint64 *) cookie; + uint64 gen = *(uint64 *) (uintptr_t) cookie; am_node *xp; if (amuDebug(D_READDIR)) @@ -944,8 +945,8 @@ amfs_generic_readdir(am_node *mp, voidp return amfs_readdir(mp, cookie, dp, ep, count); } else { if (browsable) - return amfs_readdir3_browsable(mp, (am_cookie3) cookie, dp, ep, count, full); + return amfs_readdir3_browsable(mp, (am_cookie3) (uintptr_t) cookie, dp, ep, count, full); else - return amfs_readdir3(mp, (am_cookie3) cookie, dp, ep, count); + return amfs_readdir3(mp, (am_cookie3) (uintptr_t) cookie, dp, ep, count); } } Modified: head/contrib/amd/amq/amq.c ============================================================================== --- head/contrib/amd/amq/amq.c Sun Nov 13 21:49:51 2016 (r308618) +++ head/contrib/amd/amq/amq.c Mon Nov 14 00:33:03 2016 (r308619) @@ -79,7 +79,7 @@ enum show_opt { static void time_print(time_type tt) { - time_t t = (time_t)tt; + time_t t = (time_t)*tt; struct tm *tp = localtime(&t); printf("%02d/%02d/%04d %02d:%02d:%02d", tp->tm_mon + 1, tp->tm_mday, Modified: head/contrib/amd/include/amq_defs.h ============================================================================== --- head/contrib/amd/include/amq_defs.h Sun Nov 13 21:49:51 2016 (r308618) +++ head/contrib/amd/include/amq_defs.h Mon Nov 14 00:33:03 2016 (r308619) @@ -66,7 +66,7 @@ /* * TYPEDEFS */ -typedef long *time_type; +typedef time_t *time_type; typedef struct amq_mount_info amq_mount_info; typedef struct amq_map_info amq_map_info; typedef struct amq_mount_stats amq_mount_stats;