From 858916b951e92127c22503826b746d1e70c433f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 7 Dec 2013 03:51:21 +0100
Subject: Fix build failures on Windows.

* remove atoll
* fix include path of updater depends
---
 mmc_updater/CMakeLists.txt         | 2 +-
 mmc_updater/src/UpdaterOptions.cpp | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/mmc_updater/CMakeLists.txt b/mmc_updater/CMakeLists.txt
index ef4b096d..61c8cd09 100644
--- a/mmc_updater/CMakeLists.txt
+++ b/mmc_updater/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 include_directories(depends)
 
 if (WIN32)
-    include_directories(depends/win32cpp/include)
+    include_directories(depends/win32cpp)
 
     if(MSVC)
 		# - Link the updater binary statically with the Visual C++ runtime
diff --git a/mmc_updater/src/UpdaterOptions.cpp b/mmc_updater/src/UpdaterOptions.cpp
index 1ea820d2..e7809fb8 100644
--- a/mmc_updater/src/UpdaterOptions.cpp
+++ b/mmc_updater/src/UpdaterOptions.cpp
@@ -9,13 +9,6 @@
 #include <cstdlib>
 #include <iostream>
 
-#ifdef PLATFORM_WINDOWS
-long long atoll(const char* string)
-{
-	return _atoi64(string);
-}
-#endif
-
 UpdaterOptions::UpdaterOptions()
 : mode(UpdateInstaller::Setup)
 , waitPid(0)
-- 
cgit v1.2.3