From 81ad4a5a7ad78c0d21967a220ad5e41ef09651ce Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Wed, 26 Jan 2011 16:42:58 +0200
Subject: [PATCH] Mingw compilation fixes

---
 base/memory_mapped_file.cpp | 10 +++-------
 base/memory_mapped_file.hpp |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/base/memory_mapped_file.cpp b/base/memory_mapped_file.cpp
index 8a38c1ed5a..4e3f0005f6 100644
--- a/base/memory_mapped_file.cpp
+++ b/base/memory_mapped_file.cpp
@@ -1,10 +1,6 @@
-#include "../base/SRC_FIRST.hpp"
-
 #include "memory_mapped_file.hpp"
 
-#ifdef OMIM_OS_WINDOWS
-  #include "../coding/internal/file64_api.hpp"
-#else
+#ifndef OMIM_OS_WINDOWS
   #include <sys/mman.h>
   #include <sys/errno.h>
   #include <sys/stat.h>
@@ -21,7 +17,7 @@ MemoryMappedFile::MemoryMappedFile(char const * fileName, bool isReadOnly)
   m_size = ftell(m_fp);
   fseek(m_fp, 0, SEEK_SET);
 
-  m_data = malloc(m_size);
+  m_data = reinterpret_cast<void *>(new char[m_size]);
   fread(m_data, 1, m_size, m_fp);
 #else
   struct stat s;
@@ -40,7 +36,7 @@ MemoryMappedFile::~MemoryMappedFile()
     fwrite(m_data, 1, m_size, m_fp);
   }
   fclose(m_fp);
-  free(m_data);
+  delete[] reinterpret_cast<char *>(m_data);
 #else
   munmap(m_data, m_size);
   close(m_fd);
diff --git a/base/memory_mapped_file.hpp b/base/memory_mapped_file.hpp
index 4e74e95f99..895d01d26b 100644
--- a/base/memory_mapped_file.hpp
+++ b/base/memory_mapped_file.hpp
@@ -4,6 +4,7 @@
 
 #ifdef OMIM_OS_WINDOWS
   #include "../std/windows.hpp"
+  #include "../std/stdio.hpp"
 #endif
 
 class MemoryMappedFile