--- ray/src/rt/data.h	2003/02/25 02:47:22	2.5
+++ ray/src/rt/data.h	2003/06/27 06:53:22	2.7
@@ -1,10 +1,13 @@
-/* RCSid $Id: data.h,v 2.5 2003/02/25 02:47:22 greg Exp $ */
+/* RCSid $Id: data.h,v 2.7 2003/06/27 06:53:22 greg Exp $ */
 /*
  * Header for data file loading and computation routines.
  */
+#ifndef _RAD_DATA_H_
+#define _RAD_DATA_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
-
 #define  MAXDDIM	5		/* maximum data dimensions */
 
 #define  DATATYPE	float		/* single precision to save space */
@@ -26,18 +29,15 @@ typedef struct datarray {
 	struct datarray  *next;		/* next array in list */
 } DATARRAY;			/* a data array */
 
-#ifdef NOPROTO
 
-extern DATARRAY	*getdata();
-extern DATARRAY	*getpict();
-extern void	freedata();
-extern double	datavalue();
-
-#else
-
 extern DATARRAY	*getdata(char *dname);
 extern DATARRAY	*getpict(char *pname);
 extern void	freedata(DATARRAY *dta);
 extern double	datavalue(DATARRAY *dp, double *pt);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_DATA_H_ */
+