Mercurial > octave

diff libinterp/dldfcn/__init_fltk__.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 538b57866b90
children dd6605e1eaea
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_fltk__.cc	Thu Feb 04 16:02:44 2016 -0500
+++ b/libinterp/dldfcn/__init_fltk__.cc	Thu Feb 04 16:56:02 2016 -0500
@@ -41,12 +41,13 @@
 #include "defun-dld.h"
 #include "error.h"
 #include "errwarn.h"
+#include "oct-opengl.h"
 #include "ov-fcn-handle.h"
 
 #ifdef HAVE_FLTK
 
 #if defined (HAVE_X_WINDOWS)
-#include <X11/Xlib.h>
+#  include <X11/Xlib.h>
 #endif
 
 #include <map>
@@ -54,8 +55,8 @@
 #include <sstream>
 #include <iostream>
 
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
+#if defined (WIN32)
+#  define WIN32_LEAN_AND_MEAN
 #endif
 
 #include <FL/Fl.H>