Fix the bcea redefinition issue in a different way: instead

of removing the duplicate variables, make sure that any duplicate
variable that has an initial value in libsa also has an initial
value here; this keeps the linker from pulling in the libsa
definition.
This commit is contained in:
gson 2002-02-02 18:53:12 +00:00
parent f32b3f4f89
commit fe2fc5699c

View File

@ -1,4 +1,4 @@
/* $NetBSD: dev_net.c,v 1.10 2002/01/24 02:37:53 gson Exp $ */
/* $NetBSD: dev_net.c,v 1.11 2002/02/02 18:53:12 gson Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@ -58,6 +58,23 @@
void bootp __P((int));
#endif
struct in_addr myip; /* init'ed as INADDR_ANY */
struct in_addr rootip, gateip;
n_long netmask = 0xffffff00;
char rootpath[FNAME_SIZE] = "/";
char bootfile[FNAME_SIZE];
char hostname[FNAME_SIZE]; /* our hostname */
int hostnamelen;
#ifdef SUPPORT_BOOTPARAM
char domainname[FNAME_SIZE]; /* our DNS domain, not used */
int domainnamelen;
#endif
u_char bcea[6] = BA;
static int netdev_sock = -1;
/*