diff options
Diffstat (limited to 'lib/libc')
-rw-r--r-- | lib/libc/Makefile | 4 | ||||
-rw-r--r-- | lib/libc/net/Makefile.inc | 2 | ||||
-rw-r--r-- | lib/libc/net/res_debug.c | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index c52d671..4fdc2f2 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -6,8 +6,8 @@ # from CFLAGS below. To remove these strings from just the system call # stubs, remove just -DSYSLIBC_RCS from CFLAGS. LIB=c -SHLIB_MAJOR= 2 -SHLIB_MINOR= 2 +SHLIB_MAJOR= 3 +SHLIB_MINOR= 0 CFLAGS+=-DLIBC_RCS -DSYSLIBC_RCS AINC= -I${.CURDIR}/${MACHINE} CLEANFILES+=tags diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index c55f6f7..dd509ae 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -8,7 +8,7 @@ SRCS+= gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ getproto.c getprotoent.c getprotoname.c getservbyname.c \ getservbyport.c getservent.c herror.c inet_addr.c inet_lnaof.c \ inet_makeaddr.c inet_netof.c inet_network.c inet_ntoa.c \ - iso_addr.c linkaddr.c ns_addr.c ns_ntoa.c rcmd.c recv.c res_comp.c \ + linkaddr.c ns_addr.c ns_ntoa.c rcmd.c recv.c res_comp.c \ res_data.c res_debug.c res_init.c res_mkquery.c res_query.c \ res_send.c send.c ether_addr.c diff --git a/lib/libc/net/res_debug.c b/lib/libc/net/res_debug.c index af80833..fdcb1b8 100644 --- a/lib/libc/net/res_debug.c +++ b/lib/libc/net/res_debug.c @@ -53,12 +53,15 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: res_debug.c,v 1.5 1995/08/21 09:15:34 bde Exp $"; +static char rcsid[] = "$Id: res_debug.c,v 1.6 1996/01/07 09:14:55 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> #include <netinet/in.h> +#ifdef ISO #include <netiso/iso.h> +#endif + #include <arpa/inet.h> #include <arpa/nameser.h> @@ -415,7 +418,9 @@ __p_rr(cp, msg, file) { int type, class, dlen, n, c; struct in_addr inaddr; +#ifdef ISO struct iso_addr isoa; +#endif const u_char *cp1, *cp2; u_int32_t tmpttl, t; int lcnt; @@ -556,6 +561,7 @@ __p_rr(cp, msg, file) putc('"', file); break; +#ifdef ISO case T_NSAP: isoa.isoa_len = dlen; if (isoa.isoa_len > sizeof(isoa.isoa_genaddr)) @@ -564,6 +570,7 @@ __p_rr(cp, msg, file) (void) fprintf(file, "\t%s", iso_ntoa(&isoa)); cp += dlen; break; +#endif case T_MINFO: case T_RP: |