From 71358e7f38c45fe8b45a6ef8fe0d7dfb4116cf4c Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 25 Apr 2013 16:58:04 +0100 Subject: [PATCH] Added a flag that can be used to disable overloaded new + delete in DLL builds. --- modules/juce_core/memory/juce_Memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/juce_core/memory/juce_Memory.h b/modules/juce_core/memory/juce_Memory.h index 1a187df454..6dee8b041d 100644 --- a/modules/juce_core/memory/juce_Memory.h +++ b/modules/juce_core/memory/juce_Memory.h @@ -100,7 +100,7 @@ inline Type* createCopyIfNotNull (const Type* pointer) { return pointer != n avoiding problems when an object is created in one module and passed across to another where it is deleted. By piggy-backing on the JUCE_LEAK_DETECTOR macro, these allocators can be injected into most juce classes. */ -#if JUCE_MSVC && (defined (JUCE_DLL) || defined (JUCE_DLL_BUILD)) && ! DOXYGEN +#if JUCE_MSVC && (defined (JUCE_DLL) || defined (JUCE_DLL_BUILD)) && ! (JUCE_DISABLE_DLL_ALLOCATORS || DOXYGEN) extern JUCE_API void* juceDLL_malloc (size_t); extern JUCE_API void juceDLL_free (void*);