Mercurial > octave
comparison src/gl-render.h @ 9941:1369f13ae6b2
several fixes by M. Goffioul
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Tue, 08 Dec 2009 12:45:58 +0100 |
parents | 3ec3b8e80b67 |
children | 7dedfd70dd9f |
comparison
equal
deleted
inserted
replaced
9940:1707df259536 | 9941:1369f13ae6b2 |
---|---|
23 #if !defined (gl_render_h) | 23 #if !defined (gl_render_h) |
24 #define gl_render_h 1 | 24 #define gl_render_h 1 |
25 | 25 |
26 #ifdef HAVE_WINDOWS_H | 26 #ifdef HAVE_WINDOWS_H |
27 #include <windows.h> | 27 #include <windows.h> |
28 #ifdef max | |
29 # undef min | |
30 # undef max | |
31 #endif | |
28 #endif | 32 #endif |
29 | 33 |
30 #ifdef HAVE_GL_GL_H | 34 #ifdef HAVE_GL_GL_H |
31 #include <GL/gl.h> | 35 #include <GL/gl.h> |
32 #elif defined HAVE_OPENGL_GL_H || defined HAVE_FRAMEWORK_OPENGL | 36 #elif defined HAVE_OPENGL_GL_H || defined HAVE_FRAMEWORK_OPENGL |