Win32: compile

diff --git a/programs/imagex.c b/programs/imagex.c
index 888f0e41e3dbe4f6df72a6dc9ca39c1e2b23ee51..c3187f74f94341a4b3bf089c134cde7c31a0c00c 100644 (file)
--- 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;
        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 3415753e53f585d348e3ec358070cc06c84618ed..c8f65ef0e2db218c4a1ba203c04900497bcee6af 100644 (file)
--- 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);
 
 
        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;
                return ERROR_READ_FAULT;
 
        import_ctx->offset += len;

diff --git a/src/xpress-compress.c b/src/xpress-compress.c
index 30a230462b8f444bd709eb3870e5bc7e5a2bef0d..005a0a22452692d47372907255838ed61d8aa81d 100644 (file)
--- a/src/xpress-compress.c
+++ b/src/xpress-compress.c
@@ -39,7 +39,7 @@
 #ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 #endif
 #ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 #endif

-
+#include <stdlib.h>

 #include <string.h>
 
 /* Intermediate XPRESS match/literal representation.  */
 #include <string.h>
 
 /* Intermediate XPRESS match/literal representation.  */