From 1d626c2785117f9c9bf6683d98f57e825a9e7938 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sun, 21 Jun 2015 17:52:38 +0200 Subject: use WIN32_LEAN_AND_MEAN macro when including windows.h this avoids some problematic includes, so we no longer have to #undef interface. Also it should speed up building a bit. --- src/interface-curses.cpp | 7 +------ src/ioview.cpp | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/interface-curses.cpp b/src/interface-curses.cpp index aabadc4..b6a2a6f 100644 --- a/src/interface-curses.cpp +++ b/src/interface-curses.cpp @@ -59,13 +59,8 @@ #ifdef HAVE_WINDOWS_H /* here it shouldn't cause conflicts with other headers */ +#define WIN32_LEAN_AND_MEAN #include - -/* - * MinGW headers define an `interface` macro to work around - * Objective C issues - */ -#undef interface #endif /** diff --git a/src/ioview.cpp b/src/ioview.cpp index 713b3fb..5f50580 100644 --- a/src/ioview.cpp +++ b/src/ioview.cpp @@ -41,13 +41,8 @@ #ifdef HAVE_WINDOWS_H /* here it shouldn't cause conflicts with other headers */ +#define WIN32_LEAN_AND_MEAN #include - -/* - * MinGW headers define an `interface` macro to work around - * Objective C issues - */ -#undef interface #endif namespace SciTECO { -- cgit v1.2.3