VirtualBox

Changeset 31252 in vbox for trunk


Ignore:
Timestamp:
Jul 30, 2010 3:38:52 PM (14 years ago)
Author:
vboxsync
Message:

Made 'DEFS += RTMEM_WRAP_TO_EF_APIS' work better.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r31181 r31252  
    39913991TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET)   = $(NO_SUCH_VARIABLE)
    39923992TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS                  = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99
    3993 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
     3993TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XORGMOD
    39943994ifeq ($(KBUILD_TARGET_ARCH),amd64)
    39953995 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64
  • trunk/include/iprt/mem.h

    r31157 r31252  
    818818template <class T,
    819819          void Destruct(T *) = RTMemAutoDestructor<T>,
    820 # ifdef RTMEM_WRAP_TO_EF_APIS
     820# if defined(RTMEM_WRAP_TO_EF_APIS) && !defined(RTMEM_NO_WRAP_TO_EF_APIS)
    821821          void *Allocator(void *, size_t, const char *) = RTMemEfReallocNP
    822822# else
  • trunk/src/VBox/Additions/x11/vboxmouse/undefined_15

    r30395 r31252  
    9797sigfillset
    9898pthread_sigmask
     99mprotect
     100mmap64
     101memalign
     102posix_memalign
     103munmap
  • trunk/src/VBox/Additions/x11/vboxmouse/undefined_70

    r30395 r31252  
    148148sigfillset
    149149pthread_sigmask
     150mprotect
     151mmap64
     152memalign
     153posix_memalign
     154munmap
  • trunk/src/VBox/Additions/x11/vboxmouse/undefined_71

    r30395 r31252  
    146146sigfillset
    147147pthread_sigmask
     148mprotect
     149mmap64
     150memalign
     151posix_memalign
     152munmap
  • trunk/src/VBox/Additions/x11/vboxvideo/undefined_13

    r30395 r31252  
    184184sigfillset
    185185pthread_sigmask
     186mprotect
     187mmap64
     188memalign
     189posix_memalign
     190munmap
  • trunk/src/VBox/Additions/x11/vboxvideo/undefined_70

    r30395 r31252  
    187187sigfillset
    188188pthread_sigmask
     189mprotect
     190mmap64
     191memalign
     192posix_memalign
     193munmap
  • trunk/src/VBox/Runtime/Makefile.kmk

    r30962 r31252  
    876876RuntimeGuestR3Mini_INST                     := $(INST_ADDITIONS_LIB)
    877877RuntimeGuestR3Mini_SDKS.win                 := $(RuntimeR3_SDKS.win)
    878 RuntimeGuestR3Mini_DEFS                     := $(filter-out RTCRITSECT_STRICT RT_NO_GIP RT_WITH_ICONV_CACHE, $(RuntimeR3_DEFS)) RT_MINI
     878RuntimeGuestR3Mini_DEFS                     := \
     879        $(filter-out RTCRITSECT_STRICT RT_NO_GIP RT_WITH_ICONV_CACHE, $(RuntimeR3_DEFS)) \
     880        RT_MINI
    879881RuntimeGuestR3Mini_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
    880882RuntimeGuestR3Mini_DEFS.$(KBUILD_HOST)      := $(RuntimeR3_DEFS.$(KBUILD_HOST))
  • trunk/src/VBox/Runtime/r3/alloc-ef-cpp.cpp

    r31157 r31252  
    3030#include "alloc-ef.h"
    3131
    32 #if defined(RTALLOC_EFENCE_CPP) || defined(RTMEM_WRAP_TO_EF_APIS) /* rest of the file */
     32#if defined(RTALLOC_EFENCE_CPP) \
     33 || (defined(RTMEM_WRAP_TO_EF_APIS) && !defined(RTMEM_NO_WRAP_TO_EF_APIS)) /* rest of the file */
    3334
    3435#include <iprt/asm.h>
  • trunk/src/VBox/Runtime/r3/alloc.cpp

    r31157 r31252  
    2929*   Defined Constants And Macros                                               *
    3030*******************************************************************************/
    31 #ifdef RTMEM_WRAP_TO_EF_APIS
     31#if defined(RTMEM_WRAP_TO_EF_APIS) && !defined(RTMEM_NO_WRAP_TO_EF_APIS)
    3232# undef RTMEM_WRAP_TO_EF_APIS
    3333# define RTALLOC_USE_EFENCE 1
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette