--- ray/src/common/radogl.h	2003/06/26 00:58:09	3.8
+++ ray/src/common/radogl.h	2012/04/25 22:21:06	3.12
@@ -1,23 +1,28 @@
-/* RCSid $Id: radogl.h,v 3.8 2003/06/26 00:58:09 schorsch Exp $ */
+/* RCSid $Id: radogl.h,v 3.12 2012/04/25 22:21:06 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>
+#ifdef __APPLE__
+  #include <OpenGL/glu.h>
+#else
+  #ifdef _WIN32
+    #include <windows.h>
+  #endif
+  #include <GL/glu.h>
+#endif
 #include "color.h"
 #include "object.h"
 #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 */
@@ -72,7 +77,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);