--- ray/src/common/color.h	2003/06/06 16:38:47	2.21
+++ ray/src/common/color.h	2003/07/30 10:11:06	2.26
@@ -1,4 +1,4 @@
-/* RCSid $Id: color.h,v 2.21 2003/06/06 16:38:47 schorsch Exp $ */
+/* RCSid $Id: color.h,v 2.26 2003/07/30 10:11:06 schorsch Exp $ */
 /*
  *  color.h - header for routines using pixel color values.
  *
@@ -11,16 +11,13 @@
  */
 #ifndef _RAD_COLOR_H_
 #define _RAD_COLOR_H_
+
+#include <stdlib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-#include "copyright.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
 #define  RED		0
 #define  GRN		1
 #define  BLU		2
@@ -200,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);
@@ -233,8 +226,8 @@ extern void	compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr
 extern void	comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
 extern void	comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
 					/* defined in colrops.c */
-extern int	setcolrcor(double (*f)(), double a2);
-extern int	setcolrinv(double (*f)(), double a2);
+extern int	setcolrcor(double (*f)(double, double), double a2);
+extern int	setcolrinv(double (*f)(double, double), double a2);
 extern int	setcolrgam(double g);
 extern int	colrs_gambs(COLR *scan, int len);
 extern int	gambs_colrs(COLR *scan, int len);