# HG changeset patch # User Rik # Date 1301675878 25200 # Node ID 0f71b9639207c469c96a8f287405bf56597d432e # Parent 61cd086e9aebaac2b562bdebe1533dba7e39cc75 Correct typo in #include path for FLTK header files (bug #32972). diff -r 61cd086e9aeb -r 0f71b9639207 src/ChangeLog --- 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 + + * DLD-FUNCTIONS/__fltk_uigetfile__.cc, DLD-FUNCTIONS/__init_fltk__.cc: + Correct typo in #include path (bug #32972). + 2011-03-31 Rik * DLD-FUNCTIONS/onCleanup.cc: Remove non-existent @seealso link in diff -r 61cd086e9aeb -r 0f71b9639207 src/DLD-FUNCTIONS/__fltk_uigetfile__.cc --- 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 -#include +#include // FLTK headers may include X11/X.h which defines Complex, and that // conflicts with Octave's Complex typedef. We don't need the X11 diff -r 61cd086e9aeb -r 0f71b9639207 src/DLD-FUNCTIONS/__init_fltk__.cc --- 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 #include #include -#include +#include #include #include #include