Mercurial > octave-nkf
diff src/DLD-FUNCTIONS/__fltk_uigetfile__.cc @ 12285:db14b8095edd release-3-4-x
#undef Complex after including FLTK headers
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 29 Jan 2011 12:56:29 -0500 |
parents | 83133b5bf392 |
children | 6212f303243e |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc Sat Jan 29 12:27:16 2011 -0500 +++ b/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc Sat Jan 29 12:56:29 2011 -0500 @@ -28,6 +28,13 @@ #include <FL/Fl.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 +// Complex definition in this file, so remove it before including Octave +// headers which may require Octave's Complex typedef. +#undef Complex + #include "defun-dld.h" #include "file-ops.h"