xnu-6153.101.6.tar.gz

[apple/xnu.git] / bsd / nfs / nfs_socket.c

diff --git a/bsd/nfs/nfs_socket.c b/bsd/nfs/nfs_socket.c
index d0a6fd32765c48916a55b56ea11dcb4f86a49b0c..e5c2a590ef55fac4286f6eb3ce28bb0f76d5c827 100644 (file)
--- a/bsd/nfs/nfs_socket.c
+++ b/bsd/nfs/nfs_socket.c
@@ -65,6 +65,9 @@
  * FreeBSD-Id: nfs_socket.c,v 1.30 1997/10/28 15:59:07 bde Exp $
  */
 
+#include <nfs/nfs_conf.h>
+#if CONFIG_NFS
+
 /*
  * Socket operations for use by nfs
  */
@@ -116,13 +119,13 @@ boolean_t       current_thread_aborted(void);
 kern_return_t   thread_terminate(thread_t);
 
 
-#if NFSSERVER
+#if CONFIG_NFS_SERVER
 int nfsrv_sock_max_rec_queue_length = 128; /* max # RPC records queued on (UDP) socket */
 
 int nfsrv_getstream(struct nfsrv_sock *, int);
 int nfsrv_getreq(struct nfsrv_descript *);
 extern int nfsv3_procid[NFS_NPROCS];
-#endif /* NFSSERVER */
+#endif /* CONFIG_NFS_SERVER */
 
 /*
  * compare two sockaddr structures
@@ -153,7 +156,7 @@ nfs_sockaddr_cmp(struct sockaddr *sa1, struct sockaddr *sa2)
        return -1;
 }
 
-#if NFSCLIENT
+#if CONFIG_NFS_CLIENT
 
 int     nfs_connect_search_new_socket(struct nfsmount *, struct nfs_socket_search *, struct timeval *);
 int     nfs_connect_search_socket_connect(struct nfsmount *, struct nfs_socket *, int);
@@ -6324,9 +6327,9 @@ nfs_up(struct nfsmount *nmp, thread_t thd, int flags, const char *msg)
 }
 
 
-#endif /* NFSCLIENT */
+#endif /* CONFIG_NFS_CLIENT */
 
-#if NFSSERVER
+#if CONFIG_NFS_SERVER
 
 /*
  * Generate the rpc reply header
@@ -7046,4 +7049,6 @@ nfsrv_wakenfsd(struct nfsrv_sock *slp)
        wakeup(nd);
 }
 
-#endif /* NFSSERVER */
+#endif /* CONFIG_NFS_SERVER */
+
+#endif /* CONFIG_NFS */