mirror of
https://github.com/Cantera/cantera.git
synced 2026-08-19 01:14:44 -05:00
Fix MinGW warning about NOMINMAX redefinition
This commit is contained in:
committed by
Bryan W. Weber
parent
185aa977af
commit
f2e127eec2
@@ -12,9 +12,9 @@
|
|||||||
#define FMT_HEADER_ONLY
|
#define FMT_HEADER_ONLY
|
||||||
|
|
||||||
//! Versions 6.2.0 and 6.2.1 of fmtlib do not include this define before they
|
//! Versions 6.2.0 and 6.2.1 of fmtlib do not include this define before they
|
||||||
//! include windows.h, breaking builds on Windows. As of May 23, 2020 the fix
|
//! include windows.h, breaking builds on Windows. Fixed in fmtlib 7.0.0 and
|
||||||
//! is committed to the master branch of fmtlib but hasn't been released.
|
//! newer. https://github.com/fmtlib/fmt/pull/1616
|
||||||
#ifdef _WIN32
|
#if defined(_WIN32) && !defined(NOMINMAX)
|
||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
#endif
|
#endif
|
||||||
#if CT_USE_SYSTEM_FMT
|
#if CT_USE_SYSTEM_FMT
|
||||||
|
|||||||
Reference in New Issue
Block a user