com php-src: Fix build on Windows: ext/zip/lib/zip_source_w in32a.c ext/zip/lib/zip_source_win32handle.c ext/zip/lib/zip_source_win32w.c

Commit: 4481be5d266be78270b8ed687908adbb4ce66a5f Author: Kalle Sommer Nielsen <kalle@php.net> Fri, 4 Sep 2015 17:49:48 +0200 Parents: 3d057850544114d5d4b993381aa79495e1b3a48e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4481be5d266be78270b8ed687908adbb4ce66a5f Log: Fix build on Windows Changed paths: M ext/zip/lib/zip_source_win32a.c M ext/zip/lib/zip_source_win32handle.c M ext/zip/lib/zip_source_win32w.c Diff: diff --git a/ext/zip/lib/zip_source_win32a.c b/ext/zip/lib/zip_source_win32a.c index c20e891..e9786c4 100644 --- a/ext/zip/lib/zip_source_win32a.c +++ b/ext/zip/lib/zip_source_win32a.c @@ -45,11 +45,11 @@ static int _win32_rename_temp_a(_zip_source_win32_read_file_t *ctx); static int _win32_remove_a(const void *fname); static _zip_source_win32_file_ops_t win32_ops_a = { - .op_strdup = _win32_strdup_a, - .op_open = _win32_open_a, - .op_create_temp = _win32_create_temp_a, - .op_rename_temp = _win32_rename_temp_a, - .op_remove = _win32_remove_a + _win32_strdup_a, + _win32_open_a, + _win32_create_temp_a, + _win32_rename_temp_a, + _win32_remove_a }; ZIP_EXTERN zip_source_t * diff --git a/ext/zip/lib/zip_source_win32handle.c b/ext/zip/lib/zip_source_win32handle.c index dd17c02..d195a11 100644 --- a/ext/zip/lib/zip_source_win32handle.c +++ b/ext/zip/lib/zip_source_win32handle.c @@ -423,6 +423,7 @@ _win32_create_temp_file(_zip_source_win32_read_file_t *ctx) PSECURITY_ATTRIBUTES psa = NULL; DWORD len; BOOL success; + zip_uint32_t value; /* Read the DACL from the original file, so we can copy it to the temp file. @@ -448,7 +449,7 @@ _win32_create_temp_file(_zip_source_win32_read_file_t *ctx) } } - zip_uint32_t value = GetTickCount(); + value = GetTickCount(); for (i = 0; i < 1024 && th == INVALID_HANDLE_VALUE; i++) { th = ctx->ops->op_create_temp(ctx, &temp, value + i, psa); if (th == INVALID_HANDLE_VALUE && GetLastError() != ERROR_FILE_EXISTS) diff --git a/ext/zip/lib/zip_source_win32w.c b/ext/zip/lib/zip_source_win32w.c index 27cdf91..3413456 100644 --- a/ext/zip/lib/zip_source_win32w.c +++ b/ext/zip/lib/zip_source_win32w.c @@ -45,11 +45,11 @@ static int _win32_rename_temp_w(_zip_source_win32_read_file_t *ctx); static int _win32_remove_w(const void *fname); static _zip_source_win32_file_ops_t win32_ops_w = { - .op_strdup = _win32_strdup_w, - .op_open = _win32_open_w, - .op_create_temp = _win32_create_temp_w, - .op_rename_temp = _win32_rename_temp_w, - .op_remove = _win32_remove_w + _win32_strdup_w, + _win32_open_w, + _win32_create_temp_w, + _win32_rename_temp_w, + _win32_remove_w }; ZIP_EXTERN zip_source_t *