Mercurial > octave-nkf

comparison src/DLD-FUNCTIONS/__fltk_uigetfile__.cc @ 12285:db14b8095edd release-3-4-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#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
comparison
equal deleted inserted replaced
12284:b3ac1d094a3f 12285:db14b8095edd
26 26
27 #if defined (HAVE_FLTK) 27 #if defined (HAVE_FLTK)
28 28
29 #include <FL/Fl.H> 29 #include <FL/Fl.H>
30 #include <Fl/Fl_File_Chooser.H> 30 #include <Fl/Fl_File_Chooser.H>
31
32 // FLTK headers may include X11/X.h which defines Complex, and that
33 // conflicts with Octave's Complex typedef. We don't need the X11
34 // Complex definition in this file, so remove it before including Octave
35 // headers which may require Octave's Complex typedef.
36 #undef Complex
37
31 #include "defun-dld.h" 38 #include "defun-dld.h"
32 #include "file-ops.h" 39 #include "file-ops.h"
33 40
34 41
35 DEFUN_DLD (__fltk_uigetfile__, args, , 42 DEFUN_DLD (__fltk_uigetfile__, args, ,