diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-07-16 00:19:18 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-28 07:31:11 -0700 |
| commit | ab7d6a73d4e1193120f5790cdf01ff6a0792a1ec (patch) | |
| tree | bb15b431947347beee2b4661ff19431657edd508 /desktop-widgets/mapwidget.h | |
| parent | c2e172a87477800c8a3488bb6aee6b79f7bc743b (diff) | |
| download | subsurface-ab7d6a73d4e1193120f5790cdf01ff6a0792a1ec.tar.gz | |
mapwidget.h: force-undefine the IGNORE macro from winbase.h
By including <QQuickWidget>, <winbase.h> is included from <windows.h>.
<winabase.h> 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 <neolit123@gmail.com>
Diffstat (limited to 'desktop-widgets/mapwidget.h')
| -rw-r--r-- | desktop-widgets/mapwidget.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 <QQuickWidget>
+#undef IGNORE
+
class QResizeEvent;
class QQuickItem;
struct dive_site;
|