Skip to content

Commit

Permalink
Libdl: fix dlopen uses
Browse files Browse the repository at this point in the history
missed as part of #28953, c.f. #28881
  • Loading branch information
vtjnash committed Mar 21, 2019
1 parent 9d4384c commit da35c34
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion stdlib/Libdl/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dlls = Libdl.dllist()
@test length(dlls) > 3 # at a bare minimum, probably have some version of libstdc, libgcc, libjulia, ...
if !Sys.iswindows() || Sys.windows_version() >= Sys.WINDOWS_VISTA_VER
for dl in dlls
if isfile(dl) && (Libdl.dlopen(dl; throw_error=false) != C_NULL)
if isfile(dl) && (Libdl.dlopen(dl; throw_error=false) !== nothing)
@test Base.samefile(Libdl.dlpath(dl), dl)
end
end
Expand Down
2 changes: 1 addition & 1 deletion stdlib/LinearAlgebra/src/blas.jl
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ import Libdl
let lib = C_NULL
global function determine_vendor()
if lib == C_NULL
lib = Libdl.dlopen(Base.libblas_name; throw_error=false)
lib = something(Libdl.dlopen(Base.libblas_name; throw_error=false), C_NULL)
end
vend = :unknown
if lib != C_NULL
Expand Down

0 comments on commit da35c34

Please sign in to comment.