From 5f9861953eff5f9755f29e9bab6254ae4206937e Mon Sep 17 00:00:00 2001
From: Philip Kaufmann <phil.kaufmann@t-online.de>
Date: Thu, 17 May 2012 18:30:09 +0200
Subject: [PATCH] fix RenameOver() and FileCommit() functions, to not generate
 compilation errors

---
 src/main.h   | 4 ----
 src/util.cpp | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main.h b/src/main.h
index d9eea2a3..3da2e0c5 100644
--- a/src/main.h
+++ b/src/main.h
@@ -10,10 +10,6 @@
 #include "net.h"
 #include "script.h"
 
-#ifdef WIN32
-#include <io.h> /* for _commit */
-#endif
-
 #include <list>
 
 class CWallet;
diff --git a/src/util.cpp b/src/util.cpp
index 82c16fed..7a163632 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -47,6 +47,7 @@ namespace boost {
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
+#include <io.h> /* for _commit */
 #include "shlobj.h"
 #endif
 
@@ -913,7 +914,7 @@ void CreatePidFile(const boost::filesystem::path &path, pid_t pid)
 bool RenameOver(boost::filesystem::path src, boost::filesystem::path dest)
 {
 #ifdef WIN32
-    return MoveFileEx(src.string().c_str(), dest.string().c_str(),
+    return MoveFileExA(src.string().c_str(), dest.string().c_str(),
                       MOVEFILE_REPLACE_EXISTING);
 #else
     int rc = std::rename(src.string().c_str(), dest.string().c_str());