Skip to content

Commit de9d53a

Browse files
Merge pull request brechtsanders#131 from vslavik/msvc-fixes
Compilation and warnings fixes for modern MSVC
2 parents de548bb + 45ff9b1 commit de9d53a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

lib/xlsxio_read.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,7 @@ DLL_EXPORT_XLSXIO int xlsxioread_sheet_next_cell_datetime (xlsxioreadersheet she
16251625
if (value != 0) {
16261626
value = (value - 25569) * 86400; //conversion from Excel to Unix timestamp
16271627
}
1628-
*pvalue = value;
1628+
*pvalue = (time_t)value;
16291629
}
16301630
free(result);
16311631
return 1;

lib/xlsxio_write.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ typedef struct zip_source zip_source_t;
4747
#if defined(_MSC_VER)
4848
# undef DLL_EXPORT_XLSXIO
4949
# define DLL_EXPORT_XLSXIO
50-
# define va_copy(dst,src) ((dst) = (src))
50+
# ifndef va_copy
51+
# define va_copy(dst,src) ((dst) = (src))
52+
# endif
5153
#endif
5254

5355
#ifdef _WIN32

src/xlsxio_write_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ int main (int argc, char* argv[])
88
if (argc <= 1)
99
return 0;
1010
unlink(argv[1]);
11-
if ((handle = xlsxiowrite_open(argv[1])) == NULL) {
11+
if ((handle = xlsxiowrite_open(argv[1], NULL)) == NULL) {
1212
fprintf(stderr, "Error creating zip file\n");
1313
return 1;
1414
}

0 commit comments

Comments
 (0)