Fix a couple of warnings master

diff --git a/implode.c b/implode.c
index bfdea1e..975c757 100644 (file)
--- a/implode.c
+++ b/implode.c
@@ -449,7 +449,7 @@ static void WriteCmpData(TCmpStruct * pWork)
         bytes_required = 0x1000;
 
         do {
-            int loaded = pWork->read_buf(&pWork->work_buff[UNCMP_OFFSET + total_loaded], &bytes_required, pWork->param);
+            int loaded = pWork->read_buf((char *)&pWork->work_buff[UNCMP_OFFSET + total_loaded], &bytes_required, pWork->param);
 
             if (loaded == 0) {
                 if (total_loaded == 0 && esp20 == 0) {

diff --git a/wintypes.h b/wintypes.h
index cae65d2..f58a44d 100644 (file)
--- a/wintypes.h
+++ b/wintypes.h
@@ -7,7 +7,9 @@
 
 #include <stdint.h>
 
+#ifndef WINAPI
 #define WINAPI
+#endif
 #define CDECL
 #define __fastcall