From 7024eecdbad620fdfbb4b505363f8f61c80a1180 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 19 May 2011 03:44:41 +0200 Subject: [PATCH] std/windows.hpp can be included without any defines now --- base/memory_mapped_file.hpp | 6 ++---- std/windows.hpp | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/base/memory_mapped_file.hpp b/base/memory_mapped_file.hpp index c520d65fb9..f5e5defc2d 100644 --- a/base/memory_mapped_file.hpp +++ b/base/memory_mapped_file.hpp @@ -3,10 +3,8 @@ #include "../std/target_os.hpp" -#ifdef OMIM_OS_WINDOWS - #include "../std/windows.hpp" - #include "../std/stdio.hpp" -#endif +#include "../std/windows.hpp" +#include "../std/stdio.hpp" class MemoryMappedFile { diff --git a/std/windows.hpp b/std/windows.hpp index 3484605265..714c555889 100644 --- a/std/windows.hpp +++ b/std/windows.hpp @@ -1,5 +1,8 @@ #pragma once +#include "target_os.hpp" + +#ifdef OMIM_OS_WINDOWS // These defines are moved to common.pri because // they should be equal for all libraries, even for 3party ones @@ -31,3 +34,5 @@ #undef min #undef max + +#endif // OMIM_OS_WINDOWS