Browse Source

Fix build

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.2.0-RC1
falkTX 4 years ago
parent
commit
b697a30188
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 8 additions and 3 deletions
  1. +2
    -1
      source/backend/plugin/CarlaPluginFluidSynth.cpp
  2. +6
    -2
      source/utils/CarlaScopeUtils.hpp

+ 2
- 1
source/backend/plugin/CarlaPluginFluidSynth.cpp View File

@@ -1,6 +1,6 @@
/* /*
* Carla FluidSynth Plugin * Carla FluidSynth Plugin
* Copyright (C) 2011-2019 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2011-2020 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -1913,6 +1913,7 @@ CarlaPlugin* CarlaPlugin::newFluidSynth(const Initializer& init, PluginType ptyp
return nullptr; return nullptr;


// unused // unused
(void)ptype;
(void)use16Outs; (void)use16Outs;
#endif #endif
} }


+ 6
- 2
source/utils/CarlaScopeUtils.hpp View File

@@ -29,6 +29,10 @@
# define CARLA_USE_NEWLOCALE # define CARLA_USE_NEWLOCALE
#endif #endif


#if defined(CARLA_OS_WIN) && __MINGW64_VERSION_MAJOR >= 5
# define CARLA_USE_CONFIGTHREADLOCALE
#endif

// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// CarlaScopedEnvVar class // CarlaScopedEnvVar class


@@ -103,7 +107,7 @@ public:
: newloc(::newlocale(LC_NUMERIC_MASK, "C", kNullLocale)), : newloc(::newlocale(LC_NUMERIC_MASK, "C", kNullLocale)),
oldloc(newloc != kNullLocale ? ::uselocale(newloc) : kNullLocale) {} oldloc(newloc != kNullLocale ? ::uselocale(newloc) : kNullLocale) {}
#else #else
# ifdef CARLA_OS_WIN
# ifdef CARLA_USE_CONFIGTHREADLOCALE
: oldthreadloc(_configthreadlocale(_ENABLE_PER_THREAD_LOCALE)), : oldthreadloc(_configthreadlocale(_ENABLE_PER_THREAD_LOCALE)),
# else # else
: oldthreadloc(-1), : oldthreadloc(-1),
@@ -128,7 +132,7 @@ public:
delete[] oldloc; delete[] oldloc;
} }


# ifdef CARLA_OS_WIN
# ifdef CARLA_USE_CONFIGTHREADLOCALE
if (oldthreadloc != -1) if (oldthreadloc != -1)
_configthreadlocale(oldthreadloc); _configthreadlocale(oldthreadloc);
# endif # endif


Loading…
Cancel
Save