gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

std/windows.hpp can be included without any defines now

Browse source
This commit is contained in:
Alex Zolotarev 2011-05-19 03:44:41 +02:00 • committed by Alex Zolotarev
parent 73d696d3f1
commit 7024eecdba
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
base/memory_mapped_file.hpp
View file

@ -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
{

5
std/windows.hpp
View file

@ -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