From 4606f80b9461bee251ca4019bf3b31c0f0f392da Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Mon, 24 Jan 2011 22:41:40 +0200
Subject: [PATCH] Fix memory_mapped_file to correctly build in mingw (windows).

---
 base/memory_mapped_file.cpp | 16 +++++++++++-----
 base/memory_mapped_file.hpp |  9 ++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/base/memory_mapped_file.cpp b/base/memory_mapped_file.cpp
index 9c11b30a33..8a38c1ed5a 100644
--- a/base/memory_mapped_file.cpp
+++ b/base/memory_mapped_file.cpp
@@ -1,15 +1,21 @@
 #include "../base/SRC_FIRST.hpp"
 
-// it's a shit; remove this into coding folder
-#include "../coding/internal/file64_api.hpp"
-
 #include "memory_mapped_file.hpp"
 
+#ifdef OMIM_OS_WINDOWS
+  #include "../coding/internal/file64_api.hpp"
+#else
+  #include <sys/mman.h>
+  #include <sys/errno.h>
+  #include <sys/stat.h>
+  #include <sys/fcntl.h>
+#endif
+
 
 MemoryMappedFile::MemoryMappedFile(char const * fileName, bool isReadOnly)
   : m_isReadOnly(isReadOnly)
 {
-#ifdef OMIM_OS_WINDOWS_NATIVE
+#ifdef OMIM_OS_WINDOWS
   m_fp = fopen(fileName, isReadOnly ? "r" : "w");
   fseek(m_fp, 0, SEEK_END);
   m_size = ftell(m_fp);
@@ -28,7 +34,7 @@ MemoryMappedFile::MemoryMappedFile(char const * fileName, bool isReadOnly)
 
 MemoryMappedFile::~MemoryMappedFile()
 {
-#ifdef OMIM_OS_WINDOWS_NATIVE
+#ifdef OMIM_OS_WINDOWS
   if (!m_isReadOnly)
   {
     fwrite(m_data, 1, m_size, m_fp);
diff --git a/base/memory_mapped_file.hpp b/base/memory_mapped_file.hpp
index aad644d18c..4e74e95f99 100644
--- a/base/memory_mapped_file.hpp
+++ b/base/memory_mapped_file.hpp
@@ -2,20 +2,15 @@
 
 #include "../std/target_os.hpp"
 
-#ifdef OMIM_OS_WINDOWS_NATIVE
+#ifdef OMIM_OS_WINDOWS
   #include "../std/windows.hpp"
-#else
-  #include <sys/mman.h>
-  #include <sys/errno.h>
-  #include <sys/stat.h>
-  #include <sys/fcntl.h>
 #endif
 
 class MemoryMappedFile
 {
   bool m_isReadOnly;
 
-#ifdef OMIM_OS_WINDOWS_NATIVE
+#ifdef OMIM_OS_WINDOWS
   FILE * m_fp;
 #else
   int    m_fd;