Merge pull request #131 from vslavik/msvc-fixes

Compilation and warnings fixes for modern MSVC
brechtsanders · Jul 24, 2024 · de9d53a · de9d53a
2 parents de548bb + 45ff9b1
commit de9d53a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/xlsxio_read.c b/lib/xlsxio_read.c
@@ -1625,7 +1625,7 @@ DLL_EXPORT_XLSXIO int xlsxioread_sheet_next_cell_datetime (xlsxioreadersheet she
     if (value != 0) {
       value = (value - 25569) * 86400;  //conversion from Excel to Unix timestamp
     }
-    *pvalue = value;
+    *pvalue = (time_t)value;
   }
   free(result);
   return 1;

diff --git a/lib/xlsxio_write.c b/lib/xlsxio_write.c
@@ -47,7 +47,9 @@ typedef struct zip_source zip_source_t;
 #if defined(_MSC_VER)
 #  undef DLL_EXPORT_XLSXIO
 #  define DLL_EXPORT_XLSXIO
-#  define va_copy(dst,src) ((dst) = (src))
+#  ifndef va_copy
+#    define va_copy(dst,src) ((dst) = (src))
+#  endif
 #endif
 
 #ifdef _WIN32

diff --git a/src/xlsxio_write_main.c b/src/xlsxio_write_main.c
@@ -8,7 +8,7 @@ int main (int argc, char* argv[])
   if (argc <= 1)
     return 0;
   unlink(argv[1]);
-  if ((handle = xlsxiowrite_open(argv[1])) == NULL) {
+  if ((handle = xlsxiowrite_open(argv[1], NULL)) == NULL) {
     fprintf(stderr, "Error creating zip file\n");
     return 1;
   }