commit c96f387b62b2f5d87dbde1a303b4d02e9d3b2b3f
author Dieter Baron <dillo@nih.at> Sat May 09 13:56:49 2020 +0200
committer Dieter Baron <dillo@nih.at> Sat May 09 13:56:49 2020 +0200
tree 57366cdddfeeef4b2c9aaf2fca6d616ba564a276
parent 15f775d0a3c415ab02b46aee7f704ab40001fc94

Compile fixes.

lib/zip_source_file_win32_utf16.c

diff --git a/lib/zip_source_file_win32_utf16.c b/lib/zip_source_file_win32_utf16.c
index 97b7a8e..0e7dc3c 100644
--- a/lib/zip_source_file_win32_utf16.c
+++ b/lib/zip_source_file_win32_utf16.c
@@ -37,7 +37,7 @@
 static HANDLE utf16_create_file(const char *name, DWORD access, DWORD share_mode, PSECURITY_ATTRIBUTES security_attributes, DWORD creation_disposition, DWORD file_attributes, HANDLE template_file);
 static BOOL utf16_delete_file(const char *name);
 static DWORD utf16_get_file_attributes(const char *name);
-static BOOL utf16_get_file_attributes(const char *name, GET_FILEEX_INFO_LEVELS info_level, void *information);
+static BOOL utf16_get_file_attributes_ex(const char *name, GET_FILEEX_INFO_LEVELS info_level, void *information);
 static void utf16_make_tempname(char *buf, size_t len, const char *name, int i);
 static BOOL utf16_move_file(const char *from, const char *to, DWORD flags);
 static BOOL utf16_set_file_attributes(const char *name, DWORD attributes);
@@ -115,7 +115,7 @@
 
 
 static BOOL
-utf16_get_file_attributes(const char *name, GET_FILEEX_INFO_LEVELS info_level, void *information) {
+utf16_get_file_attributes_ex(const char *name, GET_FILEEX_INFO_LEVELS info_level, void *information) {
     return GetFeilAttributesExW((const wchar_t *)name, info_level, information);
 }
 

lib/zip_source_file_win32_write.c

diff --git a/lib/zip_source_file_win32_write.c b/lib/zip_source_file_win32_write.c
index 300c84c..8437c5b 100644
--- a/lib/zip_source_file_win32_write.c
+++ b/lib/zip_source_file_win32_write.c
@@ -204,12 +204,12 @@
     
     st->exists = true;
     st->regular_file = true; /* TODO: Is this always right? How to determine without a HANDLE? */
-    if (!_zip_filetime_to_time_t(file_attributes->ftLastWriteTime, &st->mtime)) {
+    if (!_zip_filetime_to_time_t(file_attributes.ftLastWriteTime, &st->mtime)) {
         printf("filetime_to_time_t failed\n");
         zip_error_set(&ctx->error, ZIP_ER_READ, ERANGE);
         return false;
     }
-    st->size = ((zip_uint64_t)file_attributes->nFileSizeHigh << 32) | file_attributes->nFileSizeLow;
+    st->size = ((zip_uint64_t)file_attributes.nFileSizeHigh << 32) | file_attributes.nFileSizeLow;
     
     return true;
 }