diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp index a3bc0027ce7f5c839a02e891e830b5ed2614f0e0..e18538746bd1feadaaa4b4c10bfe553b255070ab 100644 --- a/Fltk/Main.cpp +++ b/Fltk/Main.cpp @@ -4,10 +4,10 @@ // bugs and problems to <gmsh@geuz.org>. #include <string> -#include "GUI.h" -#include "menuWindow.h" #include "Gmsh.h" #include "GmshMessage.h" +#include "GUI.h" +#include "menuWindow.h" #include "Draw.h" #include "Context.h" #include "Options.h" diff --git a/Geo/OCCIncludes.h b/Geo/OCCIncludes.h index d702db77aa4b72f2436893b17f4f0a41a1289570..76c230ca82e5cfc31d00853221e08967be5448ac 100644 --- a/Geo/OCCIncludes.h +++ b/Geo/OCCIncludes.h @@ -110,11 +110,9 @@ using std::iostream; #include "BRepAlgoAPI_Cut.hxx" #endif -// some Windows versions define min/max macros! #if defined(WIN32) #undef min #undef max #endif #endif -