[src/trunk]: src/sys/nfs put more ISO bits under ifdef ISO.

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d61640d9c106
branches:  trunk
changeset: 499628:d61640d9c106
user:      chs <chs%NetBSD.org@localhost>
date:      Fri Nov 24 23:30:02 2000 +0000

description:
put more ISO bits under ifdef ISO.

diffstat:

 sys/nfs/nfs_nqlease.c  |  16 +++++++++++++---
 sys/nfs/nfs_syscalls.c |   9 +++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diffs (92 lines):

diff -r a4a16302f672 -r d61640d9c106 sys/nfs/nfs_nqlease.c
--- a/sys/nfs/nfs_nqlease.c     Fri Nov 24 23:30:01 2000 +0000
+++ b/sys/nfs/nfs_nqlease.c     Fri Nov 24 23:30:02 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_nqlease.c,v 1.34 2000/09/19 23:26:26 bjh21 Exp $   */
+/*     $NetBSD: nfs_nqlease.c,v 1.35 2000/11/24 23:30:02 chs Exp $     */
 
 /*
  * Copyright (c) 1992, 1993
@@ -124,7 +124,10 @@
 
 extern nfstype nfsv2_type[9];
 extern nfstype nfsv3_type[9];
-extern struct nfssvc_sock *nfs_udpsock, *nfs_cltpsock;
+extern struct nfssvc_sock *nfs_udpsock;
+#ifdef ISO
+extern struct nfssvc_sock *nfs_cltpsock
+#endif
 #ifdef INET6
 extern struct nfssvc_sock *nfs_udp6sock;
 #endif
@@ -342,9 +345,11 @@
                lph->lph_nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
                lph->lph_flag |= (LC_VALID | LC_UDP6);
 #endif
+#ifdef ISO
        } else if (slp == nfs_cltpsock) {
                lph->lph_nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
                lph->lph_flag |= (LC_VALID | LC_CLTP);
+#endif
        } else {
                lph->lph_flag |= (LC_VALID | LC_SREF);
                lph->lph_slp = slp;
@@ -410,7 +415,10 @@
                else
                        return (0);
        }
-       if (slp == nfs_udpsock || slp == nfs_cltpsock
+       if (slp == nfs_udpsock
+#ifdef ISO
+           || slp == nfs_cltpsock
+#endif
 #ifdef INET6
            || slp == nfs_udp6sock
 #endif
@@ -473,9 +481,11 @@
                                saddr->sin_addr.s_addr = lph->lph_inetaddr;
                                saddr->sin_port = lph->lph_port;
                                so = nfs_udpsock->ns_so;
+#ifdef ISO
                        } else if (lph->lph_flag & LC_CLTP) {
                                nam2 = lph->lph_nam;
                                so = nfs_cltpsock->ns_so;
+#endif
 #ifdef INET6
                        } else if (lph->lph_flag & LC_UDP6) {
                                nam2 = lph->lph_nam;
diff -r a4a16302f672 -r d61640d9c106 sys/nfs/nfs_syscalls.c
--- a/sys/nfs/nfs_syscalls.c    Fri Nov 24 23:30:01 2000 +0000
+++ b/sys/nfs/nfs_syscalls.c    Fri Nov 24 23:30:02 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_syscalls.c,v 1.46 2000/10/24 07:08:48 matt Exp $   */
+/*     $NetBSD: nfs_syscalls.c,v 1.47 2000/11/24 23:30:03 chs Exp $    */
 
 /*
  * Copyright (c) 1989, 1993
@@ -96,7 +96,10 @@
 extern int nfsrtton;
 extern struct nfsstats nfsstats;
 extern int nfsrvw_procrastinate;
-struct nfssvc_sock *nfs_udpsock, *nfs_cltpsock;
+struct nfssvc_sock *nfs_udpsock;
+#ifdef ISO
+struct nfssvc_sock *nfs_cltpsock;
+#endif
 #ifdef INET6
 struct nfssvc_sock *nfs_udp6sock;
 #endif
@@ -868,11 +871,13 @@
        TAILQ_INSERT_TAIL(&nfssvc_sockhead, nfs_udp6sock, ns_chain);
 #endif
 
+#ifdef ISO
        nfs_cltpsock = (struct nfssvc_sock *)
            malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK);
        memset((caddr_t)nfs_cltpsock, 0, sizeof (struct nfssvc_sock));
        TAILQ_INIT(&nfs_cltpsock->ns_uidlruhead);
        TAILQ_INSERT_TAIL(&nfssvc_sockhead, nfs_cltpsock, ns_chain);
+#endif
 }
 
 /*