Mercurial > octave

comparison libinterp/dldfcn/__osmesa_print__.cc @ 21196:bd96c2efd4fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move include statements for OpenGL headers to a single file * oct-opengl.h: New file. * libinterp/corefcn/module.mk: Update. * Canvas.cc, gl-select.cc, gl-select.h, gl-render.cc, gl-render.h, gl2ps-renderer.cc, __init_fltk__.cc, __osmesa_print__.cc: Update include statements.
author John W. Eaton <jwe@octave.org>
date Thu, 04 Feb 2016 16:56:02 -0500
parents bd1752782e56
children 9a5bb6996b16
comparison
equal deleted inserted replaced
21195:53ac24e210e4 21196:bd96c2efd4fe
29 29
30 #include "oct-locbuf.h" 30 #include "oct-locbuf.h"
31 #include "unwind-prot.h" 31 #include "unwind-prot.h"
32 32
33 #include "defun-dld.h" 33 #include "defun-dld.h"
34 #include "errwarn.h"
34 #include "gl-render.h" 35 #include "gl-render.h"
35 #include "gl2ps-renderer.h" 36 #include "gl2ps-renderer.h"
36 #include "graphics.h" 37 #include "graphics.h"
37 #include "errwarn.h" 38 #include "oct-opengl.h"
38 39
39 #if defined (HAVE_OSMESA_H) 40 #if defined (HAVE_OSMESA_H)
40 #include "osmesa.h" 41 # include "osmesa.h"
41 #elif defined (HAVE_GL_OSMESA_H) 42 #elif defined (HAVE_GL_OSMESA_H)
42 #include "GL/osmesa.h" 43 # include "GL/osmesa.h"
43 #endif 44 #endif
44 45
45 #if defined (HAVE_OSMESA) && defined (HAVE_OPENGL) 46 #if defined (HAVE_OSMESA) && defined (HAVE_OPENGL)
46 static void 47 static void
47 close_fcn (FILE *f) 48 close_fcn (FILE *f)