From 0b8c44e2d601d4fe8eaff9bdc9b42045defb578f Mon Sep 17 00:00:00 2001
From: ExMix <Rahuba.youri@gmail.com>
Date: Tue, 26 Feb 2013 10:49:38 +0300
Subject: [PATCH] different fixes for build on Windows platform

---
 base/condition_windows_native.cpp | 1 -
 base/timer.cpp                    | 8 ++++++++
 platform/platform_win.cpp         | 4 ----
 search/keyword_matcher.cpp        | 6 +++---
 version/version.pro               | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/base/condition_windows_native.cpp b/base/condition_windows_native.cpp
index 73c3a1e8a6..ec8f87396f 100644
--- a/base/condition_windows_native.cpp
+++ b/base/condition_windows_native.cpp
@@ -168,7 +168,6 @@ namespace threads
       void Wait()
       {
         Wait(-1);
-        return false;
       }
 
       bool Wait(unsigned ms)
diff --git a/base/timer.cpp b/base/timer.cpp
index afc92bd0ea..7f6056b85a 100644
--- a/base/timer.cpp
+++ b/base/timer.cpp
@@ -78,6 +78,8 @@ namespace
     tzset();
 
     return ret;
+#elif defined(OMIM_OS_WINDOWS)
+    return mktime(tm);
 #else
     return timegm(tm);
 #endif
@@ -88,8 +90,14 @@ string TimestampToString(time_t time)
 {
   tm * t = gmtime(&time);
   char buf[21] = { 0 };
+#ifdef OMIM_OS_WINDOWS
+  sprintf_s(buf, ARRAY_SIZE(buf), "%04d-%02d-%02dT%02d:%02d:%02dZ", t->tm_year + 1900,
+            t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+#else
   ::snprintf(buf, ARRAY_SIZE(buf), "%04d-%02d-%02dT%02d:%02d:%02dZ", t->tm_year + 1900,
              t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+#endif
+
   return buf;
 }
 
diff --git a/platform/platform_win.cpp b/platform/platform_win.cpp
index 399caf370a..43541563e9 100644
--- a/platform/platform_win.cpp
+++ b/platform/platform_win.cpp
@@ -86,10 +86,6 @@ Platform::Platform()
   LOG(LDEBUG, ("Settings Directory:", m_settingsDir));
 }
 
-Platform::~Platform()
-{
-}
-
 bool Platform::IsFileExistsByFullPath(string const & filePath)
 {
   return ::GetFileAttributesA(filePath.c_str()) != INVALID_FILE_ATTRIBUTES;
diff --git a/search/keyword_matcher.cpp b/search/keyword_matcher.cpp
index 1c6846b420..0f6502a748 100644
--- a/search/keyword_matcher.cpp
+++ b/search/keyword_matcher.cpp
@@ -47,7 +47,7 @@ KeywordMatcher::ScoreT KeywordMatcher::Score(StringT const * tokens, size_t coun
   vector<bool> isNameTokenMatched(count);
   uint32_t numQueryTokensMatched = 0;
   uint32_t sumTokenMatchDistance = 0;
-  uint32_t prevTokenMatchDistance = 0;
+  int32_t prevTokenMatchDistance = 0;
   bool bPrefixMatched = true;
 
   for (int i = 0; i < m_keywords.size(); ++i)
@@ -55,7 +55,7 @@ KeywordMatcher::ScoreT KeywordMatcher::Score(StringT const * tokens, size_t coun
       if (!isNameTokenMatched[j] && m_keywords[i] == tokens[j])
       {
         isQueryTokenMatched[i] = isNameTokenMatched[j] = true;
-        uint32_t const tokenMatchDistance = i - j;
+        int32_t const tokenMatchDistance = i - j;
         sumTokenMatchDistance += abs(tokenMatchDistance - prevTokenMatchDistance);
         prevTokenMatchDistance = tokenMatchDistance;
       }
@@ -68,7 +68,7 @@ KeywordMatcher::ScoreT KeywordMatcher::Score(StringT const * tokens, size_t coun
           StartsWith(tokens[j].begin(), tokens[j].end(), m_prefix.begin(), m_prefix.end()))
       {
         isNameTokenMatched[j] = bPrefixMatched = true;
-        uint32_t const tokenMatchDistance = int(m_keywords.size()) - j;
+        int32_t const tokenMatchDistance = int(m_keywords.size()) - j;
         sumTokenMatchDistance += abs(tokenMatchDistance - prevTokenMatchDistance);
       }
   }
diff --git a/version/version.pro b/version/version.pro
index 7a7b5755c6..74b0b5be94 100644
--- a/version/version.pro
+++ b/version/version.pro
@@ -13,7 +13,7 @@ VERSION_HEADER = ../../omim/version/version.hpp
 
 versiontarget.target = $$VERSION_HEADER
 win32 {
-  versiontarget.commands = C:\\Progra~1\\Git\\bin\\bash.exe $${IN_PWD}/../tools/unix/generate_version.sh $${IN_PWD}/.. $$VERSION_MAJOR $$VERSION_MINOR $$VERSION_HEADER
+  versiontarget.commands = bash.exe $${IN_PWD}/../tools/unix/generate_version.sh $${IN_PWD}/.. $$VERSION_MAJOR $$VERSION_MINOR $$VERSION_HEADER
 }
 !win32 {
   versiontarget.commands = $${IN_PWD}/../tools/unix/generate_version.sh $${IN_PWD}/.. $$VERSION_MAJOR $$VERSION_MINOR $$VERSION_HEADER