Changeset 102334 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/common/tmTransaction.cpp

Timestamp:

Nov 27, 2023 4:08:53 PM (14 months ago)

Author:

vboxsync

Message:

libs/xpcom: Drop VBOX_USE_IPRT_IN_XPCOM andmake the code the default as running without IPRT is impossible anyways, bugref:10545

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/common/tmTransaction.cpp (modified) (4 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/common/tmTransaction.cpp

@@ -38 +38 @@
 #include <stdlib.h>
 #include "tmTransaction.h"
-#ifdef VBOX_USE_IPRT_IN_XPCOM
-# include <iprt/mem.h>
-#endif
+
+#include <iprt/mem.h>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -47 +46 @@
 tmTransaction::~tmTransaction() {
   if (mHeader)
-#ifdef VBOX_USE_IPRT_IN_XPCOM
     RTMemFree(mHeader);
-#else
-    free(mHeader);
-#endif
 }
 
@@ -68 +63 @@
   // indicates the message is the entire raw message
   if (aQueueID == TM_INVALID_ID) {
-#ifdef VBOX_USE_IPRT_IN_XPCOM
     header = (tmHeader*) RTMemAlloc(aLength);
-#else
-    header = (tmHeader*) malloc(aLength);
-#endif
     if (header) {
       mRawMessageLength = aLength;
@@ -81 +72 @@
   }
   else {   // need to create the tmHeader and concat the message
-#ifdef VBOX_USE_IPRT_IN_XPCOM
     header = (tmHeader*) RTMemAlloc (sizeof(tmHeader) + aLength);
-#else
-    header = (tmHeader*) malloc (sizeof(tmHeader) + aLength);
-#endif
     if (header) {
       mRawMessageLength = sizeof(tmHeader) + aLength;