--- ray/src/common/standard.h 2003/02/25 02:47:22 2.17 +++ ray/src/common/standard.h 2003/03/27 04:16:33 2.20 @@ -1,4 +1,4 @@ -/* RCSid $Id: standard.h,v 2.17 2003/02/25 02:47:22 greg Exp $ */ +/* RCSid $Id: standard.h,v 2.20 2003/03/27 04:16:33 greg Exp $ */ /* * Miscellaneous definitions required by many routines. */ @@ -87,11 +87,11 @@ extern double tcos(); /* table-based cosine approxim #define ttan(x) (tsin(x)/tcos(x)) #endif /* custom version of assert(3) */ -#define CHECK(be,et,em) ((be) ? error(et,em) : 0) +#define CHECK(be,et,em) if (be) error(et,em) else #ifdef DEBUG #define DCHECK CHECK #else -#define DCHECK(be,et,em) 0 +#define DCHECK(be,et,em) (void)0 #endif /* memory operations */ #ifdef NOSTRUCTASS @@ -170,6 +170,10 @@ 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(); @@ -219,7 +223,7 @@ 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(); +extern char *expsave(void); extern void expset(char *ep); extern char *eindex(char *sp); /* defined in savestr.c */ @@ -251,6 +255,11 @@ extern int invxf(XF *ret, int ac, char *av[]); 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); /* miscellaneous */ extern void eputs(char *s); extern void wputs(char *s);