Re: openssh-SNAP-20150304 issues

[Damien Miller <djm@xxxxxxxxxxx>]

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@xxxxxxxxxxx <djm@xxxxxxxxxxx>
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@xxxxxxxxxxx>
  *
@@ -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@xxxxxxxxxxx>
  *
@@ -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];
 
_______________________________________________
openssh-unix-dev mailing list
openssh-unix-dev@xxxxxxxxxxx
https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev