diff --git a/src/Layout-test-utils.c b/src/Layout-test-utils.c index 0f89339a..30ea312b 100644 --- a/src/Layout-test-utils.c +++ b/src/Layout-test-utils.c @@ -13,12 +13,16 @@ #ifdef _MSC_VER #include #define isnan _isnan + +/* define fmaxf & fminf if < VC12 */ +#if _MSC_VER < 1800 __forceinline const float fmaxf(const float a, const float b) { return (a > b) ? a : b; } __forceinline const float fminf(const float a, const float b) { return (a < b) ? a : b; } +#endif #endif /** START_GENERATED **/ diff --git a/src/Layout.c b/src/Layout.c index bc39dc0c..8f0c14a1 100644 --- a/src/Layout.c +++ b/src/Layout.c @@ -17,10 +17,14 @@ #ifdef _MSC_VER #include #define isnan _isnan + +/* define fmaxf if < VC12 */ +#if _MSC_VER < 1800 __forceinline const float fmaxf(const float a, const float b) { return (a > b) ? a : b; } #endif +#endif bool isUndefined(float value) { return isnan(value);