From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 14 Dec 2013 18:34:08 +0000 (-0600)
Subject: Win32: compile
X-Git-Tag: v1.6.0~142
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=b616fa5792170a874658735bf6ce9a36bbc97e6a

Win32: compile
---

diff --git a/programs/imagex.c b/programs/imagex.c
index 888f0e41..c3187f74 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -1276,10 +1276,10 @@ parse_num_threads(const tchar *optarg)
 	}
 }
 
-static uint32_t parse_chunk_size(const char *optarg)
+static uint32_t parse_chunk_size(const tchar *optarg)
 {
-       char *tmp;
-       unsigned long chunk_size = strtoul(optarg, &tmp, 10);
+       tchar *tmp;
+       unsigned long chunk_size = tstrtoul(optarg, &tmp, 10);
        if (chunk_size >= UINT32_MAX || *tmp || tmp == optarg) {
                imagex_error(T("Chunk size must be a non-negative integer!"));
                return UINT32_MAX;
diff --git a/src/win32_apply.c b/src/win32_apply.c
index 3415753e..c8f65ef0 100644
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -240,7 +240,7 @@ win32_encrypted_import_cb(unsigned char *data, void *_import_ctx,
 
 	len = min(len, lte->size - import_ctx->offset);
 
-	if (read_partial_wim_resource_into_buf(lte, len, import_ctx->offset, data))
+	if (read_partial_wim_stream_into_buf(lte, len, import_ctx->offset, data))
 		return ERROR_READ_FAULT;
 
 	import_ctx->offset += len;
diff --git a/src/xpress-compress.c b/src/xpress-compress.c
index 30a23046..005a0a22 100644
--- a/src/xpress-compress.c
+++ b/src/xpress-compress.c
@@ -39,7 +39,7 @@
 #ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 #endif
-
+#include <stdlib.h>
 #include <string.h>
 
 /* Intermediate XPRESS match/literal representation.  */