DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

[src/Layout.c & Layout-test-utils.c]: Don't define fmaxf/fminf if we're building with VC12+, its already declared from then on ;

Browse Source
This commit is contained in:
Pierre Renaux
2015-05-09 17:30:03 +08:00
parent 176bb6097b
commit a91566d6db
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Layout-test-utils.c
View File

@@ -13,12 +13,16 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <float.h> #include <float.h>
#define isnan _isnan #define isnan _isnan
/* define fmaxf & fminf if < VC12 */
#if _MSC_VER < 1800
__forceinline const float fmaxf(const float a, const float b) { __forceinline const float fmaxf(const float a, const float b) {
return (a > b) ? a : b; return (a > b) ? a : b;
} }
__forceinline const float fminf(const float a, const float b) { __forceinline const float fminf(const float a, const float b) {
return (a < b) ? a : b; return (a < b) ? a : b;
} }
#endif
#endif #endif
/** START_GENERATED **/ /** START_GENERATED **/

4
src/Layout.c
View File

@@ -17,10 +17,14 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <float.h> #include <float.h>
#define isnan _isnan #define isnan _isnan
/* define fmaxf if < VC12 */
#if _MSC_VER < 1800
__forceinline const float fmaxf(const float a, const float b) { __forceinline const float fmaxf(const float a, const float b) {
return (a > b) ? a : b; return (a > b) ? a : b;
} }
#endif #endif
#endif
bool isUndefined(float value) { bool isUndefined(float value) {
return isnan(value); return isnan(value);