From owner-freebsd-current@FreeBSD.ORG Sat Apr 18 17:53:15 2015 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7ADBE305; Sat, 18 Apr 2015 17:53:15 +0000 (UTC) Received: from albert.catwhisker.org (mx.catwhisker.org [198.144.209.73]) (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 E2515C8C; Sat, 18 Apr 2015 17:53:14 +0000 (UTC) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.14.9/8.14.9) with ESMTP id t3IHrBoZ062636; Sat, 18 Apr 2015 10:53:11 -0700 (PDT) (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.14.9/8.14.9/Submit) id t3IHrAHD062635; Sat, 18 Apr 2015 10:53:10 -0700 (PDT) (envelope-from david) Date: Sat, 18 Apr 2015 10:53:10 -0700 From: David Wolfskill To: Konstantin Belousov , Steven Hartland Cc: current@freebsd.org, Takanori Watanabe Subject: Re: Fix for r281680 -- broke i386 world Message-ID: <20150418175310.GI36163@albert.catwhisker.org> Mail-Followup-To: David Wolfskill , Konstantin Belousov , Steven Hartland , current@freebsd.org, Takanori Watanabe MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="2CW6+cughRlDaKZr" Content-Disposition: inline In-Reply-To: <55328E6E.2060807@multiplay.co.uk> <20150418164640.GY2390@kib.kiev.ua> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2015 17:53:15 -0000 --2CW6+cughRlDaKZr Content-Type: multipart/mixed; boundary="DMotDPdpQlD4ewOK" Content-Disposition: inline --DMotDPdpQlD4ewOK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 18, 2015 at 07:46:40PM +0300, Konstantin Belousov wrote: > ... > No, this is equally wrong. If the problem is due to uintmax_t not brought > in to the scope by other dependencies, explicit > #include > should be added at the prologue. >=20 > I am struggling for two days trying to pass my pending patches through > make tinderbox. I added the uintmax_t version into the mix right now > for the next try. OK; attached survived buildworld for both amd64 & i386, and I think it's what's intended. On Sat, Apr 18, 2015 at 06:03:42PM +0100, Steven Hartland wrote: > ...=20 > > So I took a bit of evasive action.) > > > The errors not very good, but I'm guessing your missing #include=20 > for uintmax_t where as u_int64_t is from sys/types.h iirc. > ... Quite so; thanks. Peace, david --=20 David H. Wolfskill david@catwhisker.org Those who murder in the name of God or prophet are blasphemous cowards. See http://www.catwhisker.org/~david/publickey.gpg for my public key. --DMotDPdpQlD4ewOK Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="bluetooth.diff" Content-Transfer-Encoding: quoted-printable Index: usr.sbin/bluetooth/hccontrol/le.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- usr.sbin/bluetooth/hccontrol/le.c (revision 281689) +++ usr.sbin/bluetooth/hccontrol/le.c (working copy) @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -232,8 +233,8 @@ NG_HCI_OCF_LE_READ_LOCAL_SUPPORTED_FEATURES),=20 (void *)&rp, &n); =20 - printf("LOCAL SUPPORTED: %d %d %lu\n", e, rp.status, - rp.le_features); + printf("LOCAL SUPPORTED: %d %d %ju\n", e, rp.status, + (uintmax_t)rp.le_features); =20 return 0; } @@ -250,7 +251,7 @@ NG_HCI_OCF_LE_READ_SUPPORTED_STATUS), (void *)&rp, &n); =20 - printf("LE_STATUS: %d %d %lx\n", e, rp.status, rp.le_status); + printf("LE_STATUS: %d %d %jx\n", e, rp.status, (uintmax_t)rp.le_status); =20 return 0; } --DMotDPdpQlD4ewOK-- --2CW6+cughRlDaKZr Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJVMpoGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4RThEMDY4QTIxMjc1MDZFRDIzODYzRTc4 QTY3RjlDOERFRjQxOTNCAAoJEIpn+cje9Bk7D1EP/32YE9eZ8kvw/gkusYtSrpoX 7ckagyeNNtyTr/87JUJsjhUA7vWIT8NoBHMtIppZNRtno95/+bCDsp0basLdBBE0 nGktUzVLKjBUymiI6fntaNdQqyKNsETNMZVSKyShz3qCNE1QLXJMYEYb4YhL/n5C RjOfK1g21YatwecMyPS2Bh6IoGgFpGt7NiDQGfHdxUWCx3UKEZybJj7b5NDGhjj4 3X5CsMYWqBgZnWY9Duk1cD6nRxykITb4JxpKOHN8DVVogMrHIWhtQKMSnQ2m11HL bQHn0l986BwBw8mhuKPS8kYSQPYSmRhErs8zWJ09TMJ6ezwP9hCaL8DCDZzVClpD ApezC3/DB3kDMLQ2leQXAeAK3tlHqTKg4u24BRaPKnvSAte85Cr2WFOZKyqyRpLQ wTqRMCNL2gVoXh7OE8OL5ZbHBwppNVsJzXoxwr2HMq6KU1BnYuA2lJHKDHEM4zyL 86Case1x1w2MgxXyH2tOL5lSgO+c4DMLciftRcOmcVGxojSVilgUceqmfTU1l/t2 PnR4EqelhA1G/yL3Oe1qshBJb3/vjs4GxXY+Le1cAh9gX/dUaQywsppoE54HGzkI LY9+zgjiO3BMNDkml/+MYBjB7N5hAA5q73euyloyuv2lPTnev2e7h6zImQfOV/0u tPuvmKPPIPbSxXWjGFX0 =8f13 -----END PGP SIGNATURE----- --2CW6+cughRlDaKZr--