From 20b625fefaae042209749d25ce5f5792a00bea9e Mon Sep 17 00:00:00 2001 From: tpoole Date: Mon, 6 Nov 2017 15:02:58 +0000 Subject: [PATCH] Fixed a Windows RTAS namespacing issue --- .../RTAS/juce_RTAS_WinUtilities.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp index ce6bce646c..4b9e5d3bcc 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp @@ -24,8 +24,7 @@ ============================================================================== */ -namespace juce -{ +#if JucePlugin_Build_RTAS #include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" @@ -33,8 +32,6 @@ namespace juce // (these functions are in their own file because of problems including windows.h // at the same time as the Digi headers) -#if JucePlugin_Build_RTAS - #define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY // (workaround for a VC build problem) #undef _WIN32_WINNT @@ -48,6 +45,9 @@ namespace juce #include "../utility/juce_IncludeModuleHeaders.h" #pragma pack (pop) +namespace juce +{ + //============================================================================== void JUCE_CALLTYPE attachSubWindow (void* hostWindow, int& titleW, int& titleH, @@ -152,7 +152,8 @@ void JUCE_CALLTYPE passFocusToHostWindow (void* hostWindow) SetFocus (findMDIParentOf ((HWND) hostWindow)); } -#endif #endif } // namespace juce + +#endif