patch-include_my_global_h 610 B

123456789101112131415
  1. --- mysql-5.6.22.orig/include/my_global.h 2014-11-20 23:39:51.000000000 -0600
  2. +++ mysql-5.6.22/include/my_global.h 2014-12-26 10:33:04.736371139 -0600
  3. @@ -769,11 +769,7 @@ inline unsigned long long my_double2ulon
  4. #define my_isnan(X) std::isnan(X)
  5. #define my_isinf(X) std::isinf(X)
  6. #else
  7. - #ifdef HAVE_LLVM_LIBCPP /* finite is deprecated in libc++ */
  8. - #define my_isfinite(X) isfinite(X)
  9. - #else
  10. - #define my_isfinite(X) finite(X)
  11. - #endif
  12. + #define my_isfinite(X) isfinite(X)
  13. #define my_isnan(X) isnan(X)
  14. #ifdef HAVE_ISINF
  15. /* System-provided isinf() is available and safe to use */