From f98c7fc6d623b9750ce4d9a7f7654d5dfabc54be Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Fri, 2 Nov 2012 19:12:45 +0100 Subject: [PATCH] Fix type in osdrupgrade Signed-off-by: Sylvain Munaut --- osdrupgrade.cpp | 2 +- osdrupgrade.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/osdrupgrade.cpp b/osdrupgrade.cpp index 8733f39..a47822d 100644 --- a/osdrupgrade.cpp +++ b/osdrupgrade.cpp @@ -513,7 +513,7 @@ void OSDRUpgrade::reject() return QDialog::reject(); } -size_t OSDRUpgrade::zipHelper(void* pOpaque, quint64 file_ofs, const void* pBuf, size_t n) +size_t OSDRUpgrade::zipHelper(void* pOpaque, mz_uint64 file_ofs, const void* pBuf, size_t n) { QByteArray* bytes = (QByteArray*)pOpaque; bytes->append((const char*)pBuf, n); diff --git a/osdrupgrade.h b/osdrupgrade.h index 11bf197..f562d91 100644 --- a/osdrupgrade.h +++ b/osdrupgrade.h @@ -4,6 +4,9 @@ #include #include +#define MINIZ_HEADER_FILE_ONLY +#include "miniz.cpp" + typedef struct libusb_context libusb_context; typedef struct libusb_device_handle libusb_device_handle; @@ -53,7 +56,7 @@ private: void reject(); - static size_t zipHelper(void* pOpaque, quint64 file_ofs, const void* pBuf, size_t n); + static size_t zipHelper(void* pOpaque, mz_uint64 file_ofs, const void* pBuf, size_t n); }; #endif // INCLUDE_OSDRUPGRADE_H