From 7d014acb6cb9bb32c99ac658f3152a0c47fe9059 Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 24 Aug 2012 17:48:26 +0100 Subject: [PATCH] Mingw fixes. --- .../format_types/juce_VSTPluginFormat.cpp | 7 +++++-- modules/juce_core/text/juce_String.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp index 782a366c82..92b21733b6 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -46,7 +46,7 @@ #if JUCE_MSVC #pragma warning (push) #pragma warning (disable: 4996) -#else +#elif ! JUCE_MINGW #define __cdecl #endif @@ -66,7 +66,10 @@ //============================================================================== #include "juce_VSTMidiEventList.h" -#if ! JUCE_WINDOWS +#if JUCE_MINGW + extern "C" void _fpreset(); + extern "C" void _clearfp(); +#elif ! JUCE_WINDOWS static void _fpreset() {} static void _clearfp() {} #endif diff --git a/modules/juce_core/text/juce_String.cpp b/modules/juce_core/text/juce_String.cpp index 1b2444d8a4..08087acb1e 100644 --- a/modules/juce_core/text/juce_String.cpp +++ b/modules/juce_core/text/juce_String.cpp @@ -455,7 +455,7 @@ namespace NumberToStringConverters else { // Use a locale-free sprintf where possible (not available on linux AFAICT) - #if JUCE_WINDOWS + #if JUCE_MSVC len = (size_t) _sprintf_l (buffer, "%.9g", _create_locale (LC_NUMERIC, "C"), n); #elif JUCE_MAC || JUCE_IOS len = (size_t) sprintf_l (buffer, nullptr, "%.9g", n);