--- ray/src/common/color.h	1991/10/24 12:15:07	1.14
+++ ray/src/common/color.h	1991/12/19 14:45:43	2.2
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 /* SCCSid "$SunId$ LBL" */
 
@@ -72,11 +72,6 @@ typedef float  COLOR[3];	/* red, green, blue */
 #define  WHTCOLR		{128,128,128,COLXS+1}
 #define  BLKCOLR		{0,0,0,0}
 
-				/* definitions for resolution header */
-#define  XDECR			1
-#define  YDECR			2
-#define  YMAJOR			4
-
 				/* picture format identifier */
 #define  COLRFMT		"32-bit_rle_rgbe"
 
@@ -103,4 +98,7 @@ typedef float  COLOR[3];	/* red, green, blue */
 #define  fputcolcor(cc,fp)	fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
 					(cc)[RED],(cc)[GRN],(cc)[BLU])
 
-extern double  ldexp(), atof();
+extern double  ldexp();
+#ifndef atof			/* atof's a macro on some systems! */
+extern double  atof();
+#endif