--- ray/src/common/standard.h 2003/03/27 16:33:39 2.21 +++ ray/src/common/standard.h 2003/06/26 00:58:09 2.30 @@ -1,29 +1,31 @@ -/* RCSid $Id: standard.h,v 2.21 2003/03/27 16:33:39 greg Exp $ */ +/* RCSid $Id: standard.h,v 2.30 2003/06/26 00:58:09 schorsch Exp $ */ /* * Miscellaneous definitions required by many routines. */ +#ifndef _RAD_STANDARD_H_ +#define _RAD_STANDARD_H_ +#ifdef __cplusplus +extern "C" { +#endif #include "copyright.h" #include - #include - #include - #include - #include - #include - #include +#include "tifftypes.h" + #include "mat4.h" + /* regular transformation */ typedef struct { MAT4 xfm; /* transform matrix */ - FLOAT sca; /* scalefactor */ + RREAL sca; /* scalefactor */ } XF; /* complemetary tranformation */ typedef struct { @@ -39,6 +41,7 @@ typedef struct { #endif #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 */ @@ -46,13 +49,6 @@ typedef struct { #define F_OK 0 /* exists */ #endif -#ifndef int2 -#define int2 short /* two-byte integer */ -#endif -#ifndef int4 -#define int4 int /* four-byte integer */ -#endif - /* error codes */ #define WARNING 0 /* non-fatal error */ #define USER 1 /* fatal user-caused error */ @@ -82,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 @@ -95,7 +91,7 @@ extern double tcos(); /* table-based cosine approxim #endif /* memory operations */ #ifdef NOSTRUCTASS -#define copystruct(d,s) bcopy((char *)(s),(char *)(d),sizeof(*(d))) +#define copystruct(d,s) bcopy((void *)(s),(void *)(d),sizeof(*(d))) #else #define copystruct(d,s) (*(d) = *(s)) #endif @@ -107,78 +103,18 @@ extern double tcos(); /* table-based cosine approxim #define index strchr #define rindex strrchr #endif -extern off_t lseek(); -#ifdef MSDOS + /* is missing on some systems */ +extern off_t lseek(int, off_t, int); + +#ifdef _WIN32 #define NIX 1 #endif #ifdef AMIGA #define NIX 1 #endif -#ifdef NOPROTO -extern int badarg(); -extern char *bmalloc(); -extern void bfree(); -extern void error(); -extern int expandarg(); -extern time_t fdate(); -extern int setfdate(); -extern char *fgetline(); -extern int fgetval(); -extern char *fgetword(); -extern void fputword(); -extern char *fixargv0(); -extern FILE *frlibopen(); -extern char *getlibpath(); -extern char *getpath(); -extern void putstr(); -extern void putint(); -extern void putflt(); -extern char *getstr(); -extern long getint(); -extern double getflt(); -extern int open_process(); -extern int process(); -extern int close_process(); -extern int readbuf(); -extern int writebuf(); -extern int ecompile(); -extern char *expsave(); -extern void expset(); -extern char *eindex(); -extern char *savestr(); -extern void freestr(); -extern int shash(); -extern char *savqstr(); -extern void freeqstr(); -extern double tcos(); -extern int wordfile(); -extern int wordstring(); -extern char *atos(); -extern char *nextword(); -extern char *sskip(); -extern char *sskip2(); -extern char *iskip(); -extern char *fskip(); -extern int isint(); -extern int isintd(); -extern int isflt(); -extern int isfltd(); -extern int xf(); -extern int invxf(); -extern int fullxf(); -extern int quadtratic(); -extern int4 encodedir(); -extern void decodedir(); -extern double dir2diff(); -extern double fdir2diff(); -extern void eputs(); -extern void wputs(); -extern void quit(); - -#else /* defined in badarg.c */ extern int badarg(int ac, char **av, char *fl); /* defined in bmalloc.c */ @@ -200,11 +136,11 @@ 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 */ -extern char *getlibpath(void); +extern char *getrlibpath(void); /* defined in getpath.c */ extern char *getpath(char *fname, char *searchpath, int mode); /* defined in portio.c */ @@ -215,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); @@ -256,13 +194,22 @@ extern int fullxf(FULLXF *fx, int ac, char *av[]); /* defined in zeroes.c */ extern int quadtratic(double *r, double a, double b, double c); /* defined in dircode.c */ -extern int4 encodedir(FVECT dv); -extern void decodedir(FVECT dv, int4 dc); -extern double dir2diff(int4 dc1, int4 dc2); -extern double fdir2diff(int4 dc1, FVECT v2); +extern int32 encodedir(FVECT dv); +extern void decodedir(FVECT dv, int32 dc); +extern double dir2diff(int32 dc1, int32 dc2); +extern double fdir2diff(int32 dc1, FVECT v2); + /* defined in lamp.c */ +extern float * matchlamp(char *s); +extern int loadlamps(char *file); +extern void freelamps(void); /* miscellaneous */ extern void eputs(char *s); extern void wputs(char *s); extern void quit(int code); + +#ifdef __cplusplus +} #endif +#endif /* _RAD_STANDARD_H_ */ +