Merge pull request #25022 from JuliaLang/yyc/mpfr-nopatch

Revert "Add patch to MPFR version (#23287)"
JuliaLang · Dec 13, 2017 · 87c1d4f · 87c1d4f · nanosoldier · Dec 13, 2017
2 parents 67ba7bc + 0937ba0
commit 87c1d4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/base/mpfr.jl b/base/mpfr.jl
@@ -27,11 +27,8 @@ import Base.Math.lgamma_r
 
 import Base.FastMath.sincos_fast
 
-function version()
-    version = unsafe_string(ccall((:mpfr_get_version,:libmpfr), Ptr{Cchar}, ()))
-    build = replace(unsafe_string(ccall((:mpfr_get_patches,:libmpfr), Ptr{Cchar}, ())), ' ', '.')
-    isempty(build) ? VersionNumber(version) : VersionNumber(version * '+' * build)
-end
+version() = VersionNumber(unsafe_string(ccall((:mpfr_get_version,:libmpfr), Ptr{Cchar}, ())))
+patches() = split(unsafe_string(ccall((:mpfr_get_patches,:libmpfr), Ptr{Cchar}, ())),' ')
 
 function __init__()
     try

diff --git a/test/mpfr.jl b/test/mpfr.jl
@@ -865,7 +865,7 @@ end
     end
 end
 # issue #22758
-if MPFR.version() > v"3.1.5" || "r11590" in MPFR.version().build
+if MPFR.version() > v"3.1.5" || "r11590" in MPFR.patches()
     setprecision(2_000_000) do
         @test abs(sin(big(pi)/6) - 0.5) < ldexp(big(1.0),-1_999_000)
     end