--- ray/src/common/standard.h	2003/02/25 02:47:22	2.17
+++ ray/src/common/standard.h	2003/06/20 16:12:39	2.28
@@ -1,25 +1,27 @@
-/* RCSid $Id: standard.h,v 2.17 2003/02/25 02:47:22 greg Exp $ */
+/* RCSid $Id: standard.h,v 2.28 2003/06/20 16:12:39 greg Exp $ */
 /*
  *	Miscellaneous definitions required by many routines.
  */
+#ifndef _RAD_STANDARD_H_
+#define _RAD_STANDARD_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include "copyright.h"
 
 #include  <stdio.h>
-
 #include  <sys/types.h>
-
 #include  <fcntl.h>
-
 #include  <math.h>
-
 #include  <errno.h>
-
 #include  <stdlib.h>
-
 #include  <string.h>
 
+#include  "tifftypes.h"
+
 #include  "mat4.h"
+
 				/* regular transformation */
 typedef struct {
 	MAT4  xfm;				/* transform matrix */
@@ -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,20 +78,20 @@ 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
 					/* 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
-#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
@@ -109,72 +105,14 @@ extern double	tcos();			/* table-based cosine approxim
 #endif
 extern off_t  lseek();
 
-#ifdef MSDOS
+#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 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,7 +138,7 @@ extern char	*fixargv0(char *av0);
 					/* 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 */
@@ -219,7 +157,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,9 +189,23 @@ 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 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_ */
+