Skip to content

Commit

Permalink
fix win64 test failures from #8420
Browse files Browse the repository at this point in the history
  • Loading branch information
tkelman committed Sep 29, 2014
1 parent 88a4725 commit 95042f1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion base/file.jl
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ end
seed::Uint32 = rand(Uint32)
dir = tempdir()
while true
if uint16(seed) == 0
if (seed & typemax(Uint16)) == 0
seed += 1
end
filename = tempname(dir, seed)
Expand Down
2 changes: 1 addition & 1 deletion base/stream.jl
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ for (x,writable,unix_fd,c_symbol) in ((:STDIN,false,0,:jl_uv_stdin),(:STDOUT,tru
function ($_f)(stream)
global $x
@windows? (
ccall(:SetStdHandle,stdcall,Int32,(Uint32,Ptr{Void}),
ccall(:SetStdHandle,stdcall,Int32,(Int32,Ptr{Void}),
$(-10-unix_fd),_get_osfhandle(_fd(stream)).handle) :
dup(_fd(stream), RawFD($unix_fd)) )
$x = stream
Expand Down

0 comments on commit 95042f1

Please sign in to comment.