Changeset 98737 in vbox

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

Files:

trunk/Config.kmk

-              r98732
+              r98737
  SDK_VBoxLibLzma_INCS            ?= $(SDK_VBoxLibLzma_DEFAULT_INCS)
  SDK_VBoxLibLzma_LIBS            ?= $(PATH_STAGE_LIB)/VBox-liblzma$(VBOX_SUFF_LIB)
+ SDK_VBoxLibLzma-x86             := liblzma/x86 compressor/decompressor for dll linking.
+ SDK_VBoxLibLzma-x86_EXTENDS     := VBoxLibLzma
+ SDK_VBoxLibLzma_LIBS-x86        ?= $(PATH_STAGE_LIB)/VBox-liblzma-x86$(VBOX_SUFF_LIB)
  SDK_VBoxLibLzmaStatic           := liblzma for static linking

-              r98730
+              r98737
                 ptr = allocator->alloc(allocator->opaque, 1, size);
         else
+#ifndef VBOX
                 ptr = malloc(size);
+#else
+                ptr = RTMemAlloc(size);
+#endif
         return ptr;
 …
                         memzero(ptr, size);
         } else {
+#ifndef VBOX
                 ptr = calloc(1, size);
+#else
+                ptr = RTMemAllocZ(size);
+#endif
+        }
 …
                 allocator->free(allocator->opaque, ptr);
         else
+#ifndef VBOX
                 free(ptr);
+#else
+                RTMemFree(ptr);
+#endif
         return;

-              r98730
+              r98737
                 // 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.

-              r98730
+              r98737
                 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) {

-              r98730
+              r98737
 #define TUKLIB_GNUC_REQ(major, minor) RT_GNUC_PREREQ(major, minor)
 #define assert(expr) Assert(expr)
-#define malloc(size) RTMemAlloc(size)
-#define calloc(nmemb, size) RTMemAllocZ(nmemb * size)
-DECL_FORCE_INLINE(void) free(void *ptr)
+{
-        RTMemFree(ptr);
+}
 #if 0

Note: See TracChangeset for help on using the changeset viewer.