Mercurial > octave-nkf
changeset 12565:0f71b9639207
Correct typo in #include path for FLTK header files (bug #32972).
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Fri, 01 Apr 2011 09:37:58 -0700 |
parents | 61cd086e9aeb |
children | 3b0eb443c519 |
files | src/ChangeLog src/DLD-FUNCTIONS/__fltk_uigetfile__.cc src/DLD-FUNCTIONS/__init_fltk__.cc |
diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 01 03:52:05 2011 -0600 +++ b/src/ChangeLog Fri Apr 01 09:37:58 2011 -0700 @@ -1,3 +1,8 @@ +2011-04-01 Rik <octave@nomad.inbox5.com> + + * DLD-FUNCTIONS/__fltk_uigetfile__.cc, DLD-FUNCTIONS/__init_fltk__.cc: + Correct typo in #include path (bug #32972). + 2011-03-31 Rik <octave@nomad.inbox5.com> * DLD-FUNCTIONS/onCleanup.cc: Remove non-existent @seealso link in
--- a/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc Fri Apr 01 03:52:05 2011 -0600 +++ b/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc Fri Apr 01 09:37:58 2011 -0700 @@ -27,7 +27,7 @@ #if defined (HAVE_FLTK) #include <FL/Fl.H> -#include <Fl/Fl_File_Chooser.H> +#include <FL/Fl_File_Chooser.H> // FLTK headers may include X11/X.h which defines Complex, and that // conflicts with Octave's Complex typedef. We don't need the X11
--- a/src/DLD-FUNCTIONS/__init_fltk__.cc Fri Apr 01 03:52:05 2011 -0600 +++ b/src/DLD-FUNCTIONS/__init_fltk__.cc Fri Apr 01 09:37:58 2011 -0700 @@ -44,7 +44,7 @@ #include <FL/Fl_Box.H> #include <FL/Fl_Button.H> #include <FL/Fl_Choice.H> -#include <Fl/Fl_File_Chooser.H> +#include <FL/Fl_File_Chooser.H> #include <FL/Fl_Gl_Window.H> #include <FL/Fl_Menu_Bar.H> #include <FL/Fl_Menu_Button.H>