From 6da3bf32fe10cbf4a193933b735ff8f2b67a1eda Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Mon, 16 Sep 2013 14:28:46 +0200 Subject: [PATCH] Use correct variable types for ASCII Windows functions. There are both an ASCII and an Unicode variant for most of the Win32 API. Fix some inconsistent uses. --- libarchive/archive_match.c | 2 +- libarchive/archive_write_disk_windows.c | 2 +- libarchive/filter_fork_windows.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libarchive/archive_match.c b/libarchive/archive_match.c index 6b6be9cb2..6fb86445c 100644 --- a/libarchive/archive_match.c +++ b/libarchive/archive_match.c @@ -1152,7 +1152,7 @@ set_timefilter_pathname_mbs(struct archive_match *a, int timetype, { /* NOTE: stat() on Windows cannot handle nano seconds. */ HANDLE h; - WIN32_FIND_DATA d; + WIN32_FIND_DATAA d; if (path == NULL || *path == '\0') { archive_set_error(&(a->archive), EINVAL, "pathname is empty"); diff --git a/libarchive/archive_write_disk_windows.c b/libarchive/archive_write_disk_windows.c index 0f0780a8e..ed6200914 100644 --- a/libarchive/archive_write_disk_windows.c +++ b/libarchive/archive_write_disk_windows.c @@ -525,7 +525,7 @@ la_GetFunctionKernel32(const char *name) static int set; if (!set) { set = 1; - lib = LoadLibrary("kernel32.dll"); + lib = LoadLibrary(TEXT("kernel32.dll")); } if (lib == NULL) { fprintf(stderr, "Can't load kernel32.dll?!\n"); diff --git a/libarchive/filter_fork_windows.c b/libarchive/filter_fork_windows.c index fa59cc9e9..ad271fe68 100644 --- a/libarchive/filter_fork_windows.c +++ b/libarchive/filter_fork_windows.c @@ -36,7 +36,7 @@ __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout) { HANDLE childStdout[2], childStdin[2],childStderr; SECURITY_ATTRIBUTES secAtts; - STARTUPINFO staInfo; + STARTUPINFOA staInfo; PROCESS_INFORMATION childInfo; struct archive_string cmdline; struct archive_string fullpath; -- 2.47.2