diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-11-18 20:16:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 20:16:57 -0800 |
| commit | 02a4e5a4bfc605fa8fc62a2d6ad58f0a52bc2ad0 (patch) | |
| tree | 98c79232e713f1cadb29d13e0fbe8574ee1acade /lib/std/c.zig | |
| parent | 6d3c176c127b3475a2202b0edd4855374c7ead30 (diff) | |
| parent | e749ab1d63cfdacb3ac9e511d1ef52e77799c82b (diff) | |
| download | zig-02a4e5a4bfc605fa8fc62a2d6ad58f0a52bc2ad0.tar.gz zig-02a4e5a4bfc605fa8fc62a2d6ad58f0a52bc2ad0.zip | |
Merge pull request #6385 from LemonBoy/callocator
std: Make C allocator respect the required alignment
Diffstat (limited to 'lib/std/c.zig')
| -rw-r--r-- | lib/std/c.zig | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/lib/std/c.zig b/lib/std/c.zig index 54155a7e1a..81bb9b4119 100644 --- a/lib/std/c.zig +++ b/lib/std/c.zig @@ -245,22 +245,9 @@ pub extern "c" fn setregid(rgid: gid_t, egid: gid_t) c_int; pub extern "c" fn setresuid(ruid: uid_t, euid: uid_t, suid: uid_t) c_int; pub extern "c" fn setresgid(rgid: gid_t, egid: gid_t, sgid: gid_t) c_int; -pub extern "c" fn aligned_alloc(alignment: usize, size: usize) ?*c_void; pub extern "c" fn malloc(usize) ?*c_void; - -pub usingnamespace switch (builtin.os.tag) { - .linux, .freebsd, .kfreebsd, .netbsd => struct { - pub extern "c" fn malloc_usable_size(?*const c_void) usize; - }, - .macos, .ios, .watchos, .tvos => struct { - pub extern "c" fn malloc_size(?*const c_void) usize; - }, - else => struct {}, -}; - pub extern "c" fn realloc(?*c_void, usize) ?*c_void; pub extern "c" fn free(*c_void) void; -pub extern "c" fn posix_memalign(memptr: **c_void, alignment: usize, size: usize) c_int; pub extern "c" fn futimes(fd: fd_t, times: *[2]timeval) c_int; pub extern "c" fn utimes(path: [*:0]const u8, times: *[2]timeval) c_int; |