2 files changed, 10 insertions, 6 deletions
diff --git a/src/cmd/upas/nfs/a.h b/src/cmd/upas/nfs/a.h
index 3c81deb0..7e5e8121 100644
--- a/src/cmd/upas/nfs/a.h
+++ b/src/cmd/upas/nfs/a.h
@@ -22,11 +22,6 @@ void		mailthread(void (*fn)(void*), void*);
 
 void		warn(char*, ...);
 
-#define esmprint smprint
-#define emalloc(n) mallocz(n, 1)
-#define erealloc realloc
-#define estrdup strdup
-
 enum
 {
 	NoEncoding,
@@ -40,3 +35,12 @@ char*	tcs(char*, char*);
 char*	unrfc2047(char*);
 
 extern Imap *imap;
+
+#undef isnumber
+#define isnumber	upas_isnumber
+
+#define esmprint smprint
+#define emalloc(n) mallocz(n, 1)
+#define erealloc realloc
+#define estrdup strdup
+
diff --git a/src/cmd/upas/nfs/fs.c b/src/cmd/upas/nfs/fs.c
index eda3d666..c9cdd99b 100644
--- a/src/cmd/upas/nfs/fs.c
+++ b/src/cmd/upas/nfs/fs.c
@@ -222,7 +222,7 @@ fsattach(Req *r)
 	respond(r, nil);
 }
 
-int
+static int
 isnumber(char *s)
 {
 	int n;