Mercurial > octave

changeset 21539:212bafe8413a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gl2ps-print.cc: Fix compiling whet --without-opengl used. * gl2ps-print.cc: Move #include "gl2ps-print.h" outside of HAVE_GL2PS_H ifdef.
author Rik <rik@octave.org>
date Fri, 25 Mar 2016 16:37:52 -0700
parents eb15bc7c5c0b
children ffb4770ba079
files libinterp/corefcn/gl2ps-print.cc
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/gl2ps-print.cc	Fri Mar 25 14:37:37 2016 -0700
+++ b/libinterp/corefcn/gl2ps-print.cc	Fri Mar 25 16:37:52 2016 -0700
@@ -24,7 +24,9 @@
 #  include "config.h"
 #endif
 
+// Both header files are required outside of HAVE_GLP2S_H
 #include "errwarn.h"
+#include "gl2ps-print.h"
 
 #ifdef HAVE_GL2PS_H
 
@@ -38,7 +40,6 @@
 #include "oct-locbuf.h"
 #include "unwind-prot.h"
 
-#include "gl2ps-print.h"
 #include "gl-render.h"
 #include "oct-opengl.h"
 #include "sighandlers.h"
@@ -823,8 +824,6 @@
   rend.finish ();
 
 #else
-
   err_disabled_feature ("gl2ps_print", "gl2ps");
-
 #endif
 }