--- ray/src/common/standard.h	1997/11/11 19:53:29	2.9
+++ ray/src/common/standard.h	1999/07/12 10:27:59	2.15
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 /* SCCSid "$SunId$ SGI" */
 
@@ -8,6 +8,8 @@
 
 #include  <stdio.h>
 
+#include  <sys/types.h>
+
 #include  <fcntl.h>
 
 #include  <math.h>
@@ -28,7 +30,7 @@ typedef struct {
 
 #ifndef  PI
 #ifdef	M_PI
-#define	 PI		M_PI
+#define	 PI		((double)M_PI)
 #else
 #define	 PI		3.14159265358979323846
 #endif
@@ -41,16 +43,23 @@ 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 */
-#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  NERRS		7
+#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 */
@@ -67,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)))
@@ -74,15 +99,19 @@ extern char  errmsg[];			/* global buffer for error me
 #define	 copystruct(d,s)	(*(d) = *(s))
 #endif
 
-#ifndef	 BSD
+#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(), *sskip2();
+extern char  *nextword(), *sskip(), *sskip2();
 extern char  *getpath(), *getenv();
 #ifndef malloc
 extern char  *malloc(), *calloc(), *realloc();