2008-07-11 20:35:40

by Chuck Lever III

[permalink] [raw]
Subject: [PATCH 13/14] text-based mount command: remove unnecessary headers from stropts.c

Clean up: remove unneeded headers from utils/mount/stropts.c.

Signed-off-by: Chuck Lever <[email protected]>
---

utils/mount/stropts.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)


diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index b54df40..e4a4408 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -25,11 +25,7 @@
#include <config.h>
#endif

-#include <ctype.h>
#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
#include <errno.h>
#include <netdb.h>
#include <time.h>
@@ -42,7 +38,6 @@
#include "xcommon.h"
#include "mount.h"
#include "nls.h"
-#include "nfs_mount.h"
#include "mount_constants.h"
#include "stropts.h"
#include "error.h"
@@ -51,15 +46,12 @@
#include "version.h"
#include "parse_dev.h"

-#ifdef HAVE_RPCSVC_NFS_PROT_H
-#include <rpcsvc/nfs_prot.h>
-#else
-#include <linux/nfs.h>
-#define nfsstat nfs_stat
+#ifndef NFS_PROGRAM
+#define NFS_PROGRAM (100003)
#endif

#ifndef NFS_PORT
-#define NFS_PORT 2049
+#define NFS_PORT (2049)
#endif

#ifndef NFS_MAXHOSTNAME