Mercurial > octave

diff src/DLD-FUNCTIONS/__init_fltk__.cc @ 12205:be90f9e4548e

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 b4d26c65e7e6
children 4ae2a74ed04c
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/__init_fltk__.cc	Sat Jan 29 12:27:16 2011 -0500
+++ b/src/DLD-FUNCTIONS/__init_fltk__.cc	Sat Jan 29 12:56:29 2011 -0500
@@ -54,6 +54,12 @@
 #include <FL/fl_draw.H>
 #include <FL/gl.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 "cmd-edit.h"
 #include "lo-ieee.h"