--- ray/src/common/rtio.h 2003/07/14 22:23:59 3.3 +++ ray/src/common/rtio.h 2004/03/28 20:33:12 3.8 @@ -1,4 +1,4 @@ -/* RCSid $Id: rtio.h,v 3.3 2003/07/14 22:23:59 schorsch Exp $ */ +/* RCSid $Id: rtio.h,v 3.8 2004/03/28 20:33:12 schorsch Exp $ */ /* * Radiance i/o and string routines */ @@ -14,18 +14,6 @@ #ifdef __cplusplus extern "C" { #endif - -/* XXX include paths.h instead */ -#ifndef F_OK /* mode bits for access(2) call */ -#define R_OK 4 /* readable */ -#define W_OK 2 /* writable */ -#define X_OK 1 /* executable */ -#define F_OK 0 /* exists */ -#endif - - /* is missing on some systems */ -extern off_t lseek(int, off_t, int); - /* defined in badarg.c */ extern int badarg(int ac, char **av, char *fl); /* defined in expandarg.c */ @@ -36,17 +24,17 @@ extern int setfdate(char *fname, long ftim); /* defined in fgetline.c */ extern char *fgetline(char *s, int n, FILE *fp); /* defined in fgetval.c */ -extern int fgetval(FILE *fp, int ty, char *vp); +extern int fgetval(FILE *fp, int ty, void *vp); /* defined in fgetword.c */ extern char *fgetword(char *s, int n, FILE *fp); /* defined in fputword.c */ extern void fputword(char *s, FILE *fp); - /* defined in fixargv0.c */ -/*extern char *fixargv0(char *av0);*/ /* XXX include paths.h instead */ /* defined in fropen.c */ extern FILE *frlibopen(char *fname); /* defined in getlibpath.c */ extern char *getrlibpath(void); + /* defined in gethomedir.c */ +extern char *gethomedir(char *uname, char *path, int plen); /* defined in getpath.c */ extern char *getpath(char *fname, char *searchpath, int mode); /* defined in portio.c */