--- ray/src/common/standard.h	1997/11/14 12:31:06	2.10
+++ ray/src/common/standard.h	1998/08/12 17:57:44	2.13
@@ -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,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 */
@@ -74,13 +83,17 @@ 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  *getpath(), *getenv();