--- ray/src/common/standard.h 2003/06/20 00:25:49 2.27 +++ ray/src/common/standard.h 2003/06/26 00:58:09 2.30 @@ -1,4 +1,4 @@ -/* RCSid $Id: standard.h,v 2.27 2003/06/20 00:25:49 greg Exp $ */ +/* RCSid $Id: standard.h,v 2.30 2003/06/26 00:58:09 schorsch Exp $ */ /* * Miscellaneous definitions required by many routines. */ @@ -25,7 +25,7 @@ extern "C" { /* regular transformation */ typedef struct { MAT4 xfm; /* transform matrix */ - FLOAT sca; /* scalefactor */ + RREAL sca; /* scalefactor */ } XF; /* complemetary tranformation */ typedef struct { @@ -78,7 +78,7 @@ extern char errmsg[]; /* global buffer for error me #define tsin sin #define ttan tan #else -extern double tcos(); /* table-based cosine approximation */ + /* table-based cosine approximation */ #define tsin(x) tcos((x)-(PI/2.)) #define ttan(x) (tsin(x)/tcos(x)) #endif @@ -103,8 +103,10 @@ extern double tcos(); /* table-based cosine approxim #define index strchr #define rindex strrchr #endif -extern off_t lseek(); + /* is missing on some systems */ +extern off_t lseek(int, off_t, int); + #ifdef _WIN32 #define NIX 1 #endif @@ -134,7 +136,7 @@ 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); +/*extern char *fixargv0(char *av0);*/ /* XXX include paths.h instead */ /* defined in fropen.c */ extern FILE *frlibopen(char *fname); /* defined in getlibpath.c */ @@ -149,12 +151,14 @@ extern char *getstr(char *s, FILE *fp); extern long getint(int siz, FILE *fp); extern double getflt(FILE *fp); /* defined in process.c */ +/* extern int open_process(int pd[3], char *av[]); extern int process(int pd[3], char *recvbuf, char *sendbuf, int nbr, int nbs); extern int close_process(int pd[3]); extern int readbuf(int fd, char *bpos, int siz); extern int writebuf(int fd, char *bpos, int siz); +*/ /* defined in rexpr.c */ extern int ecompile(char *sp, int iflg, int wflag); extern char *expsave(void);