From ab7d6a73d4e1193120f5790cdf01ff6a0792a1ec Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sun, 16 Jul 2017 00:19:18 +0300 Subject: mapwidget.h: force-undefine the IGNORE macro from winbase.h By including , is included from . has the IGNORE macro defined. Undefine it localy in mapwidget.h to prevent a conflict with maintah.h's EditMode::IGNORE enum. NOTE: possibly similar case to the undefine in btdeviceselectiondialog.h:22. Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/mapwidget.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop-widgets/mapwidget.h b/desktop-widgets/mapwidget.h index b6203d28c..802d35153 100644 --- a/desktop-widgets/mapwidget.h +++ b/desktop-widgets/mapwidget.h @@ -3,6 +3,8 @@ #include +#undef IGNORE + class QResizeEvent; class QQuickItem; struct dive_site; -- cgit v1.2.3-70-g09d2