mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed Android build

Browse Source
This commit is contained in:
Christophe Riccio 2011-10-25 16:29:01 +01:00
commit f2454e61f8
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glm/core/_fixes.hpp
View File

@ -35,3 +35,14 @@
#ifdef min #ifdef min
#undef min #undef min
#endif #endif
//! Workaround for Android
#ifdef isnan
#undef isnan
#endif
//! Workaround for Android
#ifdef isinf
#undef isinf
#endif

4
glm/core/func_common.inl
View File

@ -801,7 +801,7 @@ namespace detail
#if(GLM_COMPILER & GLM_COMPILER_VC) #if(GLM_COMPILER & GLM_COMPILER_VC)
return typename genType::bool_type(_isnan(x)); return typename genType::bool_type(_isnan(x));
#elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID) #elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return typename genType::bool_type(isnan(x)); return typename genType::bool_type(::isnanf(x));
#else #else
return typename genType::bool_type(std::isnan(x)); return typename genType::bool_type(std::isnan(x));
#endif #endif
@ -854,7 +854,7 @@ namespace detail
#if(GLM_COMPILER & GLM_COMPILER_VC) #if(GLM_COMPILER & GLM_COMPILER_VC)
return typename genType::bool_type(_fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF); return typename genType::bool_type(_fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF);
#elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID) #elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return typename genType::bool_type(isinf(x)); return typename genType::bool_type(::__isinf(x));
#else #else
return typename genType::bool_type(std::isinf(x)); return typename genType::bool_type(std::isinf(x));
#endif #endif