--- ray/src/common/getpath.c	1992/06/16 13:29:35	2.3
+++ ray/src/common/getpath.c	1992/09/08 09:09:24	2.5
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -8,19 +8,16 @@ static char SCCSid[] = "$SunId$ LBL";
  *  getpath.c - function to search for file in a list of directories
  */
 
+#include "paths.h"
+
 #define  NULL		0
 
+#ifndef  NIX
 #include  <pwd.h>
-
-#ifndef DIRSEP
-#define DIRSEP		'/'
+extern struct passwd  *getpwnam();
 #endif
-#ifndef PATHSEP
-#define PATHSEP		':'
-#endif
 
-extern char  *strcpy(), *strcat(), *getenv();
-extern struct passwd  *getpwnam();
+extern char  *strcpy(), *strcat();
 
 
 char *
@@ -29,8 +26,10 @@ register char  *fname;
 register char  *searchpath;
 int  mode;
 {
-	static char  pname[256];
+#ifndef  NIX
 	struct passwd  *pwent;
+#endif
+	static char  pname[256];
 	register char  *cp;
 
 	if (fname == NULL)