Changeset 98737 in vbox for trunk/src/libs/liblzma-5.4.1/common

Timestamp:

Feb 25, 2023 8:51:38 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156042

Message:

lobs/liblzma-5.4.1: Windows build fixes, bugref:10254

Location:

trunk/src/libs/liblzma-5.4.1/common

Files:

• common.c (modified) (3 diffs)
• stream_decoder_mt.c (modified) (1 diff)
• stream_encoder_mt.c (modified) (1 diff)

trunk/src/libs/liblzma-5.4.1/common/common.c

@@ -48 +48 @@
                 ptr = allocator->alloc(allocator->opaque, 1, size);
         else
+#ifndef VBOX
                 ptr = malloc(size);
+#else
+                ptr = RTMemAlloc(size);
+#endif
 
         return ptr;
@@ -68 +72 @@
                         memzero(ptr, size);
         } else {
+#ifndef VBOX
                 ptr = calloc(1, size);
+#else
+                ptr = RTMemAllocZ(size);
+#endif
+
         }
 
@@ -81 +90 @@
                 allocator->free(allocator->opaque, ptr);
         else
+#ifndef VBOX
                 free(ptr);
+#else
+                RTMemFree(ptr);
+#endif
 
         return;

trunk/src/libs/liblzma-5.4.1/common/stream_decoder_mt.c

@@ -1363 +1363 @@
                 // towards more favorable conditions (less memory in use,
                 // more in cache).
+#ifndef VBOX
                 uint64_t mem_in_use;
                 uint64_t mem_cached;
+#else
+                uint64_t mem_in_use = 0; /* Shut up msc who can't grok the mythread_sync construct below. */
+                uint64_t mem_cached = 0;
+#endif
                 struct worker_thread *thr = NULL; // Init to silence warning.
 

trunk/src/libs/liblzma-5.4.1/common/stream_encoder_mt.c

@@ -650 +650 @@
 
                 if (block_error) {
+#ifndef VBOX
                         lzma_ret ret;
+#else
+                        lzma_ret ret = LZMA_OK; /* Shut up msc who can't grok the mythread_sync construct below. */
+#endif
 
                         mythread_sync(coder->mutex) {