--- ray/src/common/standard.h	1991/10/23 15:19:23	1.8
+++ ray/src/common/standard.h	1998/12/16 18:16:12	2.14
@@ -1,6 +1,6 @@
-/* Copyright (c) 1990 Regents of the University of California */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
-/* SCCSid "$SunId$ LBL" */
+/* SCCSid "$SunId$ SGI" */
 
 /*
  *	Miscellaneous definitions required by many routines.
@@ -8,6 +8,10 @@
 
 #include  <stdio.h>
 
+#include  <sys/types.h>
+
+#include  <fcntl.h>
+
 #include  <math.h>
 
 #include  <errno.h>
@@ -24,47 +28,104 @@ typedef struct {
 	XF  b;					/* backward */
 }  FULLXF;
 
-#ifdef  M_PI
-#define  PI		M_PI
+#ifndef  PI
+#ifdef	M_PI
+#define	 PI		((double)M_PI)
 #else
-#define  PI		3.14159265358979323846
+#define	 PI		3.14159265358979323846
 #endif
+#endif
 
-#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 */
+#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
+
+#ifndef  int2
+#define  int2		short		/* two-byte integer */
+#endif
+#ifndef  int4
+#define  int4		int		/* four-byte integer */
+#endif
+
+extern int  eputs(), wputs();	/* standard error output functions */
+
 				/* error codes */
-#define  WARNING	1		/* non-fatal error */
-#define  USER		2		/* fatal user-caused error */
-#define  SYSTEM		3		/* fatal system-related error */
-#define  INTERNAL	4		/* fatal program-related error */
-#define  CONSISTENCY	5		/* bad consistency check, abort */
-#define  COMMAND	6		/* interactive error */
+#define	 WARNING	0		/* non-fatal error */
+#define	 USER		1		/* fatal user-caused error */
+#define	 SYSTEM		2		/* fatal system-related error */
+#define	 INTERNAL	3		/* fatal program-related error */
+#define	 CONSISTENCY	4		/* bad consistency check, abort */
+#define	 COMMAND	5		/* interactive error */
+#define  NERRS		6
+				/* error struct */
+extern struct erract {
+	char	pre[16];		/* prefix message */
+	int	(*pf)();		/* put function (resettable) */
+	int	ec;			/* exit code (0 means non-fatal) */
+} erract[NERRS];	/* list of error actions */
 
+#define  ERRACT_INIT	{	{"warning - ", wputs, 0}, \
+				{"fatal - ", eputs, 1}, \
+				{"system - ", eputs, 2}, \
+				{"internal - ", eputs, 1}, \
+				{"consistency - ", eputs, -1}, \
+				{"", NULL, 0}	}
+
 extern char  errmsg[];			/* global buffer for error messages */
 
-extern int  errno;			/* system error number */
-
+#ifdef  FASTMATH
+#define  tcos			cos
+#define  tsin			sin
+#define  ttan			tan
+#else
+extern double	tcos();			/* 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)
+#ifdef  DEBUG
+#define  DCHECK			CHECK
+#else
+#define  DCHECK(be,et,em)	0
+#endif
 					/* memory operations */
-#ifdef  STRUCTASSIGN
-#define  copystruct(d,s)	(*(d) = *(s))
+#ifdef	NOSTRUCTASS
+#define	 copystruct(d,s)	bcopy((char *)(s),(char *)(d),sizeof(*(d)))
 #else
-#define  copystruct(d,s)	bcopy((char *)(s),(char *)(d),sizeof(*(d)))
+#define	 copystruct(d,s)	(*(d) = *(s))
 #endif
 
-#ifndef  BSD
-#define  bcopy(s,d,n)		(void)memcpy(d,s,n)
-#define  bzero(d,n)		(void)memset(d,0,n)
-#define  bcmp(b1,b2,n)		memcmp(b1,b2,n)
-extern char  *memcpy(), *memset();
-#define  index			strchr
-#define  rindex			strrchr
+#ifdef  BSD
+extern long  lseek();
+#else
+#define	 bcopy(s,d,n)		(void)memcpy(d,s,n)
+#define	 bzero(d,n)		(void)memset(d,0,n)
+#define	 bcmp(b1,b2,n)		memcmp(b1,b2,n)
+#define	 index			strchr
+#define	 rindex			strrchr
+extern off_t  lseek();
 #endif
+extern long  ftell();
 
-extern char  *sskip();
+extern char  *sskip(), *sskip2();
 extern char  *getpath(), *getenv();
+#ifndef malloc
 extern char  *malloc(), *calloc(), *realloc();
+#endif
 extern char  *bmalloc(), *savestr(), *savqstr();
+
+#ifdef  DCL_ATOF
+extern double  atof();
+#endif
+
+#ifdef MSDOS
+#define NIX 1
+#endif
+#ifdef AMIGA
+#define NIX 1
+#endif
+