[Issue facebook/css-layout#78]: Implemented alignContent ; #79

Merged
prenaux merged 15 commits from master into master 2015-05-17 08:58:05 -07:00
21 changed files with 2378 additions and 8178 deletions
Showing only changes of commit a91566d6db - Show all commits

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 **/

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);