Changeset 24986 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Nov 26, 2009 10:59:03 AM (15 years ago)

Author:

vboxsync

Message:

IPRT/log.cpp: Don't use RTMemExecAlloc if RT_WITHOUT_EXEC_ALLOC and LOG_USE_C99 are defined.

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -295 +295 @@
          * Emit wrapper code.
          */
+#if defined(LOG_USE_C99) && defined(RT_WITHOUT_EXEC_ALLOC)
+        pu8Code = (uint8_t *)RTMemAlloc(64);
+#else
         pu8Code = (uint8_t *)RTMemExecAlloc(64);
+#endif
         if (pu8Code)
         {
             pLogger->pfnLogger = *(PFNRTLOGGER*)&pu8Code;
-#ifdef RT_ARCH_AMD64
+#if defined(RT_ARCH_AMD64) || defined(RT_LOG_
             /* this wrapper will not be used on AMD64, we will be requiring C99 compilers there. */
             *pu8Code++ = 0xcc;
@@ -425 +429 @@
             RTFileClose(pLogger->File);
 #endif
+#if defined(LOG_USE_C99) && defined(RT_WITHOUT_EXEC_ALLOC)
+            RTMemFree(*(void **)&pLogger->pfnLogger);
+#else
             RTMemExecFree(*(void **)&pLogger->pfnLogger);
+#endif
         }
         else
@@ -581 +589 @@
     if (pLogger->pfnLogger)
     {
+#if defined(LOG_USE_C99) && defined(RT_WITHOUT_EXEC_ALLOC)
+        RTMemFree(*(void **)&pLogger->pfnLogger);
+#else
         RTMemExecFree(*(void **)&pLogger->pfnLogger);
+#endif
         pLogger->pfnLogger = NULL;
     }