aboutsummaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-05-29 19:41:16 -0400
committerGitHub <noreply@github.com>2019-05-29 19:41:16 -0400
commit345501a72d9780e66beecd549cf6e56c9cde1a95 (patch)
tree7f47cd4f56c5dc245bb1901c12ce7c6c6a7ce2bd /std
parentc66a747045e660a7e8b8146f9ee28c89f3960940 (diff)
parentf2b64fd18f73fe26934b388c1da95e1b4e770c83 (diff)
downloadzig-345501a72d9780e66beecd549cf6e56c9cde1a95.tar.gz
zig-345501a72d9780e66beecd549cf6e56c9cde1a95.zip
Merge pull request #2567 from emekoi/fix-dynlib
remove allocator from DynLib
Diffstat (limited to 'std')
-rw-r--r--std/dynamic_library.zig8
1 files changed, 3 insertions, 5 deletions
diff --git a/std/dynamic_library.zig b/std/dynamic_library.zig
index 3ae3b4c66a..e55d6df84f 100644
--- a/std/dynamic_library.zig
+++ b/std/dynamic_library.zig
@@ -104,7 +104,7 @@ pub const LinuxDynLib = struct {
memory: []align(mem.page_size) u8,
/// 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);
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 {
- allocator: *mem.Allocator,
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);
return WindowsDynLib{
- .allocator = allocator,
.dll = try windows.LoadLibraryW(&wpath),
};
}
@@ -273,7 +271,7 @@ test "dynamic_library" {
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);
return;
};