fixed win32 compilation

LeadRDRK · Apr 17, 2021 · 2a5cf57 · 2a5cf57
1 parent d99711e
commit 2a5cf57
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 build/
+win32-build/
 compile_commands.json
 .clangd/
 .cache/

diff --git a/lib/error.cpp b/lib/error.cpp
@@ -6,7 +6,6 @@
 */
 
 #include "zpack.h"
-using namespace ZPack;
 
 const char* ZPack::getErrorMessage(int error)
 {

diff --git a/lib/reader.cpp b/lib/reader.cpp
@@ -258,7 +258,7 @@ int Reader::unpackFileStream(const FileInfo *info, std::ostream &dst)
 
     char* charInBuf = (char*)inBuffer->src;
     char* charOutBuf = (char*)outBuffer->dst;
-    size_t toRead = std::min(info->compSize, ZSTD_DStreamInSize());
+    size_t toRead = std::min(info->compSize, (uint64_t)ZSTD_DStreamInSize());
     size_t lastRet = 0;
     size_t totalRead = 0;
     CRC32 crc;
@@ -271,7 +271,7 @@ int Reader::unpackFileStream(const FileInfo *info, std::ostream &dst)
         outBuffer->pos = 0;
 
         // reduce reading size if needed
-        toRead = std::min(toRead, info->compSize - totalRead);
+        toRead = std::min(toRead, (size_t)(info->compSize - totalRead));
 
         // read part of the file
         file.read(charInBuf, toRead);

diff --git a/lib/zpack.h b/lib/zpack.h
@@ -58,7 +58,7 @@ namespace ZPack
      * @param error The error code.
      * @return The error message corresponding to the error code.
      */
-    const char* getErrorMessage(int error);
+    ZPACK_API const char* getErrorMessage(int error);
 
     // structs
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
     */
     #include "zpack.h"
-    using namespace ZPack;
     const char* ZPack::getErrorMessage(int error)
     {
@@ Expand Down @@