Mercurial > octave
changeset 30003:66763afc32c9
* __init_fltk__.cc: Make HAVE_FLTK apply only to fltk headers.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 18 Aug 2021 13:26:14 -0400 |
| parents | 1cf04058fea6 |
| children | 2c40f84bfe10 |
| files | libinterp/dldfcn/__init_fltk__.cc |
| diffstat | 1 files changed, 16 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_fltk__.cc Wed Aug 18 19:18:30 2021 +0200 +++ b/libinterp/dldfcn/__init_fltk__.cc Wed Aug 18 13:26:14 2021 -0400 @@ -42,8 +42,6 @@ #include "error.h" #include "errwarn.h" -#if defined (HAVE_FLTK) - #if defined (HAVE_X_WINDOWS) # include <X11/Xlib.h> #endif @@ -60,20 +58,22 @@ # define WIN32_LEAN_AND_MEAN #endif -#include <FL/Fl.H> -#include <FL/Fl_Box.H> -#include <FL/Fl_Button.H> -#include <FL/Fl_Choice.H> -#include <FL/Fl_File_Chooser.H> -#include <FL/Fl_Gl_Window.H> -#include <FL/names.h> -#include <FL/Fl_Menu_Bar.H> -#include <FL/Fl_Menu_Button.H> -#include <FL/Fl_Output.H> -#include <FL/Fl_Window.H> -#include <FL/fl_ask.H> -#include <FL/fl_draw.H> -#include <FL/gl.h> +#if defined (HAVE_FLTK) +# include <FL/Fl.H> +# include <FL/Fl_Box.H> +# include <FL/Fl_Button.H> +# include <FL/Fl_Choice.H> +# include <FL/Fl_File_Chooser.H> +# include <FL/Fl_Gl_Window.H> +# include <FL/names.h> +# include <FL/Fl_Menu_Bar.H> +# include <FL/Fl_Menu_Button.H> +# include <FL/Fl_Output.H> +# include <FL/Fl_Window.H> +# include <FL/fl_ask.H> +# include <FL/fl_draw.H> +# include <FL/gl.h> +#endif // FLTK headers may include X11/X.h which defines Complex, and that // conflicts with Octave's Complex typedef. We don't need the X11 @@ -105,8 +105,6 @@ #include "parse.h" #include "variables.h" -#endif - OCTAVE_NAMESPACE_BEGIN #if defined (HAVE_FLTK)