--- ray/src/common/standard.h	1998/06/17 13:28:16	2.12
+++ ray/src/common/standard.h	1998/12/16 18:16:12	2.14
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 /* SCCSid "$SunId$ SGI" */
 
@@ -43,6 +43,13 @@ 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
+
 extern int  eputs(), wputs();	/* standard error output functions */
 
 				/* error codes */
@@ -69,6 +76,22 @@ extern struct erract {
 
 extern char  errmsg[];			/* global buffer for error messages */
 
+#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	NOSTRUCTASS
 #define	 copystruct(d,s)	bcopy((char *)(s),(char *)(d),sizeof(*(d)))
@@ -76,7 +99,7 @@ extern char  errmsg[];			/* global buffer for error me
 #define	 copystruct(d,s)	(*(d) = *(s))
 #endif
 
-#ifdef	 BSD
+#ifdef  BSD
 extern long  lseek();
 #else
 #define	 bcopy(s,d,n)		(void)memcpy(d,s,n)