ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/radogl.h
(Generate patch)

Comparing ray/src/common/radogl.h (file contents):
Revision 3.8 by schorsch, Thu Jun 26 00:58:09 2003 UTC vs.
Revision 3.12 by greg, Wed Apr 25 22:21:06 2012 UTC

# Line 4 | Line 4
4   */
5   #ifndef _RAD_RADOGL_H_
6   #define _RAD_RADOGL_H_
7 #ifdef __cplusplus
8 extern "C" {
9 #endif
7  
11
12 #include "copyright.h"
13
8   #include "standard.h"
9 < #include <GL/glu.h>
9 > #ifdef __APPLE__
10 >  #include <OpenGL/glu.h>
11 > #else
12 >  #ifdef _WIN32
13 >    #include <windows.h>
14 >  #endif
15 >  #include <GL/glu.h>
16 > #endif
17   #include "color.h"
18   #include "object.h"
19   #include "otypes.h"
20   #include "lookup.h"
21  
22 + #ifdef __cplusplus
23 + extern "C" {
24 + #endif
25 +
26   #define MAXLIGHTS       8       /* number of OGL light sources */
27  
28   #define MAXSPECEXP      128.    /* maximum allowed specular exponent */
# Line 72 | Line 77 | extern MATREC  *getmatp(char *nam);
77   extern int      o_default(OBJREC *o);
78   extern int      o_unsupported(OBJREC *o);
79   extern MATREC   *newmaterial(char *nam);
80 < extern void     freemtl(MATREC *mp);
80 > extern void     freemtl(void *p);
81   extern int      m_normal(OBJREC *o);
82   extern int      m_aniso(OBJREC *o);
83   extern int      m_glass(OBJREC *o);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines