Mercurial > octave-nkf
changeset 7965:6a6a030a3517
Fix compilation under MSVC
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 22 Jul 2008 16:03:44 -0400 |
| parents | 9cd3ee5298a0 |
| children | 5747be3ac497 |
| files | src/ChangeLog src/DLD-FUNCTIONS/fltk_backend.cc |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Jul 22 16:03:19 2008 -0400 +++ b/src/ChangeLog Tue Jul 22 16:03:44 2008 -0400 @@ -1,5 +1,8 @@ 2008-07-22 Michael Goffioul <michael.goffioul@gmail.com> + * DLD-FUNCTIONS/fltk_backend.cc: Undefine min/max after FLTK headers + inclusion. + * graphics.h.in (class base_graphics_event, class graphics_event): New classes (replace gh_manager::event_data). (class gh_manager::event_data): Remove.
--- a/src/DLD-FUNCTIONS/fltk_backend.cc Tue Jul 22 16:03:19 2008 -0400 +++ b/src/DLD-FUNCTIONS/fltk_backend.cc Tue Jul 22 16:03:44 2008 -0400 @@ -51,6 +51,11 @@ #include <FL/fl_draw.H> #include <FL/gl.h> +#ifdef min +#undef min +#undef max +#endif + #include "defun-dld.h" #include "error.h" #include "gl-render.h"