--- ray/src/common/getpath.c 2003/06/30 14:59:11 2.12 +++ ray/src/common/getpath.c 2003/07/17 09:21:29 2.14 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: getpath.c,v 2.12 2003/06/30 14:59:11 schorsch Exp $"; +static const char RCSid[] = "$Id: getpath.c,v 2.14 2003/07/17 09:21:29 schorsch Exp $"; #endif /* * getpath.c - function to search for file in a list of directories @@ -11,15 +11,15 @@ static const char RCSid[] = "$Id: getpath.c,v 2.12 200 #include #include -#ifndef RHAS_GETPWNAM +#ifdef RHAS_GETPWNAM #include #include #endif #include "paths.h" +#include "rtio.h" - #ifdef _WIN32 static char * core_getpath /* wrapped below: expand fname, return full path */ @@ -33,7 +33,7 @@ register char *searchpath, int mode ) { -#ifndef RHAS_GETPWNAM +#ifdef 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 RHAS_GETPWNAM +#ifdef 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... */