--- ray/src/common/radogl.h 2003/07/14 22:23:59 3.10 +++ ray/src/common/radogl.h 2012/04/25 22:21:06 3.12 @@ -1,4 +1,4 @@ -/* RCSid $Id: radogl.h,v 3.10 2003/07/14 22:23:59 schorsch Exp $ */ +/* RCSid $Id: radogl.h,v 3.12 2012/04/25 22:21:06 greg Exp $ */ /* * Header file for Radiance - OpenGL routines. */ @@ -6,7 +6,14 @@ #define _RAD_RADOGL_H_ #include "standard.h" -#include +#ifdef __APPLE__ + #include +#else + #ifdef _WIN32 + #include + #endif + #include +#endif #include "color.h" #include "object.h" #include "otypes.h" @@ -70,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);