# HG changeset patch # User John W. Eaton # Date 1216757024 14400 # Node ID 6a6a030a3517d0f168fe5b1bfec8729a2af23f3a # Parent 9cd3ee5298a0770a9b446e91f5f3d694aad38d12 Fix compilation under MSVC diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2008-07-22 Michael Goffioul + * 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. diff --git a/src/DLD-FUNCTIONS/fltk_backend.cc b/src/DLD-FUNCTIONS/fltk_backend.cc --- a/src/DLD-FUNCTIONS/fltk_backend.cc +++ b/src/DLD-FUNCTIONS/fltk_backend.cc @@ -51,6 +51,11 @@ #include #include +#ifdef min +#undef min +#undef max +#endif + #include "defun-dld.h" #include "error.h" #include "gl-render.h"