diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-27 07:55:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-27 07:55:59 +0100 |
| commit | d18bf49e2a7d39e4ae340787ccdd2246550956d2 (patch) | |
| tree | 783a0fa109e532fba6c9bc2dedcbeaad9116ca77 /package/mysql/patches/patch-include_my_global_h | |
| parent | 92d7f6522617c947d635680d045f12a4ef77bcb4 (diff) | |
| parent | aada563860a7b07e89f6ea40e7ce9e811ad6c25d (diff) | |
merge conflict, update hash
Diffstat (limited to 'package/mysql/patches/patch-include_my_global_h')
| -rw-r--r-- | package/mysql/patches/patch-include_my_global_h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h new file mode 100644 index 000000000..37c22fd7a --- /dev/null +++ b/package/mysql/patches/patch-include_my_global_h @@ -0,0 +1,15 @@ +--- mysql-5.6.22.orig/include/my_global.h 2014-11-20 23:39:51.000000000 -0600 ++++ mysql-5.6.22/include/my_global.h 2014-12-26 10:33:04.736371139 -0600 +@@ -769,11 +769,7 @@ inline unsigned long long my_double2ulon + #define my_isnan(X) std::isnan(X) + #define my_isinf(X) std::isinf(X) + #else +- #ifdef HAVE_LLVM_LIBCPP /* finite is deprecated in libc++ */ +- #define my_isfinite(X) isfinite(X) +- #else +- #define my_isfinite(X) finite(X) +- #endif ++ #define my_isfinite(X) isfinite(X) + #define my_isnan(X) isnan(X) + #ifdef HAVE_ISINF + /* System-provided isinf() is available and safe to use */ |