Skip to content

Make :open ccall use variadic cconv #49212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vchuravy merged 2 commits into from
Apr 1, 2023
Merged

Make :open ccall use variadic cconv #49212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3a190b
Make :open ccall use variadic cconv
vchuravy Mar 31, 2023
e27bfc1
fixup! Make :open ccall use variadic cconv
vchuravy Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/file.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ if Sys.iswindows()
end
else
function cd(f::Function, dir::AbstractString)
fd = ccall(:open, Int32, (Cstring, Int32), :., 0)
fd = ccall(:open, Int32, (Cstring, Int32...), :., 0)
systemerror(:open, fd == -1)
try
cd(dir)
Expand Down
2 changes: 1 addition & 1 deletion test/file.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,7 @@ let f = open(file, "w")
if Sys.iswindows()
f = RawFD(ccall(:_open, Cint, (Cstring, Cint), file, Base.Filesystem.JL_O_RDONLY))
else
f = RawFD(ccall(:open, Cint, (Cstring, Cint), file, Base.Filesystem.JL_O_RDONLY))
f = RawFD(ccall(:open, Cint, (Cstring, Cint...), file, Base.Filesystem.JL_O_RDONLY))
end
test_LibcFILE(Libc.FILE(f, Libc.modestr(true, false)))
end
Expand Down
2 changes: 1 addition & 1 deletion test/testhelpers/FakePTYs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function open_fake_pty()
rc = ccall(:unlockpt, Cint, (Cint,), fdm)
rc != 0 && error("unlockpt")

fds = ccall(:open, Cint, (Ptr{UInt8}, Cint),
fds = ccall(:open, Cint, (Ptr{UInt8}, Cint...),
ccall(:ptsname, Ptr{UInt8}, (Cint,), fdm), O_RDWR | O_NOCTTY)
pts = RawFD(fds)

Expand Down