Re: Fix for r281680 -- broke i386 world

On Sat, Apr 18, 2015 at 10:53:10AM -0700, David Wolfskill wrote:
> 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 <stdint.h>
> > should be added at the prologue.
> > 
> > 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:
> > ... 
> > > So I took a bit of evasive action.)
> > >
> > The errors not very good, but I'm guessing your missing #include 
> > <stdint.h> for uintmax_t where as u_int64_t is from sys/types.h iirc.
> > ...
> 
> Quite so; thanks.
> 
> Peace,
> david
> -- 
> David H. Wolfskill				david_at_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.

> Index: usr.sbin/bluetooth/hccontrol/le.c
> ===================================================================
> --- usr.sbin/bluetooth/hccontrol/le.c	(revision 281689)
> +++ usr.sbin/bluetooth/hccontrol/le.c	(working copy)
> _at__at_ -39,6 +39,7 _at__at_
>  #include <errno.h>
>  #include <netgraph/ng_message.h>
>  #include <errno.h>
> +#include <stdint.h>
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <string.h>
> _at__at_ -232,8 +233,8 _at__at_
>  			NG_HCI_OCF_LE_READ_LOCAL_SUPPORTED_FEATURES), 
>  			(void *)&rp, &n);
>  
> -	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);
>  
>  	return 0;
>  }
> _at__at_ -250,7 +251,7 _at__at_
>  					NG_HCI_OCF_LE_READ_SUPPORTED_STATUS),
>  			       		(void *)&rp, &n);
>  
> -	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);
>  
>  	return 0;
>  }


Yes, thank you.  This is exactly what I run with make universe right now.
It seems the patch was landed in r281697.