summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-02-27 03:49:24 +0200
committerAndrei Karas <akaras@inbox.ru>2011-02-27 03:49:24 +0200
commit41e84157e0eca3a494cd6d44eec96dfbde0f5626 (patch)
treedec434c85d94495e8cf671f14b9b344d7d4de8f1
parent1b57518ca97c670174f89c5af28659b6ad0c3d42 (diff)
parent4eebbd313a182296ba561e2cdfebdebf473d0889 (diff)
downloadplus-41e84157e0eca3a494cd6d44eec96dfbde0f5626.tar.gz
plus-41e84157e0eca3a494cd6d44eec96dfbde0f5626.tar.bz2
plus-41e84157e0eca3a494cd6d44eec96dfbde0f5626.tar.xz
plus-41e84157e0eca3a494cd6d44eec96dfbde0f5626.zip
Merge branch 'master' into coloritems
-rw-r--r--src/gui/updatewindow.cpp2
-rw-r--r--src/gui/updatewindow.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index f4281cff1..542d665d5 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -673,7 +673,7 @@ void UpdaterWindow::logic()
}
}
-bool UpdaterWindow::validateFile(std::string filePath, long hash)
+bool UpdaterWindow::validateFile(std::string filePath, unsigned long hash)
{
FILE *file = fopen(filePath.c_str(), "rb");
if (!file)
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 13b72f3a8..03fd57d1c 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -136,7 +136,7 @@ private:
static size_t memoryWrite(void *ptr, size_t size, size_t nmemb,
void *stream);
- bool validateFile(std::string filePath, long hash);
+ bool validateFile(std::string filePath, unsigned long hash);
enum UpdateDownloadStatus
{