mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-15 10:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2567 from emekoi/fix-dynlib

Browse Source 
remove allocator from DynLib
This commit is contained in:
Andrew Kelley 2019-05-29 19:41:16 -04:00 committed by GitHub
commit 345501a72d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
std/dynamic_library.zig
View File

@ -104,7 +104,7 @@ pub const LinuxDynLib = struct {
memory: []align(mem.page_size) u8, memory: []align(mem.page_size) u8,
/// Trusts the file /// Trusts the file
pub fn open(allocator: *mem.Allocator, path: []const u8) !DynLib { pub fn open(path: []const u8) !DynLib {
const fd = try os.open(path, 0, os.O_RDONLY | os.O_CLOEXEC); const fd = try os.open(path, 0, os.O_RDONLY | os.O_CLOEXEC);
errdefer os.close(fd); errdefer os.close(fd);
@ -244,14 +244,12 @@ fn checkver(def_arg: *elf.Verdef, vsym_arg: i32, vername: []const u8, strings: [
} }
pub const WindowsDynLib = struct { pub const WindowsDynLib = struct {
allocator: *mem.Allocator,
dll: windows.HMODULE, dll: windows.HMODULE,
pub fn open(allocator: *mem.Allocator, path: []const u8) !WindowsDynLib { pub fn open(path: []const u8) !WindowsDynLib {
const wpath = try windows.sliceToPrefixedFileW(path); const wpath = try windows.sliceToPrefixedFileW(path);
return WindowsDynLib{ return WindowsDynLib{
.allocator = allocator,
.dll = try windows.LoadLibraryW(&wpath), .dll = try windows.LoadLibraryW(&wpath),
}; };
} }
@ -273,7 +271,7 @@ test "dynamic_library" {
else => return, else => return,
}; };
const dynlib = DynLib.open(std.debug.global_allocator, libname) catch |err| { const dynlib = DynLib.open(libname) catch |err| {
testing.expect(err == error.FileNotFound); testing.expect(err == error.FileNotFound);
return; return;
}; };