Remove support for OSI networking in user-land (#ifdef OSI aor CCITT)

in preparation for its removal from the kernel source tree.  NB: because
a function was deleted, libc is now at version 3.0 (was 2.2 previously).

3 files changed, 18 insertions, 4 deletions

diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index 6746ace2ec47..2f7336058f95 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,10 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
 
 PROG=	netstat
-SRCS=	if.c inet.c iso.c main.c mbuf.c mroute.c ipx.c ns.c route.c \
-	tp_astring.c unix.c
+SRCS=	if.c inet.c main.c mbuf.c mroute.c ipx.c ns.c route.c \
+	unix.c # iso.c tp_astring.c
 CFLAGS+=-I/sys # -g
-.PATH:	${.CURDIR}/../../sys/netiso
+#.PATH:	${.CURDIR}/../../sys/netiso
 BINGRP=	kmem
 BINMODE=2555
 LDADD=	-lkvm -lipx
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 1ab20de78d97..e1a6ba9fdc33 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -47,8 +47,10 @@ static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 #include <netipx/ipx_if.h>
 #include <netns/ns.h>
 #include <netns/ns_if.h>
+#ifdef ISO
 #include <netiso/iso.h>
 #include <netiso/iso_var.h>
+#endif
 #include <arpa/inet.h>
 
 #include <signal.h>
@@ -78,7 +80,9 @@ intpr(interval, ifnetaddr)
 		struct in_ifaddr in;
 		struct ipx_ifaddr ipx;
 		struct ns_ifaddr ns;
+#ifdef ISO
 		struct iso_ifaddr iso;
+#endif
 	} ifaddr;
 	u_long ifaddraddr;
 	struct sockaddr *sa;
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 3ff395a4f654..c1363055b72f 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -180,6 +180,7 @@ struct protox nsprotox[] = {
 	  0,		0 }
 };
 
+#ifdef ISO
 struct protox isoprotox[] = {
 	{ ISO_TP,	N_TPSTAT,	1,	iso_protopr,
 	  tp_stats,	"tp" },
@@ -192,8 +193,13 @@ struct protox isoprotox[] = {
 	{ -1,		-1,		0,	0,
 	  0,		0 }
 };
+#endif
 
-struct protox *protoprotox[] = { protox, ipxprotox, nsprotox, isoprotox, NULL };
+struct protox *protoprotox[] = { protox, ipxprotox, nsprotox, 
+#ifdef ISO
+					 isoprotox, 
+#endif
+					 NULL };
 
 static void printproto __P((struct protox *, char *));
 static void usage __P((void));
@@ -246,8 +252,10 @@ main(argc, argv)
 				af = AF_INET;
 			else if (strcmp(optarg, "unix") == 0)
 				af = AF_UNIX;
+#ifdef ISO
 			else if (strcmp(optarg, "iso") == 0)
 				af = AF_ISO;
+#endif
 			else {
 				errx(1, "%s: unknown address family", optarg);
 			}
@@ -419,9 +427,11 @@ main(argc, argv)
 	if (af == AF_NS || af == AF_UNSPEC)
 		for (tp = nsprotox; tp->pr_name; tp++)
 			printproto(tp, tp->pr_name);
+#ifdef ISO
 	if (af == AF_ISO || af == AF_UNSPEC)
 		for (tp = isoprotox; tp->pr_name; tp++)
 			printproto(tp, tp->pr_name);
+#endif
 	if ((af == AF_UNIX || af == AF_UNSPEC) && !sflag)
 		unixpr(nl[N_UNIXSW].n_value);
 	exit(0);