--- ray/src/common/getpath.c	2003/06/26 00:58:09	2.11
+++ ray/src/common/getpath.c	2003/06/30 14:59:11	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: getpath.c,v 2.11 2003/06/26 00:58:09 schorsch Exp $";
+static const char	RCSid[] = "$Id: getpath.c,v 2.12 2003/06/30 14:59:11 schorsch Exp $";
 #endif
 /*
  *  getpath.c - function to search for file in a list of directories
@@ -11,7 +11,7 @@ static const char	RCSid[] = "$Id: getpath.c,v 2.11 200
 
 #include  <string.h>
 #include  <ctype.h>
-#ifndef	 _WIN32 /* XXX was NIX, do we still compile on Amiga? */
+#ifndef	 RHAS_GETPWNAM
   #include  <pwd.h>
   #include  <sys/types.h>
 #endif
@@ -33,7 +33,7 @@ register char  *searchpath,
 int  mode
 )
 {
-#ifndef	 _WIN32 /* XXX was NIX, do we still compile on Amiga? */
+#ifndef	 RHAS_GETPWNAM
 	struct passwd  *pwent;
 #endif
 	static char  pname[PATH_MAX];
@@ -64,7 +64,7 @@ int  mode
 					strncat(pname, fname, sizeof(pname)-strlen(pname)-1);
 					break;
 				}
-#ifndef _WIN32 /* XXX was NIX, do we still compile on Amiga? */
+#ifndef RHAS_GETPWNAM
 				/* XXX Should we request our own home directory from the
 				   XXX system as well if the above fails? */
 				/* XXX In any case, we need do the same thing on Windows... */
@@ -171,7 +171,7 @@ int main()
 	unsetenv("HOMEDIR");
 	fp = getpath("~", getenv("PATH"), F_OK);
 	printf(fmt,  "~",        "PATH", "F_OK", fp);
-#ifndef _WIN32 /* XXX was NIX, do we still compile on Amiga? */
+#ifndef RHAS_GETPWNAM
 	fp = getpath("~lp", getenv("PATH"), F_OK);
 	printf(fmt, "~lp",         "PATH", "F_OK", fp);
 #endif