Protect variables and function prototypes that are only used in the INET6

case with an ifdef INET6.

This make the fixit floppy compile again.

Reviewed by:	markm
This commit is contained in:
John Hay 2001-12-03 17:42:02 +00:00
parent 437e48e931
commit de0dff907e
2 changed files with 14 additions and 2 deletions

View File

@ -104,7 +104,9 @@ static char _hostname[MAXHOSTNAMELEN];
static int help(int, char **);
static int call(intrtn_t, ...);
static void cmdrc(char *, char *);
#ifdef INET6
static int switch_af(struct addrinfo **);
#endif
static int togglehelp(void);
static int send_tncmd(void (*)(int, int), const char *, char *);
static int setmod(int);
@ -2336,7 +2338,9 @@ tn(int argc, char *argv[])
hostname = _hostname;
}
res0 = res;
#ifdef INET6
af_again:
#endif
if (srcroute != 0) {
static char hostbuf[BUFSIZ];
@ -2835,10 +2839,12 @@ static int
sourceroute(struct addrinfo *ai, char *arg, char **cpp, int *lenp, int *protop, int *optp)
{
static char buf[1024 + ALIGNBYTES]; /*XXX*/
struct cmsghdr *cmsg;
char *cp, *cp2, *lsrp, *ep;
struct sockaddr_in *_sin;
#ifdef INET6
struct sockaddr_in6 *sin6;
struct cmsghdr *cmsg;
#endif
struct addrinfo hints, *res;
int error;
char c;

View File

@ -104,7 +104,9 @@ static char _hostname[MAXHOSTNAMELEN];
static int help(int, char **);
static int call(intrtn_t, ...);
static void cmdrc(char *, char *);
#ifdef INET6
static int switch_af(struct addrinfo **);
#endif
static int togglehelp(void);
static int send_tncmd(void (*)(int, int), const char *, char *);
static int setmod(int);
@ -2336,7 +2338,9 @@ tn(int argc, char *argv[])
hostname = _hostname;
}
res0 = res;
#ifdef INET6
af_again:
#endif
if (srcroute != 0) {
static char hostbuf[BUFSIZ];
@ -2835,10 +2839,12 @@ static int
sourceroute(struct addrinfo *ai, char *arg, char **cpp, int *lenp, int *protop, int *optp)
{
static char buf[1024 + ALIGNBYTES]; /*XXX*/
struct cmsghdr *cmsg;
char *cp, *cp2, *lsrp, *ep;
struct sockaddr_in *_sin;
#ifdef INET6
struct sockaddr_in6 *sin6;
struct cmsghdr *cmsg;
#endif
struct addrinfo hints, *res;
int error;
char c;