Browse Source

Fixed a Windows RTAS namespacing issue

tags/2021-05-28
tpoole 7 years ago
parent
commit
20b625fefa
1 changed files with 6 additions and 5 deletions
  1. +6
    -5
      modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp

+ 6
- 5
modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp View File

@@ -24,8 +24,7 @@
============================================================================== ==============================================================================
*/ */
namespace juce
{
#if JucePlugin_Build_RTAS
#include "../../juce_core/system/juce_TargetPlatform.h" #include "../../juce_core/system/juce_TargetPlatform.h"
#include "../utility/juce_CheckSettingMacros.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 // (these functions are in their own file because of problems including windows.h
// at the same time as the Digi headers) // 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) #define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY // (workaround for a VC build problem)
#undef _WIN32_WINNT #undef _WIN32_WINNT
@@ -48,6 +45,9 @@ namespace juce
#include "../utility/juce_IncludeModuleHeaders.h" #include "../utility/juce_IncludeModuleHeaders.h"
#pragma pack (pop) #pragma pack (pop)
namespace juce
{
//============================================================================== //==============================================================================
void JUCE_CALLTYPE attachSubWindow (void* hostWindow, void JUCE_CALLTYPE attachSubWindow (void* hostWindow,
int& titleW, int& titleH, int& titleW, int& titleH,
@@ -152,7 +152,8 @@ void JUCE_CALLTYPE passFocusToHostWindow (void* hostWindow)
SetFocus (findMDIParentOf ((HWND) hostWindow)); SetFocus (findMDIParentOf ((HWND) hostWindow));
} }
#endif
#endif #endif
} // namespace juce } // namespace juce
#endif

Loading…
Cancel
Save