diff -r f2e38d537544 src/hugin1/executor/hugin_executor.cpp --- a/src/hugin1/executor/hugin_executor.cpp Tue Sep 29 21:22:17 2015 +0200 +++ b/src/hugin1/executor/hugin_executor.cpp Wed Sep 30 14:32:57 2015 +0200 @@ -35,6 +35,11 @@ #include #include #include +// undefine DIFFERENCE defined in windows.h (included by wx/app.h) +#ifdef DIFFERENCE +#undef DIFFERENCE +#endif + #include "base_wx/huginConfig.h" #include "base_wx/platform.h" #include "panodata/Panorama.h"