Author: kevans Date: Sun Mar 29 02:26:58 2020 New Revision: 359413 URL: https://svnweb.freebsd.org/changeset/base/359413
Log: ipfilter: remove duplicate definition of 'thishost' thishost is already defined in lib/initparse.c; no need for this one. This fixes the ipfilter build with -fno-common. -fno-common will become the default in GCC10/LLVM11. MFC after: 3 days Modified: head/contrib/ipfilter/ipf.h head/contrib/ipfilter/tools/ipnat.c Modified: head/contrib/ipfilter/ipf.h ============================================================================== --- head/contrib/ipfilter/ipf.h Sat Mar 28 22:44:08 2020 (r359412) +++ head/contrib/ipfilter/ipf.h Sun Mar 29 02:26:58 2020 (r359413) @@ -191,7 +191,7 @@ typedef int (* addfunc_t) __P((int, ioctlfunc_t, void typedef int (* copyfunc_t) __P((void *, void *, size_t)); -extern char thishost[]; +extern char thishost[MAXHOSTNAMELEN]; extern char flagset[]; extern u_char flags[]; extern struct ipopt_names ionames[]; Modified: head/contrib/ipfilter/tools/ipnat.c ============================================================================== --- head/contrib/ipfilter/tools/ipnat.c Sat Mar 28 22:44:08 2020 (r359412) +++ head/contrib/ipfilter/tools/ipnat.c Sun Mar 29 02:26:58 2020 (r359413) @@ -60,7 +60,6 @@ static const char rcsid[] = "@(#)$Id$"; #define bzero(a,b) memset(a,0,b) #endif int use_inet6 = 0; -char thishost[MAXHOSTNAMELEN]; extern char *optarg; _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
