--- ray/src/common/radogl.h	2003/06/06 16:38:47	3.7
+++ ray/src/common/radogl.h	2003/09/16 06:31:48	3.11
@@ -1,16 +1,10 @@
-/* RCSid $Id: radogl.h,v 3.7 2003/06/06 16:38:47 schorsch Exp $ */
+/* RCSid $Id: radogl.h,v 3.11 2003/09/16 06:31:48 greg Exp $ */
 /*
  * Header file for Radiance - OpenGL routines.
  */
 #ifndef _RAD_RADOGL_H_
 #define _RAD_RADOGL_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-
-#include "copyright.h"
-
 #include "standard.h"
 #include <GL/glu.h>
 #include "color.h"
@@ -18,6 +12,10 @@ extern "C" {
 #include "otypes.h"
 #include "lookup.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAXLIGHTS	8	/* number of OGL light sources */
 
 #define MAXSPECEXP	128.	/* maximum allowed specular exponent */
@@ -58,7 +56,7 @@ extern void	domatvert(MATREC *mp, FVECT v, FVECT n);
 extern int	newglist(void);
 extern void	rgl_checkerr(char *where);
 extern int	rgl_filelist(int ic, char **inp, int *nl);
-extern int	rgl_octlist(char *fname, FVECT cent, FLOAT *radp, int *nl);
+extern int	rgl_octlist(char *fname, FVECT cent, RREAL *radp, int *nl);
 extern void	rgl_load(char *inpspec);
 extern void	rgl_object(char *name, FILE *fp);
 				/* defined in rglinst.c */
@@ -72,7 +70,7 @@ extern MATREC	*getmatp(char *nam);
 extern int	o_default(OBJREC *o);
 extern int	o_unsupported(OBJREC *o);
 extern MATREC	*newmaterial(char *nam);
-extern void	freemtl(MATREC *mp);
+extern void	freemtl(void *p);
 extern int	m_normal(OBJREC *o);
 extern int	m_aniso(OBJREC *o);
 extern int	m_glass(OBJREC *o);