openssh unix dev - Mar 2015 - openssh-SNAP-20150304 issues

Damien Miller wrote:
>
> On Tue, 3 Mar 2015, The Doctor wrote:
>
>> regress/unittests/test_helper/test_helper.c: In function
`test_data_file':
>> regress/unittests/test_helper/test_helper.c:177: warning: implicit
declaration of function `strlcpy'
>> regress/unittests/test_helper/test_helper.c: At top level:
>> regress/unittests/test_helper/test_helper.c:196: parse error before
"__unused"
>> *** Error code 1
> Could you try this?
>
> diff --git a/defines.h b/defines.h
> index fa0ccba..cf65901 100644
> --- a/defines.h
> +++ b/defines.h
> @@ -850,4 +850,8 @@ struct winsize {
>   # endif /* gcc version */
>   #endif /* __predict_true */
>   
> +#ifndef __unused
> +# define __unused
> +#endif
> +
>   #endif /* _DEFINES_H */
After above patch linux build fail:
.................
make[1]: Entering directory `..../openbsd-compat'
gcc -O2 ..../arc4random.c
In file included from ..../arc4random.c:28:
/usr/include/netdb.h:589:15: error: expected identifier or ?(? 
before ?[? token
    int __unused[5];
..............

Regards,
Roumen

-- 
Get SSH with X.509 certificate support
http://roumenpetrov.info/openssh/

On Tue, 3 Mar 2015, Roumen Petrov wrote:
> After above patch linux build fail:
> .................
> make[1]: Entering directory `..../openbsd-compat'
> gcc -O2 ..../arc4random.c
> In file included from ..../arc4random.c:28:
> /usr/include/netdb.h:589:15: error: expected identifier or ?(? before ?[?
> token
>    int __unused[5];
bah, reverted

On Wed, 4 Mar 2015, Damien Miller wrote:
> > gcc -O2 ..../arc4random.c
> > In file included from ..../arc4random.c:28:
> > /usr/include/netdb.h:589:15: error: expected identifier or ?(? before
?[?
> > token
> >    int __unused[5];
> 
> bah, reverted
I committed a less intrusive fix:


commit 3f7f5e6c5d2aa3f6710289c1a30119e534e56c5c
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Mar 3 20:42:49 2015 +0000

    upstream commit
    
    expand __unused to full __attribute__ for better portability

diff --git a/regress/unittests/test_helper/fuzz.c
b/regress/unittests/test_helper/fuzz.c
index 06fb247..99f1d03 100644
--- a/regress/unittests/test_helper/fuzz.c
+++ b/regress/unittests/test_helper/fuzz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fuzz.c,v 1.7 2015/01/18 19:52:44 djm Exp $	*/
+/*	$OpenBSD: fuzz.c,v 1.8 2015/03/03 20:42:49 djm Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller <djm at mindrot.org>
  *
@@ -200,7 +200,7 @@ fuzz_dump(struct fuzz *fuzz)
 static struct fuzz *last_fuzz;
 
 static void
-siginfo(int unused __unused)
+siginfo(int unused __attribute__((__unused__)))
 {
 	char buf[256];
 
diff --git a/regress/unittests/test_helper/test_helper.c
b/regress/unittests/test_helper/test_helper.c
index 034af93..26ca26b 100644
--- a/regress/unittests/test_helper/test_helper.c
+++ b/regress/unittests/test_helper/test_helper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test_helper.c,v 1.5 2015/02/16 22:20:50 djm Exp $	*/
+/*	$OpenBSD: test_helper.c,v 1.6 2015/03/03 20:42:49 djm Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller <djm at mindrot.org>
  *
@@ -193,7 +193,7 @@ test_info(char *s, size_t len)
 
 #ifdef SIGINFO
 static void
-siginfo(int unused __unused)
+siginfo(int unused __attribute__((__unused__)))
 {
 	char buf[256];