On 24.02.2019 23:55, Robert Swindells wrote: > > Kamil Rytarowski <kamil%netbsd.org@localhost> wrote: >> Module Name: src >> Committed By: kamil >> Date: Sun Feb 24 17:01:52 UTC 2019 >> >> Modified Files: >> src/sys/netinet: sctp_asconf.h >> >> Log Message: >> Appease GCC7 in sctp_asconf.h >> >> Do not declare types inside function parameter list. >> Add decklarations of types before these function prototypes. > > My local fix for this was to remove sctp_asconf.h from compat_stub.c and > just add prototypes for the two functions needed. This reduces the diffs > to the previous rtsock.c. > > I don't think sctp_asconf.h is supposed to be used outside of network > sources. > If you think that this is better and it works, please go for it. > Index: compat_stub.c > =================================================================== > RCS file: /cvsroot/src/sys/kern/compat_stub.c,v > retrieving revision 1.8 > diff -u -r1.8 compat_stub.c > --- compat_stub.c 5 Feb 2019 23:28:02 -0000 1.8 > +++ compat_stub.c 24 Feb 2019 22:51:12 -0000 > @@ -44,10 +44,6 @@ > #include <sys/timex.h> > #endif > > -#ifdef SCTP > -#include <netinet/sctp_asconf.h> > -#endif > - > /* > * Routine vectors for compat_50___sys_ntp_gettime > * > @@ -71,6 +67,9 @@ > */ > > #ifdef SCTP > +extern void sctp_add_ip_address(struct ifaddr *); > +extern void sctp_delete_ip_address(struct ifaddr *); > + > void (*vec_sctp_add_ip_address)(struct ifaddr *) = sctp_add_ip_address; > void (*vec_sctp_delete_ip_address)(struct ifaddr *) = sctp_delete_ip_address; > #else >
Attachment:
signature.asc
Description: OpenPGP digital signature