--- ray/src/common/color.h	2003/06/27 06:53:21	2.22
+++ ray/src/common/color.h	2003/07/14 22:23:59	2.25
@@ -1,4 +1,4 @@
-/* RCSid $Id: color.h,v 2.22 2003/06/27 06:53:21 greg Exp $ */
+/* RCSid $Id: color.h,v 2.25 2003/07/14 22:23:59 schorsch Exp $ */
 /*
  *  color.h - header for routines using pixel color values.
  *
@@ -11,13 +11,13 @@
  */
 #ifndef _RAD_COLOR_H_
 #define _RAD_COLOR_H_
+
+#include <stdlib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #define  RED		0
 #define  GRN		1
 #define  BLU		2
@@ -197,11 +197,7 @@ extern COLOR  cblack, cwhite;	/* black (0,0,0) and whi
 
 #define  rgb_cie(xyz,rgb)	colortrans(xyz,rgb2xyzmat,rgb)
 
-#ifdef BSD
-#define  cpcolormat(md,ms)	bcopy((void *)ms,(void *)md,sizeof(COLORMAT))
-#else
 #define  cpcolormat(md,ms)	memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
-#endif
 
 					/* defined in color.c */
 extern char	*tempbuffer(unsigned int len);