From 3c15dc79deb7041f6c568fd89decbd7810810355 Mon Sep 17 00:00:00 2001 From: reuk Date: Mon, 29 Jun 2020 13:45:45 +0100 Subject: [PATCH] Clang: Fix some preprocessor defs on windows --- modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp | 2 +- modules/juce_core/system/juce_PlatformDefs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp index eac6cc8c29..13321b085d 100644 --- a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp @@ -3354,7 +3354,7 @@ JUCE_EXPORTED_FUNCTION IPluginFactory* PLUGIN_API GetPluginFactory() } //============================================================================== -#if _MSC_VER || JUCE_MINGW +#if JUCE_WINDOWS extern "C" BOOL WINAPI DllMain (HINSTANCE instance, DWORD reason, LPVOID) { if (reason == DLL_PROCESS_ATTACH) Process::setCurrentModuleInstanceHandle (instance); return true; } #endif diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h index c23fcfeb2a..52db7c6d6a 100644 --- a/modules/juce_core/system/juce_PlatformDefs.h +++ b/modules/juce_core/system/juce_PlatformDefs.h @@ -39,7 +39,7 @@ namespace juce #endif /** This macro defines the C calling convention used as the standard for JUCE calls. */ -#if JUCE_MSVC +#if JUCE_WINDOWS #define JUCE_CALLTYPE __stdcall #define JUCE_CDECL __cdecl #else