win32_apply: Stricter checks of resource format for WOF external backing

[wimlib] / src / write.c

diff --git a/src/write.c b/src/write.c
index a71359420aed78ade13a05b0f2523c645974e1c2..879a3102ddce6e246e46716eea37c9af2f9d37a0 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -52,9 +52,7 @@
 #include "wimlib/progress.h"
 #include "wimlib/resource.h"
 #include "wimlib/solid.h"
-#ifdef __WIN32__
-#  include "wimlib/win32.h" /* win32_rename_replacement() */
-#endif
+#include "wimlib/win32.h" /* win32_rename_replacement() */
 #include "wimlib/write.h"
 #include "wimlib/xml.h"
 
@@ -279,7 +277,7 @@ struct write_blobs_progress_data {
        wimlib_progress_func_t progfunc;
        void *progctx;
        union wimlib_progress_info progress;
-       uint64_t next_progress;
+       u64 next_progress;
 };
 
 static int
@@ -292,7 +290,7 @@ do_write_blobs_progress(struct write_blobs_progress_data *progress_data,
        if (discarded) {
                progress->write_streams.total_bytes -= complete_size;
                progress->write_streams.total_streams -= complete_count;
-               if (progress_data->next_progress != ~(uint64_t)0 &&
+               if (progress_data->next_progress != ~(u64)0 &&
                    progress_data->next_progress > progress->write_streams.total_bytes)
                {
                        progress_data->next_progress = progress->write_streams.total_bytes;
@@ -312,7 +310,7 @@ do_write_blobs_progress(struct write_blobs_progress_data *progress_data,
                        return ret;
 
                if (progress_data->next_progress == progress->write_streams.total_bytes) {
-                       progress_data->next_progress = ~(uint64_t)0;
+                       progress_data->next_progress = ~(u64)0;
                } else {
                        /* Handle rate-limiting of messages  */