svn commit: r269231 - head/usr.bin/m4/lib

[Bjoern A. Zeeb]

On 29 Jul 2014, at 09:46 , Baptiste Daroussin <bapt at FreeBSD.org> wrote:

> Author: bapt
> Date: Tue Jul 29 09:46:08 2014
> New Revision: 269231
> URL: http://svnweb.freebsd.org/changeset/base/269231
> 
> Log:
>  Fix build with gcc
> 

I fear that was not enough; this is on arm:

===> usr.bin/m4 (all)                                                                                                                                                                                                                        
===> usr.bin/m4/tests (all)                                                                                                                                                                                                                  
cc1: warnings being treated as errors
/scratch/tmp/bz/head.svn/usr.bin/m4/misc.c: In function 'm4errx':
/scratch/tmp/bz/head.svn/usr.bin/m4/misc.c:268: warning: declaration of 'eval' shadows a global declaration
/scratch/tmp/bz/head.svn/usr.bin/m4/extern.h:40: warning: shadowed declaration is here
--- misc.o ---
*** [misc.o] Error code 1                                                                                                                                                                                                                    

bmake: stopped in /scratch/tmp/bz/head.svn/usr.bin/m4
cc1: warnings being treated as errors
/scratch/tmp/bz/head.svn/usr.bin/m4/lib/ohash.c: In function 'ohash_remove':
/scratch/tmp/bz/head.svn/usr.bin/m4/lib/ohash.c:123: warning: cast discards qualifiers from pointer target type
/scratch/tmp/bz/head.svn/usr.bin/m4/lib/ohash.c: In function 'ohash_find':
/scratch/tmp/bz/head.svn/usr.bin/m4/lib/ohash.c:144: warning: cast discards qualifiers from pointer target type
/scratch/tmp/bz/head.svn/usr.bin/m4/lib/ohash.c: In function 'ohash_next':
/scratch/tmp/bz/head.svn/usr.bin/m4/lib/ohash.c:183: warning: cast discards qualifiers from pointer target type
--- ohash.o ---
*** [ohash.o] Error code 1                                                                                                                                                                                                                    

bmake: stopped in /scratch/tmp/bz/head.svn/usr.bin/m4
--- all_subdir_m4 ---                                                                                                                                                                                                                        
*** [all_subdir_m4] Error code 1

bmake: stopped in /scratch/tmp/bz/head.svn/usr.bin





> Modified:
>  head/usr.bin/m4/lib/ohash.h
> 
> Modified: head/usr.bin/m4/lib/ohash.h
> ==============================================================================
> --- head/usr.bin/m4/lib/ohash.h	Tue Jul 29 09:36:48 2014	(r269230)
> +++ head/usr.bin/m4/lib/ohash.h	Tue Jul 29 09:46:08 2014	(r269231)
> @@ -58,8 +58,7 @@ void ohash_delete(struct ohash *);
> unsigned int ohash_lookup_interval(struct ohash *, const char *,
> 	    const char *, uint32_t);
> unsigned int ohash_lookup_memory(struct ohash *, const char *,
> -	    size_t, uint32_t)
> -		__attribute__ ((__bounded__(__string__,2,3)));
> +	    size_t, uint32_t);
> void *ohash_find(struct ohash *, unsigned int);
> void *ohash_remove(struct ohash *, unsigned int);
> void *ohash_insert(struct ohash *, unsigned int, void *);
> 

— 
Bjoern A. Zeeb             "Come on. Learn, goddamn it.", WarGames, 1983