--- ray/src/common/standard.h	1992/09/21 12:04:27	2.2
+++ ray/src/common/standard.h	1996/01/10 09:10:58	2.7
@@ -26,11 +26,13 @@ typedef struct {
 	XF  b;					/* backward */
 }  FULLXF;
 
+#ifndef  PI
 #ifdef	M_PI
 #define	 PI		M_PI
 #else
 #define	 PI		3.14159265358979323846
 #endif
+#endif
 
 #ifndef	 F_OK			/* mode bits for access(2) call */
 #define	 R_OK		4		/* readable */
@@ -59,15 +61,20 @@ extern char  errmsg[];			/* global buffer for error me
 #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
 #endif
 
 extern char  *sskip();
 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