authorgravatar for mail@isaacfreund.comIsaac Freund <mail@isaacfreund.com> 2021-12-19 06:24:45+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2021-12-19 00:24:45-05:00
log9f9f215305389c08a21730859982b68bf2681932
treebbb7ca8488e55f6fa329ae30ae04e6cf7dfe4f06
parent8468b544e8769b774e2e5988a58c51d991df999a
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

stage1, stage2: rename c_void to anyopaque (#10316)

zig fmt now replaces c_void with anyopaque to make updating code easy.

78 files changed, 597 insertions(+), 557 deletions(-)

doc/docgen.zig+4-4
......@@ -853,10 +853,10 @@ fn termColor(allocator: Allocator, input: []const u8) ![]u8 {
853853}
854854
855855const builtin_types = [_][]const u8{
856 "f16", "f32", "f64", "f128", "c_longdouble", "c_short",
857 "c_ushort", "c_int", "c_uint", "c_long", "c_ulong", "c_longlong",
858 "c_ulonglong", "c_char", "c_void", "void", "bool", "isize",
859 "usize", "noreturn", "type", "anyerror", "comptime_int", "comptime_float",
856 "f16", "f32", "f64", "f128", "c_longdouble", "c_short",
857 "c_ushort", "c_int", "c_uint", "c_long", "c_ulong", "c_longlong",
858 "c_ulonglong", "c_char", "anyopaque", "void", "bool", "isize",
859 "usize", "noreturn", "type", "anyerror", "comptime_int", "comptime_float",
860860};
861861
862862fn isType(name: []const u8) bool {
doc/langref.html.in+5-5
......@@ -720,11 +720,6 @@ pub fn main() void {
720720 <td><code class="c">long double</code></td>
721721 <td>for ABI compatibility with C</td>
722722 </tr>
723 <tr>
724 <th scope="row">{#syntax#}c_void{#endsyntax#}</th>
725 <td><code class="c">void</code></td>
726 <td>for ABI compatibility with C</td>
727 </tr>
728723
729724 <tr>
730725 <th scope="row">{#syntax#}f16{#endsyntax#}</th>
......@@ -751,6 +746,11 @@ pub fn main() void {
751746 <td><code class="c">bool</code></td>
752747 <td>{#syntax#}true{#endsyntax#} or {#syntax#}false{#endsyntax#}</td>
753748 </tr>
749 <tr>
750 <th scope="row">{#syntax#}anyopaque{#endsyntax#}</th>
751 <td><code class="c">void</code></td>
752 <td>Used for type-erased pointers.</td>
753 </tr>
754754 <tr>
755755 <th scope="row">{#syntax#}void{#endsyntax#}</th>
756756 <td>(none)</td>
lib/std/Thread.zig+4-4
......@@ -344,7 +344,7 @@ const Completion = Atomic(enum(u8) {
344344fn callFn(comptime f: anytype, args: anytype) switch (Impl) {
345345 WindowsThreadImpl => std.os.windows.DWORD,
346346 LinuxThreadImpl => u8,
347 PosixThreadImpl => ?*c_void,
347 PosixThreadImpl => ?*anyopaque,
348348 else => unreachable,
349349} {
350350 const default_value = if (Impl == PosixThreadImpl) null else 0;
......@@ -499,7 +499,7 @@ const WindowsThreadImpl = struct {
499499 null,
500500 stack_size,
501501 Instance.entryFn,
502 @ptrCast(*c_void, instance),
502 @ptrCast(*anyopaque, instance),
503503 0,
504504 null,
505505 ) orelse {
......@@ -621,7 +621,7 @@ const PosixThreadImpl = struct {
621621 const allocator = std.heap.c_allocator;
622622
623623 const Instance = struct {
624 fn entryFn(raw_arg: ?*c_void) callconv(.C) ?*c_void {
624 fn entryFn(raw_arg: ?*anyopaque) callconv(.C) ?*anyopaque {
625625 // @alignCast() below doesn't support zero-sized-types (ZST)
626626 if (@sizeOf(Args) < 1) {
627627 return callFn(f, @as(Args, undefined));
......@@ -651,7 +651,7 @@ const PosixThreadImpl = struct {
651651 &handle,
652652 &attr,
653653 Instance.entryFn,
654 if (@sizeOf(Args) > 1) @ptrCast(*c_void, args_ptr) else undefined,
654 if (@sizeOf(Args) > 1) @ptrCast(*anyopaque, args_ptr) else undefined,
655655 )) {
656656 .SUCCESS => return Impl{ .handle = handle },
657657 .AGAIN => return error.SystemResources,
lib/std/Thread/Futex.zig+5-5
......@@ -107,8 +107,8 @@ const WindowsFutex = struct {
107107 }
108108
109109 switch (windows.ntdll.RtlWaitOnAddress(
110 @ptrCast(?*const c_void, ptr),
111 @ptrCast(?*const c_void, &expect),
110 @ptrCast(?*const anyopaque, ptr),
111 @ptrCast(?*const anyopaque, &expect),
112112 @sizeOf(@TypeOf(expect)),
113113 timeout_ptr,
114114 )) {
......@@ -119,7 +119,7 @@ const WindowsFutex = struct {
119119 }
120120
121121 fn wake(ptr: *const Atomic(u32), num_waiters: u32) void {
122 const address = @ptrCast(?*const c_void, ptr);
122 const address = @ptrCast(?*const anyopaque, ptr);
123123 switch (num_waiters) {
124124 1 => windows.ntdll.RtlWakeAddressSingle(address),
125125 else => windows.ntdll.RtlWakeAddressAll(address),
......@@ -189,7 +189,7 @@ const DarwinFutex = struct {
189189 assert(timeout_value != 0);
190190 timeout_ns = timeout_value;
191191 }
192 const addr = @ptrCast(*const c_void, ptr);
192 const addr = @ptrCast(*const anyopaque, ptr);
193193 const flags = darwin.UL_COMPARE_AND_WAIT | darwin.ULF_NO_ERRNO;
194194 // If we're using `__ulock_wait` and `timeout` is too big to fit inside a `u32` count of
195195 // micro-seconds (around 70min), we'll request a shorter timeout. This is fine (users
......@@ -228,7 +228,7 @@ const DarwinFutex = struct {
228228 }
229229
230230 while (true) {
231 const addr = @ptrCast(*const c_void, ptr);
231 const addr = @ptrCast(*const anyopaque, ptr);
232232 const status = darwin.__ulock_wake(flags, addr, 0);
233233
234234 if (status >= 0) return;
lib/std/Thread/StaticResetEvent.zig+2-2
......@@ -229,7 +229,7 @@ pub const AtomicEvent = struct {
229229 pub const WindowsFutex = struct {
230230 pub fn wake(waiters: *u32, wake_count: u32) void {
231231 const handle = getEventHandle() orelse return SpinFutex.wake(waiters, wake_count);
232 const key = @ptrCast(*const c_void, waiters);
232 const key = @ptrCast(*const anyopaque, waiters);
233233
234234 var waiting = wake_count;
235235 while (waiting != 0) : (waiting -= 1) {
......@@ -240,7 +240,7 @@ pub const AtomicEvent = struct {
240240
241241 pub fn wait(waiters: *u32, timeout: ?u64) !void {
242242 const handle = getEventHandle() orelse return SpinFutex.wait(waiters, timeout);
243 const key = @ptrCast(*const c_void, waiters);
243 const key = @ptrCast(*const anyopaque, waiters);
244244
245245 // NT uses timeouts in units of 100ns with negative value being relative
246246 var timeout_ptr: ?*windows.LARGE_INTEGER = null;
lib/std/c.zig+28-28
......@@ -121,9 +121,9 @@ pub extern "c" fn writev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint) i
121121pub extern "c" fn pwritev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint, offset: c.off_t) isize;
122122pub extern "c" fn write(fd: c.fd_t, buf: [*]const u8, nbyte: usize) isize;
123123pub extern "c" fn pwrite(fd: c.fd_t, buf: [*]const u8, nbyte: usize, offset: c.off_t) isize;
124pub extern "c" fn mmap(addr: ?*align(page_size) c_void, len: usize, prot: c_uint, flags: c_uint, fd: c.fd_t, offset: c.off_t) *c_void;
125pub extern "c" fn munmap(addr: *align(page_size) const c_void, len: usize) c_int;
126pub extern "c" fn mprotect(addr: *align(page_size) c_void, len: usize, prot: c_uint) c_int;
124pub extern "c" fn mmap(addr: ?*align(page_size) anyopaque, len: usize, prot: c_uint, flags: c_uint, fd: c.fd_t, offset: c.off_t) *anyopaque;
125pub extern "c" fn munmap(addr: *align(page_size) const anyopaque, len: usize) c_int;
126pub extern "c" fn mprotect(addr: *align(page_size) anyopaque, len: usize, prot: c_uint) c_int;
127127pub extern "c" fn link(oldpath: [*:0]const u8, newpath: [*:0]const u8, flags: c_int) c_int;
128128pub extern "c" fn linkat(oldfd: c.fd_t, oldpath: [*:0]const u8, newfd: c.fd_t, newpath: [*:0]const u8, flags: c_int) c_int;
129129pub extern "c" fn unlink(path: [*:0]const u8) c_int;
......@@ -152,8 +152,8 @@ pub extern "c" fn fchown(fd: c.fd_t, owner: c.uid_t, group: c.gid_t) c_int;
152152
153153pub extern "c" fn rmdir(path: [*:0]const u8) c_int;
154154pub extern "c" fn getenv(name: [*:0]const u8) ?[*:0]u8;
155pub extern "c" fn sysctl(name: [*]const c_int, namelen: c_uint, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
156pub extern "c" fn sysctlbyname(name: [*:0]const u8, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
155pub extern "c" fn sysctl(name: [*]const c_int, namelen: c_uint, oldp: ?*anyopaque, oldlenp: ?*usize, newp: ?*anyopaque, newlen: usize) c_int;
156pub extern "c" fn sysctlbyname(name: [*:0]const u8, oldp: ?*anyopaque, oldlenp: ?*usize, newp: ?*anyopaque, newlen: usize) c_int;
157157pub extern "c" fn sysctlnametomib(name: [*:0]const u8, mibp: ?*c_int, sizep: ?*usize) c_int;
158158pub extern "c" fn tcgetattr(fd: c.fd_t, termios_p: *c.termios) c_int;
159159pub extern "c" fn tcsetattr(fd: c.fd_t, optional_action: c.TCSA, termios_p: *const c.termios) c_int;
......@@ -172,12 +172,12 @@ pub extern "c" fn getpeername(sockfd: c.fd_t, noalias addr: *c.sockaddr, noalias
172172pub extern "c" fn connect(sockfd: c.fd_t, sock_addr: *const c.sockaddr, addrlen: c.socklen_t) c_int;
173173pub extern "c" fn accept(sockfd: c.fd_t, noalias addr: ?*c.sockaddr, noalias addrlen: ?*c.socklen_t) c_int;
174174pub extern "c" fn accept4(sockfd: c.fd_t, noalias addr: ?*c.sockaddr, noalias addrlen: ?*c.socklen_t, flags: c_uint) c_int;
175pub extern "c" fn getsockopt(sockfd: c.fd_t, level: u32, optname: u32, noalias optval: ?*c_void, noalias optlen: *c.socklen_t) c_int;
176pub extern "c" fn setsockopt(sockfd: c.fd_t, level: u32, optname: u32, optval: ?*const c_void, optlen: c.socklen_t) c_int;
177pub extern "c" fn send(sockfd: c.fd_t, buf: *const c_void, len: usize, flags: u32) isize;
175pub extern "c" fn getsockopt(sockfd: c.fd_t, level: u32, optname: u32, noalias optval: ?*anyopaque, noalias optlen: *c.socklen_t) c_int;
176pub extern "c" fn setsockopt(sockfd: c.fd_t, level: u32, optname: u32, optval: ?*const anyopaque, optlen: c.socklen_t) c_int;
177pub extern "c" fn send(sockfd: c.fd_t, buf: *const anyopaque, len: usize, flags: u32) isize;
178178pub extern "c" fn sendto(
179179 sockfd: c.fd_t,
180 buf: *const c_void,
180 buf: *const anyopaque,
181181 len: usize,
182182 flags: u32,
183183 dest_addr: ?*const c.sockaddr,
......@@ -185,10 +185,10 @@ pub extern "c" fn sendto(
185185) isize;
186186pub extern "c" fn sendmsg(sockfd: c.fd_t, msg: *const std.x.os.Socket.Message, flags: c_int) isize;
187187
188pub extern "c" fn recv(sockfd: c.fd_t, arg1: ?*c_void, arg2: usize, arg3: c_int) isize;
188pub extern "c" fn recv(sockfd: c.fd_t, arg1: ?*anyopaque, arg2: usize, arg3: c_int) isize;
189189pub extern "c" fn recvfrom(
190190 sockfd: c.fd_t,
191 noalias buf: *c_void,
191 noalias buf: *anyopaque,
192192 len: usize,
193193 flags: u32,
194194 noalias src_addr: ?*c.sockaddr,
......@@ -208,9 +208,9 @@ pub extern "c" fn setregid(rgid: c.gid_t, egid: c.gid_t) c_int;
208208pub extern "c" fn setresuid(ruid: c.uid_t, euid: c.uid_t, suid: c.uid_t) c_int;
209209pub extern "c" fn setresgid(rgid: c.gid_t, egid: c.gid_t, sgid: c.gid_t) c_int;
210210
211pub extern "c" fn malloc(usize) ?*c_void;
212pub extern "c" fn realloc(?*c_void, usize) ?*c_void;
213pub extern "c" fn free(?*c_void) void;
211pub extern "c" fn malloc(usize) ?*anyopaque;
212pub extern "c" fn realloc(?*anyopaque, usize) ?*anyopaque;
213pub extern "c" fn free(?*anyopaque) void;
214214
215215pub extern "c" fn futimes(fd: c.fd_t, times: *[2]c.timeval) c_int;
216216pub extern "c" fn utimes(path: [*:0]const u8, times: *[2]c.timeval) c_int;
......@@ -218,24 +218,24 @@ pub extern "c" fn utimes(path: [*:0]const u8, times: *[2]c.timeval) c_int;
218218pub extern "c" fn utimensat(dirfd: c.fd_t, pathname: [*:0]const u8, times: *[2]c.timespec, flags: u32) c_int;
219219pub extern "c" fn futimens(fd: c.fd_t, times: *const [2]c.timespec) c_int;
220220
221pub extern "c" fn pthread_create(noalias newthread: *pthread_t, noalias attr: ?*const c.pthread_attr_t, start_routine: fn (?*c_void) callconv(.C) ?*c_void, noalias arg: ?*c_void) c.E;
221pub extern "c" fn pthread_create(noalias newthread: *pthread_t, noalias attr: ?*const c.pthread_attr_t, start_routine: fn (?*anyopaque) callconv(.C) ?*anyopaque, noalias arg: ?*anyopaque) c.E;
222222pub extern "c" fn pthread_attr_init(attr: *c.pthread_attr_t) c.E;
223pub extern "c" fn pthread_attr_setstack(attr: *c.pthread_attr_t, stackaddr: *c_void, stacksize: usize) c.E;
223pub extern "c" fn pthread_attr_setstack(attr: *c.pthread_attr_t, stackaddr: *anyopaque, stacksize: usize) c.E;
224224pub extern "c" fn pthread_attr_setstacksize(attr: *c.pthread_attr_t, stacksize: usize) c.E;
225225pub extern "c" fn pthread_attr_setguardsize(attr: *c.pthread_attr_t, guardsize: usize) c.E;
226226pub extern "c" fn pthread_attr_destroy(attr: *c.pthread_attr_t) c.E;
227227pub extern "c" fn pthread_self() pthread_t;
228pub extern "c" fn pthread_join(thread: pthread_t, arg_return: ?*?*c_void) c.E;
228pub extern "c" fn pthread_join(thread: pthread_t, arg_return: ?*?*anyopaque) c.E;
229229pub extern "c" fn pthread_detach(thread: pthread_t) c.E;
230230pub extern "c" fn pthread_atfork(
231231 prepare: ?fn () callconv(.C) void,
232232 parent: ?fn () callconv(.C) void,
233233 child: ?fn () callconv(.C) void,
234234) c_int;
235pub extern "c" fn pthread_key_create(key: *c.pthread_key_t, destructor: ?fn (value: *c_void) callconv(.C) void) c.E;
235pub extern "c" fn pthread_key_create(key: *c.pthread_key_t, destructor: ?fn (value: *anyopaque) callconv(.C) void) c.E;
236236pub extern "c" fn pthread_key_delete(key: c.pthread_key_t) c.E;
237pub extern "c" fn pthread_getspecific(key: c.pthread_key_t) ?*c_void;
238pub extern "c" fn pthread_setspecific(key: c.pthread_key_t, value: ?*c_void) c_int;
237pub extern "c" fn pthread_getspecific(key: c.pthread_key_t) ?*anyopaque;
238pub extern "c" fn pthread_setspecific(key: c.pthread_key_t, value: ?*anyopaque) c_int;
239239pub extern "c" fn sem_init(sem: *c.sem_t, pshared: c_int, value: c_uint) c_int;
240240pub extern "c" fn sem_destroy(sem: *c.sem_t) c_int;
241241pub extern "c" fn sem_post(sem: *c.sem_t) c_int;
......@@ -260,16 +260,16 @@ pub extern "c" fn port_associate(
260260 source: u32,
261261 object: usize,
262262 events: u32,
263 user_var: ?*c_void,
263 user_var: ?*anyopaque,
264264) c_int;
265265pub extern "c" fn port_dissociate(port: c.port_t, source: u32, object: usize) c_int;
266pub extern "c" fn port_send(port: c.port_t, events: u32, user_var: ?*c_void) c_int;
266pub extern "c" fn port_send(port: c.port_t, events: u32, user_var: ?*anyopaque) c_int;
267267pub extern "c" fn port_sendn(
268268 ports: [*]c.port_t,
269269 errors: []u32,
270270 num_ports: u32,
271271 events: u32,
272 user_var: ?*c_void,
272 user_var: ?*anyopaque,
273273) c_int;
274274pub extern "c" fn port_get(port: c.port_t, event: *c.port_event, timeout: ?*c.timespec) c_int;
275275pub extern "c" fn port_getn(
......@@ -279,7 +279,7 @@ pub extern "c" fn port_getn(
279279 events_retrieved: *u32,
280280 timeout: ?*c.timespec,
281281) c_int;
282pub extern "c" fn port_alert(port: c.port_t, flags: u32, events: u32, user_var: ?*c_void) c_int;
282pub extern "c" fn port_alert(port: c.port_t, flags: u32, events: u32, user_var: ?*anyopaque) c_int;
283283
284284pub extern "c" fn getaddrinfo(
285285 noalias node: ?[*:0]const u8,
......@@ -336,9 +336,9 @@ pub extern "c" fn pthread_rwlock_unlock(rwl: *c.pthread_rwlock_t) callconv(.C) c
336336pub const pthread_t = *opaque {};
337337pub const FILE = opaque {};
338338
339pub extern "c" fn dlopen(path: [*:0]const u8, mode: c_int) ?*c_void;
340pub extern "c" fn dlclose(handle: *c_void) c_int;
341pub extern "c" fn dlsym(handle: ?*c_void, symbol: [*:0]const u8) ?*c_void;
339pub extern "c" fn dlopen(path: [*:0]const u8, mode: c_int) ?*anyopaque;
340pub extern "c" fn dlclose(handle: *anyopaque) c_int;
341pub extern "c" fn dlsym(handle: ?*anyopaque, symbol: [*:0]const u8) ?*anyopaque;
342342
343343pub extern "c" fn sync() void;
344344pub extern "c" fn syncfs(fd: c_int) c_int;
......@@ -350,7 +350,7 @@ pub extern "c" fn prctl(option: c_int, ...) c_int;
350350pub extern "c" fn getrlimit(resource: c.rlimit_resource, rlim: *c.rlimit) c_int;
351351pub extern "c" fn setrlimit(resource: c.rlimit_resource, rlim: *const c.rlimit) c_int;
352352
353pub extern "c" fn fmemopen(noalias buf: ?*c_void, size: usize, noalias mode: [*:0]const u8) ?*FILE;
353pub extern "c" fn fmemopen(noalias buf: ?*anyopaque, size: usize, noalias mode: [*:0]const u8) ?*FILE;
354354
355355pub extern "c" fn syslog(priority: c_int, message: [*:0]const u8, ...) void;
356356pub extern "c" fn openlog(ident: [*:0]const u8, logopt: c_int, facility: c_int) void;
lib/std/c/darwin.zig+16-16
......@@ -46,8 +46,8 @@ pub const fstatat = if (native_arch == .aarch64) private.fstatat else private.@"
4646pub extern "c" fn mach_absolute_time() u64;
4747pub extern "c" fn mach_timebase_info(tinfo: ?*mach_timebase_info_data) void;
4848
49pub extern "c" fn malloc_size(?*const c_void) usize;
50pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int;
49pub extern "c" fn malloc_size(?*const anyopaque) usize;
50pub extern "c" fn posix_memalign(memptr: *?*anyopaque, alignment: usize, size: usize) c_int;
5151
5252pub extern "c" fn kevent64(
5353 kq: c_int,
......@@ -196,7 +196,7 @@ pub extern "c" fn pthread_getname_np(thread: std.c.pthread_t, name: [*:0]u8, len
196196pub extern "c" fn arc4random_buf(buf: [*]u8, len: usize) void;
197197
198198// Grand Central Dispatch is exposed by libSystem.
199pub extern "c" fn dispatch_release(object: *c_void) void;
199pub extern "c" fn dispatch_release(object: *anyopaque) void;
200200
201201pub const dispatch_semaphore_t = *opaque {};
202202pub extern "c" fn dispatch_semaphore_create(value: isize) ?dispatch_semaphore_t;
......@@ -209,10 +209,10 @@ pub const DISPATCH_TIME_FOREVER = ~@as(dispatch_time_t, 0);
209209pub extern "c" fn dispatch_time(when: dispatch_time_t, delta: i64) dispatch_time_t;
210210
211211const dispatch_once_t = usize;
212const dispatch_function_t = fn (?*c_void) callconv(.C) void;
212const dispatch_function_t = fn (?*anyopaque) callconv(.C) void;
213213pub extern fn dispatch_once_f(
214214 predicate: *dispatch_once_t,
215 context: ?*c_void,
215 context: ?*anyopaque,
216216 function: dispatch_function_t,
217217) void;
218218
......@@ -243,9 +243,9 @@ pub const UL_COMPARE_AND_WAIT64 = 5;
243243pub const UL_COMPARE_AND_WAIT64_SHARED = 6;
244244pub const ULF_WAIT_ADAPTIVE_SPIN = 0x40000;
245245
246pub extern "c" fn __ulock_wait2(op: u32, addr: ?*const c_void, val: u64, timeout_ns: u64, val2: u64) c_int;
247pub extern "c" fn __ulock_wait(op: u32, addr: ?*const c_void, val: u64, timeout_us: u32) c_int;
248pub extern "c" fn __ulock_wake(op: u32, addr: ?*const c_void, val: u64) c_int;
246pub extern "c" fn __ulock_wait2(op: u32, addr: ?*const anyopaque, val: u64, timeout_ns: u64, val2: u64) c_int;
247pub extern "c" fn __ulock_wait(op: u32, addr: ?*const anyopaque, val: u64, timeout_us: u32) c_int;
248pub extern "c" fn __ulock_wake(op: u32, addr: ?*const anyopaque, val: u64) c_int;
249249
250250pub const OS_UNFAIR_LOCK_INIT = os_unfair_lock{};
251251pub const os_unfair_lock_t = *os_unfair_lock;
......@@ -483,10 +483,10 @@ pub const siginfo_t = extern struct {
483483 pid: pid_t,
484484 uid: uid_t,
485485 status: c_int,
486 addr: *c_void,
486 addr: *anyopaque,
487487 value: extern union {
488488 int: c_int,
489 ptr: *c_void,
489 ptr: *anyopaque,
490490 },
491491 si_band: c_long,
492492 _pad: [7]c_ulong,
......@@ -495,7 +495,7 @@ pub const siginfo_t = extern struct {
495495/// Renamed from `sigaction` to `Sigaction` to avoid conflict with function name.
496496pub const Sigaction = extern struct {
497497 pub const handler_fn = fn (c_int) callconv(.C) void;
498 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const c_void) callconv(.C) void;
498 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void;
499499
500500 handler: extern union {
501501 handler: ?handler_fn,
......@@ -611,7 +611,7 @@ pub const MAP = struct {
611611 pub const NOCACHE = 0x0400;
612612 /// don't reserve needed swap area
613613 pub const NORESERVE = 0x0040;
614 pub const FAILED = @intToPtr(*c_void, maxInt(usize));
614 pub const FAILED = @intToPtr(*anyopaque, maxInt(usize));
615615};
616616
617617pub const SA = struct {
......@@ -1537,10 +1537,10 @@ pub const RTLD = struct {
15371537 pub const NODELETE = 0x80;
15381538 pub const FIRST = 0x100;
15391539
1540 pub const NEXT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -1)));
1541 pub const DEFAULT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -2)));
1542 pub const SELF = @intToPtr(*c_void, @bitCast(usize, @as(isize, -3)));
1543 pub const MAIN_ONLY = @intToPtr(*c_void, @bitCast(usize, @as(isize, -5)));
1540 pub const NEXT = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -1)));
1541 pub const DEFAULT = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -2)));
1542 pub const SELF = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -3)));
1543 pub const MAIN_ONLY = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -5)));
15441544};
15451545
15461546pub const F = struct {
lib/std/c/dragonfly.zig+15-15
......@@ -12,18 +12,18 @@ pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
1212pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;
1313pub extern "c" fn pipe2(fds: *[2]fd_t, flags: u32) c_int;
1414
15pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int;
16pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
15pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*anyopaque) callconv(.C) c_int;
16pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*anyopaque) c_int;
1717
1818pub extern "c" fn lwp_gettid() c_int;
1919
20pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int;
20pub extern "c" fn posix_memalign(memptr: *?*anyopaque, alignment: usize, size: usize) c_int;
2121
2222pub const pthread_mutex_t = extern struct {
23 inner: ?*c_void = null,
23 inner: ?*anyopaque = null,
2424};
2525pub const pthread_cond_t = extern struct {
26 inner: ?*c_void = null,
26 inner: ?*anyopaque = null,
2727};
2828
2929pub const pthread_attr_t = extern struct { // copied from freebsd
......@@ -165,7 +165,7 @@ pub const PROT = struct {
165165
166166pub const MAP = struct {
167167 pub const FILE = 0;
168 pub const FAILED = @intToPtr(*c_void, maxInt(usize));
168 pub const FAILED = @intToPtr(*anyopaque, maxInt(usize));
169169 pub const ANONYMOUS = ANON;
170170 pub const COPY = PRIVATE;
171171 pub const SHARED = 1;
......@@ -648,7 +648,7 @@ pub const siginfo_t = extern struct {
648648 pid: c_int,
649649 uid: uid_t,
650650 status: c_int,
651 addr: ?*c_void,
651 addr: ?*anyopaque,
652652 value: sigval,
653653 band: c_long,
654654 __spare__: [7]c_int,
......@@ -656,7 +656,7 @@ pub const siginfo_t = extern struct {
656656
657657pub const sigval = extern union {
658658 sival_int: c_int,
659 sival_ptr: ?*c_void,
659 sival_ptr: ?*anyopaque,
660660};
661661
662662pub const _SIG_WORDS = 4;
......@@ -671,7 +671,7 @@ pub const sig_atomic_t = c_int;
671671
672672pub const Sigaction = extern struct {
673673 pub const handler_fn = fn (c_int) callconv(.C) void;
674 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const c_void) callconv(.C) void;
674 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void;
675675
676676 /// signal handler
677677 handler: extern union {
......@@ -847,10 +847,10 @@ pub const RTLD = struct {
847847 pub const NODELETE = 0x01000;
848848 pub const NOLOAD = 0x02000;
849849
850 pub const NEXT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -1)));
851 pub const DEFAULT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -2)));
852 pub const SELF = @intToPtr(*c_void, @bitCast(usize, @as(isize, -3)));
853 pub const ALL = @intToPtr(*c_void, @bitCast(usize, @as(isize, -4)));
850 pub const NEXT = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -1)));
851 pub const DEFAULT = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -2)));
852 pub const SELF = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -3)));
853 pub const ALL = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -4)));
854854};
855855
856856pub const dl_phdr_info = extern struct {
......@@ -865,11 +865,11 @@ pub const cmsghdr = extern struct {
865865 cmsg_type: c_int,
866866};
867867pub const msghdr = extern struct {
868 msg_name: ?*c_void,
868 msg_name: ?*anyopaque,
869869 msg_namelen: socklen_t,
870870 msg_iov: [*c]iovec,
871871 msg_iovlen: c_int,
872 msg_control: ?*c_void,
872 msg_control: ?*anyopaque,
873873 msg_controllen: socklen_t,
874874 msg_flags: c_int,
875875};
lib/std/c/freebsd.zig+13-13
......@@ -16,8 +16,8 @@ pub extern "c" fn pthread_set_name_np(thread: std.c.pthread_t, name: [*:0]const
1616pub extern "c" fn pthread_get_name_np(thread: std.c.pthread_t, name: [*:0]u8, len: usize) void;
1717pub extern "c" fn pipe2(fds: *[2]fd_t, flags: u32) c_int;
1818
19pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int;
20pub extern "c" fn malloc_usable_size(?*const c_void) usize;
19pub extern "c" fn posix_memalign(memptr: *?*anyopaque, alignment: usize, size: usize) c_int;
20pub extern "c" fn malloc_usable_size(?*const anyopaque) usize;
2121
2222pub const sf_hdtr = extern struct {
2323 headers: [*]const iovec_const,
......@@ -35,17 +35,17 @@ pub extern "c" fn sendfile(
3535 flags: u32,
3636) c_int;
3737
38pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int;
39pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
38pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*anyopaque) callconv(.C) c_int;
39pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*anyopaque) c_int;
4040
4141pub const pthread_mutex_t = extern struct {
42 inner: ?*c_void = null,
42 inner: ?*anyopaque = null,
4343};
4444pub const pthread_cond_t = extern struct {
45 inner: ?*c_void = null,
45 inner: ?*anyopaque = null,
4646};
4747pub const pthread_rwlock_t = extern struct {
48 ptr: ?*c_void = null,
48 ptr: ?*anyopaque = null,
4949};
5050
5151pub const pthread_attr_t = extern struct {
......@@ -216,7 +216,7 @@ pub const msghdr = extern struct {
216216 msg_iovlen: i32,
217217
218218 /// ancillary data
219 msg_control: ?*c_void,
219 msg_control: ?*anyopaque,
220220
221221 /// ancillary data buffer len
222222 msg_controllen: socklen_t,
......@@ -239,7 +239,7 @@ pub const msghdr_const = extern struct {
239239 msg_iovlen: i32,
240240
241241 /// ancillary data
242 msg_control: ?*c_void,
242 msg_control: ?*anyopaque,
243243
244244 /// ancillary data buffer len
245245 msg_controllen: socklen_t,
......@@ -393,7 +393,7 @@ pub const CLOCK = struct {
393393};
394394
395395pub const MAP = struct {
396 pub const FAILED = @intToPtr(*c_void, maxInt(usize));
396 pub const FAILED = @intToPtr(*anyopaque, maxInt(usize));
397397 pub const SHARED = 0x0001;
398398 pub const PRIVATE = 0x0002;
399399 pub const FIXED = 0x0010;
......@@ -515,7 +515,7 @@ pub const SIG = struct {
515515};
516516pub const sigval = extern union {
517517 int: c_int,
518 ptr: ?*c_void,
518 ptr: ?*anyopaque,
519519};
520520
521521pub const sigset_t = extern struct {
......@@ -949,7 +949,7 @@ const NSIG = 32;
949949/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
950950pub const Sigaction = extern struct {
951951 pub const handler_fn = fn (c_int) callconv(.C) void;
952 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const c_void) callconv(.C) void;
952 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void;
953953
954954 /// signal handler
955955 handler: extern union {
......@@ -971,7 +971,7 @@ pub const siginfo_t = extern struct {
971971 pid: pid_t,
972972 uid: uid_t,
973973 status: c_int,
974 addr: ?*c_void,
974 addr: ?*anyopaque,
975975 value: sigval,
976976 reason: extern union {
977977 fault: extern struct {
lib/std/c/haiku.zig+10-10
......@@ -10,7 +10,7 @@ pub const _errno = _errnop;
1010
1111pub extern "c" fn find_directory(which: c_int, volume: i32, createIt: bool, path_ptr: [*]u8, length: i32) u64;
1212
13pub extern "c" fn find_thread(thread_name: ?*c_void) i32;
13pub extern "c" fn find_thread(thread_name: ?*anyopaque) i32;
1414
1515pub extern "c" fn get_system_info(system_info: *system_info) usize;
1616
......@@ -41,7 +41,7 @@ pub const pthread_attr_t = extern struct {
4141 __sched_priority: i32,
4242 __stack_size: i32,
4343 __guard_size: i32,
44 __stack_address: ?*c_void,
44 __stack_address: ?*anyopaque,
4545};
4646
4747pub const pthread_mutex_t = extern struct {
......@@ -55,7 +55,7 @@ pub const pthread_mutex_t = extern struct {
5555pub const pthread_cond_t = extern struct {
5656 flags: u32 = 0,
5757 unused: i32 = -42,
58 mutex: ?*c_void = null,
58 mutex: ?*anyopaque = null,
5959 waiter_count: i32 = 0,
6060 lock: i32 = 0,
6161};
......@@ -180,7 +180,7 @@ pub const msghdr = extern struct {
180180 msg_iovlen: i32,
181181
182182 /// ancillary data
183 msg_control: ?*c_void,
183 msg_control: ?*anyopaque,
184184
185185 /// ancillary data buffer len
186186 msg_controllen: socklen_t,
......@@ -262,7 +262,7 @@ pub const area_info = extern struct {
262262 copy_count: u32,
263263 in_count: u32,
264264 out_count: u32,
265 address: *c_void,
265 address: *anyopaque,
266266};
267267
268268pub const MAXPATHLEN = PATH_MAX;
......@@ -272,13 +272,13 @@ pub const image_info = extern struct {
272272 image_type: u32,
273273 sequence: i32,
274274 init_order: i32,
275 init_routine: *c_void,
276 term_routine: *c_void,
275 init_routine: *anyopaque,
276 term_routine: *anyopaque,
277277 device: i32,
278278 node: i64,
279279 name: [MAXPATHLEN]u8,
280 text: *c_void,
281 data: *c_void,
280 text: *anyopaque,
281 data: *anyopaque,
282282 text_size: i32,
283283 data_size: i32,
284284 api_version: i32,
......@@ -396,7 +396,7 @@ pub const CLOCK = struct {
396396
397397pub const MAP = struct {
398398 /// mmap() error return code
399 pub const FAILED = @intToPtr(*c_void, maxInt(usize));
399 pub const FAILED = @intToPtr(*anyopaque, maxInt(usize));
400400 /// changes are seen by others
401401 pub const SHARED = 0x01;
402402 /// changes are only seen by caller
lib/std/c/linux.zig+7-7
......@@ -28,7 +28,7 @@ pub const MADV = linux.MADV;
2828pub const MAP = struct {
2929 pub usingnamespace linux.MAP;
3030 /// Only used by libc to communicate failure.
31 pub const FAILED = @intToPtr(*c_void, maxInt(usize));
31 pub const FAILED = @intToPtr(*anyopaque, maxInt(usize));
3232};
3333pub const MMAP2_UNIT = linux.MMAP2_UNIT;
3434pub const MSG = linux.MSG;
......@@ -228,7 +228,7 @@ pub extern "c" fn fstatat64(dirfd: fd_t, path: [*:0]const u8, stat_buf: *Stat, f
228228pub extern "c" fn ftruncate64(fd: c_int, length: off_t) c_int;
229229pub extern "c" fn getrlimit64(resource: rlimit_resource, rlim: *rlimit) c_int;
230230pub extern "c" fn lseek64(fd: fd_t, offset: i64, whence: c_int) i64;
231pub extern "c" fn mmap64(addr: ?*align(std.mem.page_size) c_void, len: usize, prot: c_uint, flags: c_uint, fd: fd_t, offset: i64) *c_void;
231pub extern "c" fn mmap64(addr: ?*align(std.mem.page_size) anyopaque, len: usize, prot: c_uint, flags: c_uint, fd: fd_t, offset: i64) *anyopaque;
232232pub extern "c" fn open64(path: [*:0]const u8, oflag: c_uint, ...) c_int;
233233pub extern "c" fn openat64(fd: c_int, path: [*:0]const u8, oflag: c_uint, ...) c_int;
234234pub extern "c" fn pread64(fd: fd_t, buf: [*]u8, nbyte: usize, offset: i64) isize;
......@@ -258,8 +258,8 @@ pub extern "c" fn inotify_rm_watch(fd: fd_t, wd: c_int) c_int;
258258/// See std.elf for constants for this
259259pub extern "c" fn getauxval(__type: c_ulong) c_ulong;
260260
261pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int;
262pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
261pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*anyopaque) callconv(.C) c_int;
262pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*anyopaque) c_int;
263263
264264pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
265265
......@@ -280,11 +280,11 @@ pub extern "c" fn copy_file_range(fd_in: fd_t, off_in: ?*i64, fd_out: fd_t, off_
280280pub extern "c" fn signalfd(fd: fd_t, mask: *const sigset_t, flags: c_uint) c_int;
281281
282282pub extern "c" fn prlimit(pid: pid_t, resource: rlimit_resource, new_limit: *const rlimit, old_limit: *rlimit) c_int;
283pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int;
284pub extern "c" fn malloc_usable_size(?*const c_void) usize;
283pub extern "c" fn posix_memalign(memptr: *?*anyopaque, alignment: usize, size: usize) c_int;
284pub extern "c" fn malloc_usable_size(?*const anyopaque) usize;
285285
286286pub extern "c" fn madvise(
287 addr: *align(std.mem.page_size) c_void,
287 addr: *align(std.mem.page_size) anyopaque,
288288 length: usize,
289289 advice: c_uint,
290290) c_int;
lib/std/c/netbsd.zig+17-17
......@@ -9,8 +9,8 @@ const rusage = std.c.rusage;
99extern "c" fn __errno() *c_int;
1010pub const _errno = __errno;
1111
12pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int;
13pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
12pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*anyopaque) callconv(.C) c_int;
13pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*anyopaque) c_int;
1414
1515pub extern "c" fn _lwp_self() lwpid_t;
1616
......@@ -56,7 +56,7 @@ pub const getrusage = __getrusage50;
5656pub extern "c" fn __libc_thr_yield() c_int;
5757pub const sched_yield = __libc_thr_yield;
5858
59pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int;
59pub extern "c" fn posix_memalign(memptr: *?*anyopaque, alignment: usize, size: usize) c_int;
6060
6161pub const pthread_mutex_t = extern struct {
6262 magic: u32 = 0x33330003,
......@@ -65,7 +65,7 @@ pub const pthread_mutex_t = extern struct {
6565 owner: usize = 0,
6666 waiters: ?*u8 = null,
6767 recursed: u32 = 0,
68 spare2: ?*c_void = null,
68 spare2: ?*anyopaque = null,
6969};
7070
7171pub const pthread_cond_t = extern struct {
......@@ -74,7 +74,7 @@ pub const pthread_cond_t = extern struct {
7474 waiters_first: ?*u8 = null,
7575 waiters_last: ?*u8 = null,
7676 mutex: ?*pthread_mutex_t = null,
77 private: ?*c_void = null,
77 private: ?*anyopaque = null,
7878};
7979
8080pub const pthread_rwlock_t = extern struct {
......@@ -90,7 +90,7 @@ pub const pthread_rwlock_t = extern struct {
9090 wblocked_last: ?*u8 = null,
9191 nreaders: c_uint = 0,
9292 owner: std.c.pthread_t = null,
93 private: ?*c_void = null,
93 private: ?*anyopaque = null,
9494};
9595
9696const pthread_spin_t = switch (builtin.cpu.arch) {
......@@ -113,12 +113,12 @@ const padded_pthread_spin_t = switch (builtin.cpu.arch) {
113113pub const pthread_attr_t = extern struct {
114114 pta_magic: u32,
115115 pta_flags: i32,
116 pta_private: ?*c_void,
116 pta_private: ?*anyopaque,
117117};
118118
119119pub const sem_t = ?*opaque {};
120120
121pub extern "c" fn pthread_setname_np(thread: std.c.pthread_t, name: [*:0]const u8, arg: ?*c_void) E;
121pub extern "c" fn pthread_setname_np(thread: std.c.pthread_t, name: [*:0]const u8, arg: ?*anyopaque) E;
122122pub extern "c" fn pthread_getname_np(thread: std.c.pthread_t, name: [*:0]u8, len: usize) E;
123123
124124pub const blkcnt_t = i64;
......@@ -156,9 +156,9 @@ pub const RTLD = struct {
156156 pub const NODELETE = 0x01000;
157157 pub const NOLOAD = 0x02000;
158158
159 pub const NEXT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -1)));
160 pub const DEFAULT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -2)));
161 pub const SELF = @intToPtr(*c_void, @bitCast(usize, @as(isize, -3)));
159 pub const NEXT = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -1)));
160 pub const DEFAULT = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -2)));
161 pub const SELF = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -3)));
162162};
163163
164164pub const dl_phdr_info = extern struct {
......@@ -249,7 +249,7 @@ pub const msghdr = extern struct {
249249 msg_iovlen: i32,
250250
251251 /// ancillary data
252 msg_control: ?*c_void,
252 msg_control: ?*anyopaque,
253253
254254 /// ancillary data buffer len
255255 msg_controllen: socklen_t,
......@@ -272,7 +272,7 @@ pub const msghdr_const = extern struct {
272272 msg_iovlen: i32,
273273
274274 /// ancillary data
275 msg_control: ?*c_void,
275 msg_control: ?*anyopaque,
276276
277277 /// ancillary data buffer len
278278 msg_controllen: socklen_t,
......@@ -556,7 +556,7 @@ pub const CLOCK = struct {
556556};
557557
558558pub const MAP = struct {
559 pub const FAILED = @intToPtr(*c_void, maxInt(usize));
559 pub const FAILED = @intToPtr(*anyopaque, maxInt(usize));
560560 pub const SHARED = 0x0001;
561561 pub const PRIVATE = 0x0002;
562562 pub const REMAPDUP = 0x0004;
......@@ -962,7 +962,7 @@ pub const SIG = struct {
962962/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
963963pub const Sigaction = extern struct {
964964 pub const handler_fn = fn (c_int) callconv(.C) void;
965 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const c_void) callconv(.C) void;
965 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void;
966966
967967 /// signal handler
968968 handler: extern union {
......@@ -977,7 +977,7 @@ pub const Sigaction = extern struct {
977977
978978pub const sigval_t = extern union {
979979 int: i32,
980 ptr: ?*c_void,
980 ptr: ?*anyopaque,
981981};
982982
983983pub const siginfo_t = extern union {
......@@ -1005,7 +1005,7 @@ pub const _ksiginfo = extern struct {
10051005 stime: clock_t,
10061006 },
10071007 fault: extern struct {
1008 addr: ?*c_void,
1008 addr: ?*anyopaque,
10091009 trap: i32,
10101010 trap2: i32,
10111011 trap3: i32,
lib/std/c/openbsd.zig+14-14
......@@ -7,8 +7,8 @@ const iovec_const = std.os.iovec_const;
77extern "c" fn __errno() *c_int;
88pub const _errno = __errno;
99
10pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int;
11pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
10pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*anyopaque) callconv(.C) c_int;
11pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*anyopaque) c_int;
1212
1313pub extern "c" fn arc4random_buf(buf: [*]u8, len: usize) void;
1414
......@@ -19,25 +19,25 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
1919pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
2020
2121pub const pthread_mutex_t = extern struct {
22 inner: ?*c_void = null,
22 inner: ?*anyopaque = null,
2323};
2424pub const pthread_cond_t = extern struct {
25 inner: ?*c_void = null,
25 inner: ?*anyopaque = null,
2626};
2727pub const pthread_rwlock_t = extern struct {
28 ptr: ?*c_void = null,
28 ptr: ?*anyopaque = null,
2929};
3030pub const pthread_spinlock_t = extern struct {
31 inner: ?*c_void = null,
31 inner: ?*anyopaque = null,
3232};
3333pub const pthread_attr_t = extern struct {
34 inner: ?*c_void = null,
34 inner: ?*anyopaque = null,
3535};
3636pub const pthread_key_t = c_int;
3737
3838pub const sem_t = ?*opaque {};
3939
40pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int;
40pub extern "c" fn posix_memalign(memptr: *?*anyopaque, alignment: usize, size: usize) c_int;
4141
4242pub extern "c" fn pledge(promises: ?[*:0]const u8, execpromises: ?[*:0]const u8) c_int;
4343pub extern "c" fn unveil(path: ?[*:0]const u8, permissions: ?[*:0]const u8) c_int;
......@@ -174,7 +174,7 @@ pub const msghdr = extern struct {
174174 msg_iovlen: c_uint,
175175
176176 /// ancillary data
177 msg_control: ?*c_void,
177 msg_control: ?*anyopaque,
178178
179179 /// ancillary data buffer len
180180 msg_controllen: socklen_t,
......@@ -197,7 +197,7 @@ pub const msghdr_const = extern struct {
197197 msg_iovlen: c_uint,
198198
199199 /// ancillary data
200 msg_control: ?*c_void,
200 msg_control: ?*anyopaque,
201201
202202 /// ancillary data buffer len
203203 msg_controllen: socklen_t,
......@@ -346,7 +346,7 @@ pub const CLOCK = struct {
346346};
347347
348348pub const MAP = struct {
349 pub const FAILED = @intToPtr(*c_void, maxInt(usize));
349 pub const FAILED = @intToPtr(*anyopaque, maxInt(usize));
350350 pub const SHARED = 0x0001;
351351 pub const PRIVATE = 0x0002;
352352 pub const FIXED = 0x0010;
......@@ -889,7 +889,7 @@ pub const SIG = struct {
889889/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
890890pub const Sigaction = extern struct {
891891 pub const handler_fn = fn (c_int) callconv(.C) void;
892 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const c_void) callconv(.C) void;
892 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void;
893893
894894 /// signal handler
895895 handler: extern union {
......@@ -904,7 +904,7 @@ pub const Sigaction = extern struct {
904904
905905pub const sigval = extern union {
906906 int: c_int,
907 ptr: ?*c_void,
907 ptr: ?*anyopaque,
908908};
909909
910910pub const siginfo_t = extern struct {
......@@ -927,7 +927,7 @@ pub const siginfo_t = extern struct {
927927 },
928928 },
929929 fault: extern struct {
930 addr: ?*c_void,
930 addr: ?*anyopaque,
931931 trapno: c_int,
932932 },
933933 __pad: [128 - 3 * @sizeOf(c_int)]u8,
lib/std/c/solaris.zig+20-20
......@@ -8,14 +8,14 @@ const timezone = std.c.timezone;
88extern "c" fn ___errno() *c_int;
99pub const _errno = ___errno;
1010
11pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int;
12pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
11pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*anyopaque) callconv(.C) c_int;
12pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*anyopaque) c_int;
1313
1414pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
1515pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
1616pub extern "c" fn pipe2(fds: *[2]fd_t, flags: u32) c_int;
1717pub extern "c" fn arc4random_buf(buf: [*]u8, len: usize) void;
18pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int;
18pub extern "c" fn posix_memalign(memptr: *?*anyopaque, alignment: usize, size: usize) c_int;
1919pub extern "c" fn sysconf(sc: c_int) i64;
2020pub extern "c" fn signalfd(fd: fd_t, mask: *const sigset_t, flags: u32) c_int;
2121pub extern "c" fn madvise(address: [*]u8, len: usize, advise: u32) c_int;
......@@ -44,7 +44,7 @@ pub const pthread_rwlock_t = extern struct {
4444 writercv: pthread_cond_t = .{},
4545};
4646pub const pthread_attr_t = extern struct {
47 mutexattr: ?*c_void = null,
47 mutexattr: ?*anyopaque = null,
4848};
4949pub const pthread_key_t = c_int;
5050
......@@ -56,7 +56,7 @@ pub const sem_t = extern struct {
5656 __pad2: [2]u64 = [_]u64{0} ** 2,
5757};
5858
59pub extern "c" fn pthread_setname_np(thread: std.c.pthread_t, name: [*:0]const u8, arg: ?*c_void) E;
59pub extern "c" fn pthread_setname_np(thread: std.c.pthread_t, name: [*:0]const u8, arg: ?*anyopaque) E;
6060pub extern "c" fn pthread_getname_np(thread: std.c.pthread_t, name: [*:0]u8, len: usize) E;
6161
6262pub const blkcnt_t = i64;
......@@ -109,10 +109,10 @@ pub const RTLD = struct {
109109 pub const FIRST = 0x02000;
110110 pub const CONFGEN = 0x10000;
111111
112 pub const NEXT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -1)));
113 pub const DEFAULT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -2)));
114 pub const SELF = @intToPtr(*c_void, @bitCast(usize, @as(isize, -3)));
115 pub const PROBE = @intToPtr(*c_void, @bitCast(usize, @as(isize, -4)));
112 pub const NEXT = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -1)));
113 pub const DEFAULT = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -2)));
114 pub const SELF = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -3)));
115 pub const PROBE = @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -4)));
116116};
117117
118118pub const Flock = extern struct {
......@@ -189,7 +189,7 @@ pub const msghdr = extern struct {
189189 /// # elements in msg_iov
190190 msg_iovlen: i32,
191191 /// ancillary data
192 msg_control: ?*c_void,
192 msg_control: ?*anyopaque,
193193 /// ancillary data buffer len
194194 msg_controllen: socklen_t,
195195 /// flags on received message
......@@ -206,7 +206,7 @@ pub const msghdr_const = extern struct {
206206 /// # elements in msg_iov
207207 msg_iovlen: i32,
208208 /// ancillary data
209 msg_control: ?*c_void,
209 msg_control: ?*anyopaque,
210210 /// ancillary data buffer len
211211 msg_controllen: socklen_t,
212212 /// flags on received message
......@@ -514,7 +514,7 @@ pub const CLOCK = struct {
514514};
515515
516516pub const MAP = struct {
517 pub const FAILED = @intToPtr(*c_void, maxInt(usize));
517 pub const FAILED = @intToPtr(*anyopaque, maxInt(usize));
518518 pub const SHARED = 0x0001;
519519 pub const PRIVATE = 0x0002;
520520 pub const TYPE = 0x000f;
......@@ -947,7 +947,7 @@ pub const SIG = struct {
947947/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
948948pub const Sigaction = extern struct {
949949 pub const handler_fn = fn (c_int) callconv(.C) void;
950 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const c_void) callconv(.C) void;
950 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void;
951951
952952 /// signal options
953953 flags: c_uint,
......@@ -962,7 +962,7 @@ pub const Sigaction = extern struct {
962962
963963pub const sigval_t = extern union {
964964 int: c_int,
965 ptr: ?*c_void,
965 ptr: ?*anyopaque,
966966};
967967
968968pub const siginfo_t = extern struct {
......@@ -989,9 +989,9 @@ pub const siginfo_t = extern struct {
989989 zone: zoneid_t,
990990 },
991991 fault: extern struct {
992 addr: ?*c_void,
992 addr: ?*anyopaque,
993993 trapno: c_int,
994 pc: ?*c_void,
994 pc: ?*anyopaque,
995995 },
996996 file: extern struct {
997997 // fd not currently available for SIGPOLL.
......@@ -999,7 +999,7 @@ pub const siginfo_t = extern struct {
999999 band: c_long,
10001000 },
10011001 prof: extern struct {
1002 addr: ?*c_void,
1002 addr: ?*anyopaque,
10031003 timestamp: timespec,
10041004 syscall: c_short,
10051005 sysarg: u8,
......@@ -1065,7 +1065,7 @@ pub const ucontext_t = extern struct {
10651065 sigmask: sigset_t,
10661066 stack: stack_t,
10671067 mcontext: mcontext_t,
1068 brand_data: [3]?*c_void,
1068 brand_data: [3]?*anyopaque,
10691069 filler: [2]i64,
10701070};
10711071
......@@ -1783,9 +1783,9 @@ pub const port_event = extern struct {
17831783 source: u16,
17841784 __pad: u16,
17851785 /// Source-specific object.
1786 object: ?*c_void,
1786 object: ?*anyopaque,
17871787 /// User cookie.
1788 cookie: ?*c_void,
1788 cookie: ?*anyopaque,
17891789};
17901790
17911791pub const port_notify = extern struct {
lib/std/c/windows.zig+1-1
......@@ -5,7 +5,7 @@ const windows = std.os.windows;
55
66pub extern "c" fn _errno() *c_int;
77
8pub extern "c" fn _msize(memblock: ?*c_void) usize;
8pub extern "c" fn _msize(memblock: ?*anyopaque) usize;
99
1010// TODO: copied the else case and removed the socket function (because its in ws2_32)
1111// need to verify which of these is actually supported on windows
lib/std/child_process.zig+1-1
......@@ -923,7 +923,7 @@ fn windowsCreateProcess(app_name: [*:0]u16, cmd_line: [*:0]u16, envp_ptr: ?[*]u1
923923 null,
924924 windows.TRUE,
925925 windows.CREATE_UNICODE_ENVIRONMENT,
926 @ptrCast(?*c_void, envp_ptr),
926 @ptrCast(?*anyopaque, envp_ptr),
927927 cwd_ptr,
928928 lpStartupInfo,
929929 lpProcessInformation,
lib/std/crypto/tlcsprng.zig+1-1
......@@ -59,7 +59,7 @@ var install_atfork_handler = std.once(struct {
5959
6060threadlocal var wipe_mem: []align(mem.page_size) u8 = &[_]u8{};
6161
62fn tlsCsprngFill(_: *c_void, buffer: []u8) void {
62fn tlsCsprngFill(_: *anyopaque, buffer: []u8) void {
6363 if (builtin.link_libc and @hasDecl(std.c, "arc4random_buf")) {
6464 // arc4random is already a thread-local CSPRNG.
6565 return std.c.arc4random_buf(buffer.ptr, buffer.len);
lib/std/debug.zig+4-4
......@@ -156,14 +156,14 @@ pub fn captureStackTrace(first_address: ?usize, stack_trace: *std.builtin.StackT
156156 stack_trace.index = windows.ntdll.RtlCaptureStackBackTrace(
157157 0,
158158 u32_addrs_len,
159 @ptrCast(**c_void, addrs.ptr),
159 @ptrCast(**anyopaque, addrs.ptr),
160160 null,
161161 );
162162 return;
163163 };
164164 var addr_buf_stack: [32]usize = undefined;
165165 const addr_buf = if (addr_buf_stack.len > addrs.len) addr_buf_stack[0..] else addrs;
166 const n = windows.ntdll.RtlCaptureStackBackTrace(0, u32_addrs_len, @ptrCast(**c_void, addr_buf.ptr), null);
166 const n = windows.ntdll.RtlCaptureStackBackTrace(0, u32_addrs_len, @ptrCast(**anyopaque, addr_buf.ptr), null);
167167 const first_index = for (addr_buf[0..n]) |addr, i| {
168168 if (addr == first_addr) {
169169 break i;
......@@ -472,7 +472,7 @@ pub fn writeCurrentStackTraceWindows(
472472 start_addr: ?usize,
473473) !void {
474474 var addr_buf: [1024]usize = undefined;
475 const n = windows.ntdll.RtlCaptureStackBackTrace(0, addr_buf.len, @ptrCast(**c_void, &addr_buf), null);
475 const n = windows.ntdll.RtlCaptureStackBackTrace(0, addr_buf.len, @ptrCast(**anyopaque, &addr_buf), null);
476476 const addrs = addr_buf[0..n];
477477 var start_i: usize = if (start_addr) |saddr| blk: {
478478 for (addrs) |addr, i| {
......@@ -1629,7 +1629,7 @@ fn resetSegfaultHandler() void {
16291629 os.sigaction(os.SIG.BUS, &act, null);
16301630}
16311631
1632fn handleSegfaultLinux(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const c_void) callconv(.C) noreturn {
1632fn handleSegfaultLinux(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const anyopaque) callconv(.C) noreturn {
16331633 // Reset to the default handler so that if a segfault happens in this handler it will crash
16341634 // the process. Also when this handler returns, the original instruction will be repeated
16351635 // and the resulting segfault will crash the process rather than continually dump stack traces.
lib/std/dynamic_library.zig+1-1
......@@ -357,7 +357,7 @@ pub const WindowsDynLib = struct {
357357pub const DlDynlib = struct {
358358 pub const Error = error{FileNotFound};
359359
360 handle: *c_void,
360 handle: *anyopaque,
361361
362362 pub fn open(path: []const u8) !DlDynlib {
363363 const path_c = try os.toPosixPath(path);
lib/std/fs/get_app_data_dir.zig+1-1
......@@ -23,7 +23,7 @@ pub fn getAppDataDir(allocator: mem.Allocator, appname: []const u8) GetAppDataDi
2323 &dir_path_ptr,
2424 )) {
2525 os.windows.S_OK => {
26 defer os.windows.ole32.CoTaskMemFree(@ptrCast(*c_void, dir_path_ptr));
26 defer os.windows.ole32.CoTaskMemFree(@ptrCast(*anyopaque, dir_path_ptr));
2727 const global_dir = unicode.utf16leToUtf8Alloc(allocator, mem.sliceTo(dir_path_ptr, 0)) catch |err| switch (err) {
2828 error.UnexpectedSecondSurrogateHalf => return error.AppDataDirUnavailable,
2929 error.ExpectedSecondSurrogateHalf => return error.AppDataDirUnavailable,
lib/std/heap.zig+18-18
......@@ -58,7 +58,7 @@ const CAllocator = struct {
5858 // multiple of the pointer size
5959 const eff_alignment = std.math.max(alignment, @sizeOf(usize));
6060
61 var aligned_ptr: ?*c_void = undefined;
61 var aligned_ptr: ?*anyopaque = undefined;
6262 if (c.posix_memalign(&aligned_ptr, eff_alignment, len) != 0)
6363 return null;
6464
......@@ -97,7 +97,7 @@ const CAllocator = struct {
9797 }
9898
9999 fn alloc(
100 _: *c_void,
100 _: *anyopaque,
101101 len: usize,
102102 alignment: u29,
103103 len_align: u29,
......@@ -123,7 +123,7 @@ const CAllocator = struct {
123123 }
124124
125125 fn resize(
126 _: *c_void,
126 _: *anyopaque,
127127 buf: []u8,
128128 buf_align: u29,
129129 new_len: usize,
......@@ -145,7 +145,7 @@ const CAllocator = struct {
145145 }
146146
147147 fn free(
148 _: *c_void,
148 _: *anyopaque,
149149 buf: []u8,
150150 buf_align: u29,
151151 return_address: usize,
......@@ -185,7 +185,7 @@ const raw_c_allocator_vtable = Allocator.VTable{
185185};
186186
187187fn rawCAlloc(
188 _: *c_void,
188 _: *anyopaque,
189189 len: usize,
190190 ptr_align: u29,
191191 len_align: u29,
......@@ -199,7 +199,7 @@ fn rawCAlloc(
199199}
200200
201201fn rawCResize(
202 _: *c_void,
202 _: *anyopaque,
203203 buf: []u8,
204204 old_align: u29,
205205 new_len: usize,
......@@ -215,7 +215,7 @@ fn rawCResize(
215215}
216216
217217fn rawCFree(
218 _: *c_void,
218 _: *anyopaque,
219219 buf: []u8,
220220 old_align: u29,
221221 ret_addr: usize,
......@@ -257,7 +257,7 @@ const PageAllocator = struct {
257257 .free = free,
258258 };
259259
260 fn alloc(_: *c_void, n: usize, alignment: u29, len_align: u29, ra: usize) error{OutOfMemory}![]u8 {
260 fn alloc(_: *anyopaque, n: usize, alignment: u29, len_align: u29, ra: usize) error{OutOfMemory}![]u8 {
261261 _ = ra;
262262 assert(n > 0);
263263 const aligned_len = mem.alignForward(n, mem.page_size);
......@@ -305,7 +305,7 @@ const PageAllocator = struct {
305305 // VirtualAlloc call to fail. To handle this, we will retry
306306 // until it succeeds.
307307 const ptr = w.VirtualAlloc(
308 @intToPtr(*c_void, aligned_addr),
308 @intToPtr(*anyopaque, aligned_addr),
309309 aligned_len,
310310 w.MEM_COMMIT | w.MEM_RESERVE,
311311 w.PAGE_READWRITE,
......@@ -355,7 +355,7 @@ const PageAllocator = struct {
355355 }
356356
357357 fn resize(
358 _: *c_void,
358 _: *anyopaque,
359359 buf_unaligned: []u8,
360360 buf_align: u29,
361361 new_size: usize,
......@@ -376,7 +376,7 @@ const PageAllocator = struct {
376376 // For shrinking that is not releasing, we will only
377377 // decommit the pages not needed anymore.
378378 w.VirtualFree(
379 @intToPtr(*c_void, new_addr_end),
379 @intToPtr(*anyopaque, new_addr_end),
380380 old_addr_end - new_addr_end,
381381 w.MEM_DECOMMIT,
382382 );
......@@ -406,7 +406,7 @@ const PageAllocator = struct {
406406 return null;
407407 }
408408
409 fn free(_: *c_void, buf_unaligned: []u8, buf_align: u29, return_address: usize) void {
409 fn free(_: *anyopaque, buf_unaligned: []u8, buf_align: u29, return_address: usize) void {
410410 _ = buf_align;
411411 _ = return_address;
412412
......@@ -518,7 +518,7 @@ const WasmPageAllocator = struct {
518518 return mem.alignForward(memsize, mem.page_size) / mem.page_size;
519519 }
520520
521 fn alloc(_: *c_void, len: usize, alignment: u29, len_align: u29, ra: usize) error{OutOfMemory}![]u8 {
521 fn alloc(_: *anyopaque, len: usize, alignment: u29, len_align: u29, ra: usize) error{OutOfMemory}![]u8 {
522522 _ = ra;
523523 const page_count = nPages(len);
524524 const page_idx = try allocPages(page_count, alignment);
......@@ -573,7 +573,7 @@ const WasmPageAllocator = struct {
573573 }
574574
575575 fn resize(
576 _: *c_void,
576 _: *anyopaque,
577577 buf: []u8,
578578 buf_align: u29,
579579 new_len: usize,
......@@ -594,7 +594,7 @@ const WasmPageAllocator = struct {
594594 }
595595
596596 fn free(
597 _: *c_void,
597 _: *anyopaque,
598598 buf: []u8,
599599 buf_align: u29,
600600 return_address: usize,
......@@ -684,10 +684,10 @@ pub const HeapAllocator = switch (builtin.os.tag) {
684684 const new_ptr = os.windows.kernel32.HeapReAlloc(
685685 self.heap_handle.?,
686686 os.windows.HEAP_REALLOC_IN_PLACE_ONLY,
687 @intToPtr(*c_void, root_addr),
687 @intToPtr(*anyopaque, root_addr),
688688 amt,
689689 ) orelse return null;
690 assert(new_ptr == @intToPtr(*c_void, root_addr));
690 assert(new_ptr == @intToPtr(*anyopaque, root_addr));
691691 const return_len = init: {
692692 if (len_align == 0) break :init new_size;
693693 const full_len = os.windows.kernel32.HeapSize(self.heap_handle.?, 0, new_ptr);
......@@ -707,7 +707,7 @@ pub const HeapAllocator = switch (builtin.os.tag) {
707707 ) void {
708708 _ = buf_align;
709709 _ = return_address;
710 os.windows.HeapFree(self.heap_handle.?, 0, @intToPtr(*c_void, getRecordPtr(buf).*));
710 os.windows.HeapFree(self.heap_handle.?, 0, @intToPtr(*anyopaque, getRecordPtr(buf).*));
711711 }
712712 },
713713 else => @compileError("Unsupported OS"),
lib/std/mem.zig+3-3
......@@ -151,11 +151,11 @@ const fail_allocator = Allocator{
151151
152152const failAllocator_vtable = Allocator.VTable{
153153 .alloc = failAllocatorAlloc,
154 .resize = Allocator.NoResize(c_void).noResize,
155 .free = Allocator.NoOpFree(c_void).noOpFree,
154 .resize = Allocator.NoResize(anyopaque).noResize,
155 .free = Allocator.NoOpFree(anyopaque).noOpFree,
156156};
157157
158fn failAllocatorAlloc(_: *c_void, n: usize, alignment: u29, len_align: u29, ra: usize) Allocator.Error![]u8 {
158fn failAllocatorAlloc(_: *anyopaque, n: usize, alignment: u29, len_align: u29, ra: usize) Allocator.Error![]u8 {
159159 _ = n;
160160 _ = alignment;
161161 _ = len_align;
lib/std/mem/Allocator.zig+7-7
......@@ -10,7 +10,7 @@ const builtin = @import("builtin");
1010pub const Error = error{OutOfMemory};
1111
1212// The type erased pointer to the allocator implementation
13ptr: *c_void,
13ptr: *anyopaque,
1414vtable: *const VTable,
1515
1616pub const VTable = struct {
......@@ -23,7 +23,7 @@ pub const VTable = struct {
2323 ///
2424 /// `ret_addr` is optionally provided as the first return address of the allocation call stack.
2525 /// If the value is `0` it means no return address has been provided.
26 alloc: fn (ptr: *c_void, len: usize, ptr_align: u29, len_align: u29, ret_addr: usize) Error![]u8,
26 alloc: fn (ptr: *anyopaque, len: usize, ptr_align: u29, len_align: u29, ret_addr: usize) Error![]u8,
2727
2828 /// Attempt to expand or shrink memory in place. `buf.len` must equal the most recent
2929 /// length returned by `alloc` or `resize`. `buf_align` must equal the same value
......@@ -42,14 +42,14 @@ pub const VTable = struct {
4242 ///
4343 /// `ret_addr` is optionally provided as the first return address of the allocation call stack.
4444 /// If the value is `0` it means no return address has been provided.
45 resize: fn (ptr: *c_void, buf: []u8, buf_align: u29, new_len: usize, len_align: u29, ret_addr: usize) ?usize,
45 resize: fn (ptr: *anyopaque, buf: []u8, buf_align: u29, new_len: usize, len_align: u29, ret_addr: usize) ?usize,
4646
4747 /// Free and invalidate a buffer. `buf.len` must equal the most recent length returned by `alloc` or `resize`.
4848 /// `buf_align` must equal the same value that was passed as the `ptr_align` parameter to the original `alloc` call.
4949 ///
5050 /// `ret_addr` is optionally provided as the first return address of the allocation call stack.
5151 /// If the value is `0` it means no return address has been provided.
52 free: fn (ptr: *c_void, buf: []u8, buf_align: u29, ret_addr: usize) void,
52 free: fn (ptr: *anyopaque, buf: []u8, buf_align: u29, ret_addr: usize) void,
5353};
5454
5555pub fn init(
......@@ -67,16 +67,16 @@ pub fn init(
6767 const alignment = ptr_info.Pointer.alignment;
6868
6969 const gen = struct {
70 fn allocImpl(ptr: *c_void, len: usize, ptr_align: u29, len_align: u29, ret_addr: usize) Error![]u8 {
70 fn allocImpl(ptr: *anyopaque, len: usize, ptr_align: u29, len_align: u29, ret_addr: usize) Error![]u8 {
7171 const self = @ptrCast(Ptr, @alignCast(alignment, ptr));
7272 return @call(.{ .modifier = .always_inline }, allocFn, .{ self, len, ptr_align, len_align, ret_addr });
7373 }
74 fn resizeImpl(ptr: *c_void, buf: []u8, buf_align: u29, new_len: usize, len_align: u29, ret_addr: usize) ?usize {
74 fn resizeImpl(ptr: *anyopaque, buf: []u8, buf_align: u29, new_len: usize, len_align: u29, ret_addr: usize) ?usize {
7575 assert(new_len != 0);
7676 const self = @ptrCast(Ptr, @alignCast(alignment, ptr));
7777 return @call(.{ .modifier = .always_inline }, resizeFn, .{ self, buf, buf_align, new_len, len_align, ret_addr });
7878 }
79 fn freeImpl(ptr: *c_void, buf: []u8, buf_align: u29, ret_addr: usize) void {
79 fn freeImpl(ptr: *anyopaque, buf: []u8, buf_align: u29, ret_addr: usize) void {
8080 const self = @ptrCast(Ptr, @alignCast(alignment, ptr));
8181 @call(.{ .modifier = .always_inline }, freeFn, .{ self, buf, buf_align, ret_addr });
8282 }
lib/std/os.zig+7-7
......@@ -2904,7 +2904,7 @@ pub fn isCygwinPty(handle: fd_t) bool {
29042904 if (windows.kernel32.GetFileInformationByHandleEx(
29052905 handle,
29062906 windows.FileNameInfo,
2907 @ptrCast(*c_void, &name_info_bytes),
2907 @ptrCast(*anyopaque, &name_info_bytes),
29082908 name_info_bytes.len,
29092909 ) == 0) {
29102910 return false;
......@@ -4236,9 +4236,9 @@ pub const SysCtlError = error{
42364236
42374237pub fn sysctl(
42384238 name: []const c_int,
4239 oldp: ?*c_void,
4239 oldp: ?*anyopaque,
42404240 oldlenp: ?*usize,
4241 newp: ?*c_void,
4241 newp: ?*anyopaque,
42424242 newlen: usize,
42434243) SysCtlError!void {
42444244 if (builtin.os.tag == .wasi) {
......@@ -4261,9 +4261,9 @@ pub fn sysctl(
42614261
42624262pub fn sysctlbynameZ(
42634263 name: [*:0]const u8,
4264 oldp: ?*c_void,
4264 oldp: ?*anyopaque,
42654265 oldlenp: ?*usize,
4266 newp: ?*c_void,
4266 newp: ?*anyopaque,
42674267 newlen: usize,
42684268) SysCtlError!void {
42694269 if (builtin.os.tag == .wasi) {
......@@ -4801,12 +4801,12 @@ pub fn dl_iterate_phdr(
48014801
48024802 if (builtin.link_libc) {
48034803 switch (system.dl_iterate_phdr(struct {
4804 fn callbackC(info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int {
4804 fn callbackC(info: *dl_phdr_info, size: usize, data: ?*anyopaque) callconv(.C) c_int {
48054805 const context_ptr = @ptrCast(*const Context, @alignCast(@alignOf(*const Context), data));
48064806 callback(info, size, context_ptr.*) catch |err| return @errorToInt(err);
48074807 return 0;
48084808 }
4809 }.callbackC, @intToPtr(?*c_void, @ptrToInt(&context)))) {
4809 }.callbackC, @intToPtr(?*anyopaque, @ptrToInt(&context)))) {
48104810 0 => return,
48114811 else => |err| return @errSetCast(Error, @intToError(@intCast(u16, err))), // TODO don't hardcode u16
48124812 }
lib/std/os/linux.zig+12-12
......@@ -845,14 +845,14 @@ pub fn flock(fd: fd_t, operation: i32) usize {
845845 return syscall2(.flock, @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, operation)));
846846}
847847
848var vdso_clock_gettime = @ptrCast(?*const c_void, init_vdso_clock_gettime);
848var vdso_clock_gettime = @ptrCast(?*const anyopaque, init_vdso_clock_gettime);
849849
850850// We must follow the C calling convention when we call into the VDSO
851851const vdso_clock_gettime_ty = fn (i32, *timespec) callconv(.C) usize;
852852
853853pub fn clock_gettime(clk_id: i32, tp: *timespec) usize {
854854 if (@hasDecl(VDSO, "CGT_SYM")) {
855 const ptr = @atomicLoad(?*const c_void, &vdso_clock_gettime, .Unordered);
855 const ptr = @atomicLoad(?*const anyopaque, &vdso_clock_gettime, .Unordered);
856856 if (ptr) |fn_ptr| {
857857 const f = @ptrCast(vdso_clock_gettime_ty, fn_ptr);
858858 const rc = f(clk_id, tp);
......@@ -866,10 +866,10 @@ pub fn clock_gettime(clk_id: i32, tp: *timespec) usize {
866866}
867867
868868fn init_vdso_clock_gettime(clk: i32, ts: *timespec) callconv(.C) usize {
869 const ptr = @intToPtr(?*const c_void, vdso.lookup(VDSO.CGT_VER, VDSO.CGT_SYM));
869 const ptr = @intToPtr(?*const anyopaque, vdso.lookup(VDSO.CGT_VER, VDSO.CGT_SYM));
870870 // Note that we may not have a VDSO at all, update the stub address anyway
871871 // so that clock_gettime will fall back on the good old (and slow) syscall
872 @atomicStore(?*const c_void, &vdso_clock_gettime, ptr, .Monotonic);
872 @atomicStore(?*const anyopaque, &vdso_clock_gettime, ptr, .Monotonic);
873873 // Call into the VDSO if available
874874 if (ptr) |fn_ptr| {
875875 const f = @ptrCast(vdso_clock_gettime_ty, fn_ptr);
......@@ -1180,7 +1180,7 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
11801180 return syscall4(.sendmmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msgvec), vlen, flags);
11811181}
11821182
1183pub fn connect(fd: i32, addr: *const c_void, len: socklen_t) usize {
1183pub fn connect(fd: i32, addr: *const anyopaque, len: socklen_t) usize {
11841184 if (native_arch == .i386) {
11851185 return socketcall(SC.connect, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), len });
11861186 }
......@@ -1452,7 +1452,7 @@ pub fn io_uring_enter(fd: i32, to_submit: u32, min_complete: u32, flags: u32, si
14521452 return syscall6(.io_uring_enter, @bitCast(usize, @as(isize, fd)), to_submit, min_complete, flags, @ptrToInt(sig), NSIG / 8);
14531453}
14541454
1455pub fn io_uring_register(fd: i32, opcode: IORING_REGISTER, arg: ?*const c_void, nr_args: u32) usize {
1455pub fn io_uring_register(fd: i32, opcode: IORING_REGISTER, arg: ?*const anyopaque, nr_args: u32) usize {
14561456 return syscall4(.io_uring_register, @bitCast(usize, @as(isize, fd)), @enumToInt(opcode), @ptrToInt(arg), nr_args);
14571457}
14581458
......@@ -3045,7 +3045,7 @@ pub const k_sigaction = switch (native_arch) {
30453045/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
30463046pub const Sigaction = extern struct {
30473047 pub const handler_fn = fn (c_int) callconv(.C) void;
3048 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const c_void) callconv(.C) void;
3048 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void;
30493049
30503050 handler: extern union {
30513051 handler: ?handler_fn,
......@@ -3342,7 +3342,7 @@ else
33423342
33433343pub const sigval = extern union {
33443344 int: i32,
3345 ptr: *c_void,
3345 ptr: *anyopaque,
33463346};
33473347
33483348const siginfo_fields_union = extern union {
......@@ -3368,12 +3368,12 @@ const siginfo_fields_union = extern union {
33683368 },
33693369 },
33703370 sigfault: extern struct {
3371 addr: *c_void,
3371 addr: *anyopaque,
33723372 addr_lsb: i16,
33733373 first: extern union {
33743374 addr_bnd: extern struct {
3375 lower: *c_void,
3376 upper: *c_void,
3375 lower: *anyopaque,
3376 upper: *anyopaque,
33773377 },
33783378 pkey: u32,
33793379 },
......@@ -3383,7 +3383,7 @@ const siginfo_fields_union = extern union {
33833383 fd: i32,
33843384 },
33853385 sigsys: extern struct {
3386 call_addr: *c_void,
3386 call_addr: *anyopaque,
33873387 syscall: i32,
33883388 native_arch: u32,
33893389 },
lib/std/os/linux/arm-eabi.zig+2-2
......@@ -652,7 +652,7 @@ pub const msghdr = extern struct {
652652 msg_namelen: socklen_t,
653653 msg_iov: [*]iovec,
654654 msg_iovlen: i32,
655 msg_control: ?*c_void,
655 msg_control: ?*anyopaque,
656656 msg_controllen: socklen_t,
657657 msg_flags: i32,
658658};
......@@ -662,7 +662,7 @@ pub const msghdr_const = extern struct {
662662 msg_namelen: socklen_t,
663663 msg_iov: [*]iovec_const,
664664 msg_iovlen: i32,
665 msg_control: ?*c_void,
665 msg_control: ?*anyopaque,
666666 msg_controllen: socklen_t,
667667 msg_flags: i32,
668668};
lib/std/os/linux/arm64.zig+2-2
......@@ -504,7 +504,7 @@ pub const msghdr = extern struct {
504504 msg_iov: [*]iovec,
505505 msg_iovlen: i32,
506506 __pad1: i32 = 0,
507 msg_control: ?*c_void,
507 msg_control: ?*anyopaque,
508508 msg_controllen: socklen_t,
509509 __pad2: socklen_t = 0,
510510 msg_flags: i32,
......@@ -516,7 +516,7 @@ pub const msghdr_const = extern struct {
516516 msg_iov: [*]iovec_const,
517517 msg_iovlen: i32,
518518 __pad1: i32 = 0,
519 msg_control: ?*c_void,
519 msg_control: ?*anyopaque,
520520 msg_controllen: socklen_t,
521521 __pad2: socklen_t = 0,
522522 msg_flags: i32,
lib/std/os/linux/bpf/helpers.zig+63-63
......@@ -11,22 +11,22 @@ const SkFullSock = @compileError("TODO missing os bits: SkFullSock");
1111//
1212// Note, these function signatures were created from documentation found in
1313// '/usr/include/linux/bpf.h'
14pub const map_lookup_elem = @intToPtr(fn (map: *const kern.MapDef, key: ?*const c_void) ?*c_void, 1);
15pub const map_update_elem = @intToPtr(fn (map: *const kern.MapDef, key: ?*const c_void, value: ?*const c_void, flags: u64) c_long, 2);
16pub const map_delete_elem = @intToPtr(fn (map: *const kern.MapDef, key: ?*const c_void) c_long, 3);
17pub const probe_read = @intToPtr(fn (dst: ?*c_void, size: u32, unsafe_ptr: ?*const c_void) c_long, 4);
14pub const map_lookup_elem = @intToPtr(fn (map: *const kern.MapDef, key: ?*const anyopaque) ?*anyopaque, 1);
15pub const map_update_elem = @intToPtr(fn (map: *const kern.MapDef, key: ?*const anyopaque, value: ?*const anyopaque, flags: u64) c_long, 2);
16pub const map_delete_elem = @intToPtr(fn (map: *const kern.MapDef, key: ?*const anyopaque) c_long, 3);
17pub const probe_read = @intToPtr(fn (dst: ?*anyopaque, size: u32, unsafe_ptr: ?*const anyopaque) c_long, 4);
1818pub const ktime_get_ns = @intToPtr(fn () u64, 5);
1919pub const trace_printk = @intToPtr(fn (fmt: [*:0]const u8, fmt_size: u32, arg1: u64, arg2: u64, arg3: u64) c_long, 6);
2020pub const get_prandom_u32 = @intToPtr(fn () u32, 7);
2121pub const get_smp_processor_id = @intToPtr(fn () u32, 8);
22pub const skb_store_bytes = @intToPtr(fn (skb: *kern.SkBuff, offset: u32, from: ?*const c_void, len: u32, flags: u64) c_long, 9);
22pub const skb_store_bytes = @intToPtr(fn (skb: *kern.SkBuff, offset: u32, from: ?*const anyopaque, len: u32, flags: u64) c_long, 9);
2323pub const l3_csum_replace = @intToPtr(fn (skb: *kern.SkBuff, offset: u32, from: u64, to: u64, size: u64) c_long, 10);
2424pub const l4_csum_replace = @intToPtr(fn (skb: *kern.SkBuff, offset: u32, from: u64, to: u64, flags: u64) c_long, 11);
25pub const tail_call = @intToPtr(fn (ctx: ?*c_void, prog_array_map: *const kern.MapDef, index: u32) c_long, 12);
25pub const tail_call = @intToPtr(fn (ctx: ?*anyopaque, prog_array_map: *const kern.MapDef, index: u32) c_long, 12);
2626pub const clone_redirect = @intToPtr(fn (skb: *kern.SkBuff, ifindex: u32, flags: u64) c_long, 13);
2727pub const get_current_pid_tgid = @intToPtr(fn () u64, 14);
2828pub const get_current_uid_gid = @intToPtr(fn () u64, 15);
29pub const get_current_comm = @intToPtr(fn (buf: ?*c_void, size_of_buf: u32) c_long, 16);
29pub const get_current_comm = @intToPtr(fn (buf: ?*anyopaque, size_of_buf: u32) c_long, 16);
3030pub const get_cgroup_classid = @intToPtr(fn (skb: *kern.SkBuff) u32, 17);
3131// Note vlan_proto is big endian
3232pub const skb_vlan_push = @intToPtr(fn (skb: *kern.SkBuff, vlan_proto: u16, vlan_tci: u16) c_long, 18);
......@@ -36,20 +36,20 @@ pub const skb_set_tunnel_key = @intToPtr(fn (skb: *kern.SkBuff, key: *kern.Tunne
3636pub const perf_event_read = @intToPtr(fn (map: *const kern.MapDef, flags: u64) u64, 22);
3737pub const redirect = @intToPtr(fn (ifindex: u32, flags: u64) c_long, 23);
3838pub const get_route_realm = @intToPtr(fn (skb: *kern.SkBuff) u32, 24);
39pub const perf_event_output = @intToPtr(fn (ctx: ?*c_void, map: *const kern.MapDef, flags: u64, data: ?*c_void, size: u64) c_long, 25);
40pub const skb_load_bytes = @intToPtr(fn (skb: ?*c_void, offset: u32, to: ?*c_void, len: u32) c_long, 26);
41pub const get_stackid = @intToPtr(fn (ctx: ?*c_void, map: *const kern.MapDef, flags: u64) c_long, 27);
39pub const perf_event_output = @intToPtr(fn (ctx: ?*anyopaque, map: *const kern.MapDef, flags: u64, data: ?*anyopaque, size: u64) c_long, 25);
40pub const skb_load_bytes = @intToPtr(fn (skb: ?*anyopaque, offset: u32, to: ?*anyopaque, len: u32) c_long, 26);
41pub const get_stackid = @intToPtr(fn (ctx: ?*anyopaque, map: *const kern.MapDef, flags: u64) c_long, 27);
4242// from and to point to __be32
4343pub const csum_diff = @intToPtr(fn (from: *u32, from_size: u32, to: *u32, to_size: u32, seed: u32) i64, 28);
44pub const skb_get_tunnel_opt = @intToPtr(fn (skb: *kern.SkBuff, opt: ?*c_void, size: u32) c_long, 29);
45pub const skb_set_tunnel_opt = @intToPtr(fn (skb: *kern.SkBuff, opt: ?*c_void, size: u32) c_long, 30);
44pub const skb_get_tunnel_opt = @intToPtr(fn (skb: *kern.SkBuff, opt: ?*anyopaque, size: u32) c_long, 29);
45pub const skb_set_tunnel_opt = @intToPtr(fn (skb: *kern.SkBuff, opt: ?*anyopaque, size: u32) c_long, 30);
4646// proto is __be16
4747pub const skb_change_proto = @intToPtr(fn (skb: *kern.SkBuff, proto: u16, flags: u64) c_long, 31);
4848pub const skb_change_type = @intToPtr(fn (skb: *kern.SkBuff, skb_type: u32) c_long, 32);
49pub const skb_under_cgroup = @intToPtr(fn (skb: *kern.SkBuff, map: ?*const c_void, index: u32) c_long, 33);
49pub const skb_under_cgroup = @intToPtr(fn (skb: *kern.SkBuff, map: ?*const anyopaque, index: u32) c_long, 33);
5050pub const get_hash_recalc = @intToPtr(fn (skb: *kern.SkBuff) u32, 34);
5151pub const get_current_task = @intToPtr(fn () u64, 35);
52pub const probe_write_user = @intToPtr(fn (dst: ?*c_void, src: ?*const c_void, len: u32) c_long, 36);
52pub const probe_write_user = @intToPtr(fn (dst: ?*anyopaque, src: ?*const anyopaque, len: u32) c_long, 36);
5353pub const current_task_under_cgroup = @intToPtr(fn (map: *const kern.MapDef, index: u32) c_long, 37);
5454pub const skb_change_tail = @intToPtr(fn (skb: *kern.SkBuff, len: u32, flags: u64) c_long, 38);
5555pub const skb_pull_data = @intToPtr(fn (skb: *kern.SkBuff, len: u32) c_long, 39);
......@@ -58,19 +58,19 @@ pub const set_hash_invalid = @intToPtr(fn (skb: *kern.SkBuff) void, 41);
5858pub const get_numa_node_id = @intToPtr(fn () c_long, 42);
5959pub const skb_change_head = @intToPtr(fn (skb: *kern.SkBuff, len: u32, flags: u64) c_long, 43);
6060pub const xdp_adjust_head = @intToPtr(fn (xdp_md: *kern.XdpMd, delta: c_int) c_long, 44);
61pub const probe_read_str = @intToPtr(fn (dst: ?*c_void, size: u32, unsafe_ptr: ?*const c_void) c_long, 45);
62pub const get_socket_cookie = @intToPtr(fn (ctx: ?*c_void) u64, 46);
61pub const probe_read_str = @intToPtr(fn (dst: ?*anyopaque, size: u32, unsafe_ptr: ?*const anyopaque) c_long, 45);
62pub const get_socket_cookie = @intToPtr(fn (ctx: ?*anyopaque) u64, 46);
6363pub const get_socket_uid = @intToPtr(fn (skb: *kern.SkBuff) u32, 47);
6464pub const set_hash = @intToPtr(fn (skb: *kern.SkBuff, hash: u32) c_long, 48);
65pub const setsockopt = @intToPtr(fn (bpf_socket: *kern.SockOps, level: c_int, optname: c_int, optval: ?*c_void, optlen: c_int) c_long, 49);
65pub const setsockopt = @intToPtr(fn (bpf_socket: *kern.SockOps, level: c_int, optname: c_int, optval: ?*anyopaque, optlen: c_int) c_long, 49);
6666pub const skb_adjust_room = @intToPtr(fn (skb: *kern.SkBuff, len_diff: i32, mode: u32, flags: u64) c_long, 50);
6767pub const redirect_map = @intToPtr(fn (map: *const kern.MapDef, key: u32, flags: u64) c_long, 51);
6868pub const sk_redirect_map = @intToPtr(fn (skb: *kern.SkBuff, map: *const kern.MapDef, key: u32, flags: u64) c_long, 52);
69pub const sock_map_update = @intToPtr(fn (skops: *kern.SockOps, map: *const kern.MapDef, key: ?*c_void, flags: u64) c_long, 53);
69pub const sock_map_update = @intToPtr(fn (skops: *kern.SockOps, map: *const kern.MapDef, key: ?*anyopaque, flags: u64) c_long, 53);
7070pub const xdp_adjust_meta = @intToPtr(fn (xdp_md: *kern.XdpMd, delta: c_int) c_long, 54);
7171pub const perf_event_read_value = @intToPtr(fn (map: *const kern.MapDef, flags: u64, buf: *kern.PerfEventValue, buf_size: u32) c_long, 55);
7272pub const perf_prog_read_value = @intToPtr(fn (ctx: *kern.PerfEventData, buf: *kern.PerfEventValue, buf_size: u32) c_long, 56);
73pub const getsockopt = @intToPtr(fn (bpf_socket: ?*c_void, level: c_int, optname: c_int, optval: ?*c_void, optlen: c_int) c_long, 57);
73pub const getsockopt = @intToPtr(fn (bpf_socket: ?*anyopaque, level: c_int, optname: c_int, optval: ?*anyopaque, optlen: c_int) c_long, 57);
7474pub const override_return = @intToPtr(fn (regs: *PtRegs, rc: u64) c_long, 58);
7575pub const sock_ops_cb_flags_set = @intToPtr(fn (bpf_sock: *kern.SockOps, argval: c_int) c_long, 59);
7676pub const msg_redirect_map = @intToPtr(fn (msg: *kern.SkMsgMd, map: *const kern.MapDef, key: u32, flags: u64) c_long, 60);
......@@ -80,78 +80,78 @@ pub const msg_pull_data = @intToPtr(fn (msg: *kern.SkMsgMd, start: u32, end: u32
8080pub const bind = @intToPtr(fn (ctx: *kern.BpfSockAddr, addr: *kern.SockAddr, addr_len: c_int) c_long, 64);
8181pub const xdp_adjust_tail = @intToPtr(fn (xdp_md: *kern.XdpMd, delta: c_int) c_long, 65);
8282pub const skb_get_xfrm_state = @intToPtr(fn (skb: *kern.SkBuff, index: u32, xfrm_state: *kern.XfrmState, size: u32, flags: u64) c_long, 66);
83pub const get_stack = @intToPtr(fn (ctx: ?*c_void, buf: ?*c_void, size: u32, flags: u64) c_long, 67);
84pub const skb_load_bytes_relative = @intToPtr(fn (skb: ?*const c_void, offset: u32, to: ?*c_void, len: u32, start_header: u32) c_long, 68);
85pub const fib_lookup = @intToPtr(fn (ctx: ?*c_void, params: *kern.FibLookup, plen: c_int, flags: u32) c_long, 69);
86pub const sock_hash_update = @intToPtr(fn (skops: *kern.SockOps, map: *const kern.MapDef, key: ?*c_void, flags: u64) c_long, 70);
87pub const msg_redirect_hash = @intToPtr(fn (msg: *kern.SkMsgMd, map: *const kern.MapDef, key: ?*c_void, flags: u64) c_long, 71);
88pub const sk_redirect_hash = @intToPtr(fn (skb: *kern.SkBuff, map: *const kern.MapDef, key: ?*c_void, flags: u64) c_long, 72);
89pub const lwt_push_encap = @intToPtr(fn (skb: *kern.SkBuff, typ: u32, hdr: ?*c_void, len: u32) c_long, 73);
90pub const lwt_seg6_store_bytes = @intToPtr(fn (skb: *kern.SkBuff, offset: u32, from: ?*const c_void, len: u32) c_long, 74);
83pub const get_stack = @intToPtr(fn (ctx: ?*anyopaque, buf: ?*anyopaque, size: u32, flags: u64) c_long, 67);
84pub const skb_load_bytes_relative = @intToPtr(fn (skb: ?*const anyopaque, offset: u32, to: ?*anyopaque, len: u32, start_header: u32) c_long, 68);
85pub const fib_lookup = @intToPtr(fn (ctx: ?*anyopaque, params: *kern.FibLookup, plen: c_int, flags: u32) c_long, 69);
86pub const sock_hash_update = @intToPtr(fn (skops: *kern.SockOps, map: *const kern.MapDef, key: ?*anyopaque, flags: u64) c_long, 70);
87pub const msg_redirect_hash = @intToPtr(fn (msg: *kern.SkMsgMd, map: *const kern.MapDef, key: ?*anyopaque, flags: u64) c_long, 71);
88pub const sk_redirect_hash = @intToPtr(fn (skb: *kern.SkBuff, map: *const kern.MapDef, key: ?*anyopaque, flags: u64) c_long, 72);
89pub const lwt_push_encap = @intToPtr(fn (skb: *kern.SkBuff, typ: u32, hdr: ?*anyopaque, len: u32) c_long, 73);
90pub const lwt_seg6_store_bytes = @intToPtr(fn (skb: *kern.SkBuff, offset: u32, from: ?*const anyopaque, len: u32) c_long, 74);
9191pub const lwt_seg6_adjust_srh = @intToPtr(fn (skb: *kern.SkBuff, offset: u32, delta: i32) c_long, 75);
92pub const lwt_seg6_action = @intToPtr(fn (skb: *kern.SkBuff, action: u32, param: ?*c_void, param_len: u32) c_long, 76);
93pub const rc_repeat = @intToPtr(fn (ctx: ?*c_void) c_long, 77);
94pub const rc_keydown = @intToPtr(fn (ctx: ?*c_void, protocol: u32, scancode: u64, toggle: u32) c_long, 78);
92pub const lwt_seg6_action = @intToPtr(fn (skb: *kern.SkBuff, action: u32, param: ?*anyopaque, param_len: u32) c_long, 76);
93pub const rc_repeat = @intToPtr(fn (ctx: ?*anyopaque) c_long, 77);
94pub const rc_keydown = @intToPtr(fn (ctx: ?*anyopaque, protocol: u32, scancode: u64, toggle: u32) c_long, 78);
9595pub const skb_cgroup_id = @intToPtr(fn (skb: *kern.SkBuff) u64, 79);
9696pub const get_current_cgroup_id = @intToPtr(fn () u64, 80);
97pub const get_local_storage = @intToPtr(fn (map: ?*c_void, flags: u64) ?*c_void, 81);
98pub const sk_select_reuseport = @intToPtr(fn (reuse: *kern.SkReusePortMd, map: *const kern.MapDef, key: ?*c_void, flags: u64) c_long, 82);
97pub const get_local_storage = @intToPtr(fn (map: ?*anyopaque, flags: u64) ?*anyopaque, 81);
98pub const sk_select_reuseport = @intToPtr(fn (reuse: *kern.SkReusePortMd, map: *const kern.MapDef, key: ?*anyopaque, flags: u64) c_long, 82);
9999pub const skb_ancestor_cgroup_id = @intToPtr(fn (skb: *kern.SkBuff, ancestor_level: c_int) u64, 83);
100pub const sk_lookup_tcp = @intToPtr(fn (ctx: ?*c_void, tuple: *kern.SockTuple, tuple_size: u32, netns: u64, flags: u64) ?*kern.Sock, 84);
101pub const sk_lookup_udp = @intToPtr(fn (ctx: ?*c_void, tuple: *kern.SockTuple, tuple_size: u32, netns: u64, flags: u64) ?*kern.Sock, 85);
100pub const sk_lookup_tcp = @intToPtr(fn (ctx: ?*anyopaque, tuple: *kern.SockTuple, tuple_size: u32, netns: u64, flags: u64) ?*kern.Sock, 84);
101pub const sk_lookup_udp = @intToPtr(fn (ctx: ?*anyopaque, tuple: *kern.SockTuple, tuple_size: u32, netns: u64, flags: u64) ?*kern.Sock, 85);
102102pub const sk_release = @intToPtr(fn (sock: *kern.Sock) c_long, 86);
103pub const map_push_elem = @intToPtr(fn (map: *const kern.MapDef, value: ?*const c_void, flags: u64) c_long, 87);
104pub const map_pop_elem = @intToPtr(fn (map: *const kern.MapDef, value: ?*c_void) c_long, 88);
105pub const map_peek_elem = @intToPtr(fn (map: *const kern.MapDef, value: ?*c_void) c_long, 89);
103pub const map_push_elem = @intToPtr(fn (map: *const kern.MapDef, value: ?*const anyopaque, flags: u64) c_long, 87);
104pub const map_pop_elem = @intToPtr(fn (map: *const kern.MapDef, value: ?*anyopaque) c_long, 88);
105pub const map_peek_elem = @intToPtr(fn (map: *const kern.MapDef, value: ?*anyopaque) c_long, 89);
106106pub const msg_push_data = @intToPtr(fn (msg: *kern.SkMsgMd, start: u32, len: u32, flags: u64) c_long, 90);
107107pub const msg_pop_data = @intToPtr(fn (msg: *kern.SkMsgMd, start: u32, len: u32, flags: u64) c_long, 91);
108pub const rc_pointer_rel = @intToPtr(fn (ctx: ?*c_void, rel_x: i32, rel_y: i32) c_long, 92);
108pub const rc_pointer_rel = @intToPtr(fn (ctx: ?*anyopaque, rel_x: i32, rel_y: i32) c_long, 92);
109109pub const spin_lock = @intToPtr(fn (lock: *kern.SpinLock) c_long, 93);
110110pub const spin_unlock = @intToPtr(fn (lock: *kern.SpinLock) c_long, 94);
111111pub const sk_fullsock = @intToPtr(fn (sk: *kern.Sock) ?*SkFullSock, 95);
112112pub const tcp_sock = @intToPtr(fn (sk: *kern.Sock) ?*kern.TcpSock, 96);
113113pub const skb_ecn_set_ce = @intToPtr(fn (skb: *kern.SkBuff) c_long, 97);
114114pub const get_listener_sock = @intToPtr(fn (sk: *kern.Sock) ?*kern.Sock, 98);
115pub const skc_lookup_tcp = @intToPtr(fn (ctx: ?*c_void, tuple: *kern.SockTuple, tuple_size: u32, netns: u64, flags: u64) ?*kern.Sock, 99);
116pub const tcp_check_syncookie = @intToPtr(fn (sk: *kern.Sock, iph: ?*c_void, iph_len: u32, th: *TcpHdr, th_len: u32) c_long, 100);
115pub const skc_lookup_tcp = @intToPtr(fn (ctx: ?*anyopaque, tuple: *kern.SockTuple, tuple_size: u32, netns: u64, flags: u64) ?*kern.Sock, 99);
116pub const tcp_check_syncookie = @intToPtr(fn (sk: *kern.Sock, iph: ?*anyopaque, iph_len: u32, th: *TcpHdr, th_len: u32) c_long, 100);
117117pub const sysctl_get_name = @intToPtr(fn (ctx: *kern.SysCtl, buf: ?*u8, buf_len: c_ulong, flags: u64) c_long, 101);
118118pub const sysctl_get_current_value = @intToPtr(fn (ctx: *kern.SysCtl, buf: ?*u8, buf_len: c_ulong) c_long, 102);
119119pub const sysctl_get_new_value = @intToPtr(fn (ctx: *kern.SysCtl, buf: ?*u8, buf_len: c_ulong) c_long, 103);
120120pub const sysctl_set_new_value = @intToPtr(fn (ctx: *kern.SysCtl, buf: ?*const u8, buf_len: c_ulong) c_long, 104);
121121pub const strtol = @intToPtr(fn (buf: *const u8, buf_len: c_ulong, flags: u64, res: *c_long) c_long, 105);
122122pub const strtoul = @intToPtr(fn (buf: *const u8, buf_len: c_ulong, flags: u64, res: *c_ulong) c_long, 106);
123pub const sk_storage_get = @intToPtr(fn (map: *const kern.MapDef, sk: *kern.Sock, value: ?*c_void, flags: u64) ?*c_void, 107);
123pub const sk_storage_get = @intToPtr(fn (map: *const kern.MapDef, sk: *kern.Sock, value: ?*anyopaque, flags: u64) ?*anyopaque, 107);
124124pub const sk_storage_delete = @intToPtr(fn (map: *const kern.MapDef, sk: *kern.Sock) c_long, 108);
125125pub const send_signal = @intToPtr(fn (sig: u32) c_long, 109);
126pub const tcp_gen_syncookie = @intToPtr(fn (sk: *kern.Sock, iph: ?*c_void, iph_len: u32, th: *TcpHdr, th_len: u32) i64, 110);
127pub const skb_output = @intToPtr(fn (ctx: ?*c_void, map: *const kern.MapDef, flags: u64, data: ?*c_void, size: u64) c_long, 111);
128pub const probe_read_user = @intToPtr(fn (dst: ?*c_void, size: u32, unsafe_ptr: ?*const c_void) c_long, 112);
129pub const probe_read_kernel = @intToPtr(fn (dst: ?*c_void, size: u32, unsafe_ptr: ?*const c_void) c_long, 113);
130pub const probe_read_user_str = @intToPtr(fn (dst: ?*c_void, size: u32, unsafe_ptr: ?*const c_void) c_long, 114);
131pub const probe_read_kernel_str = @intToPtr(fn (dst: ?*c_void, size: u32, unsafe_ptr: ?*const c_void) c_long, 115);
132pub const tcp_send_ack = @intToPtr(fn (tp: ?*c_void, rcv_nxt: u32) c_long, 116);
126pub const tcp_gen_syncookie = @intToPtr(fn (sk: *kern.Sock, iph: ?*anyopaque, iph_len: u32, th: *TcpHdr, th_len: u32) i64, 110);
127pub const skb_output = @intToPtr(fn (ctx: ?*anyopaque, map: *const kern.MapDef, flags: u64, data: ?*anyopaque, size: u64) c_long, 111);
128pub const probe_read_user = @intToPtr(fn (dst: ?*anyopaque, size: u32, unsafe_ptr: ?*const anyopaque) c_long, 112);
129pub const probe_read_kernel = @intToPtr(fn (dst: ?*anyopaque, size: u32, unsafe_ptr: ?*const anyopaque) c_long, 113);
130pub const probe_read_user_str = @intToPtr(fn (dst: ?*anyopaque, size: u32, unsafe_ptr: ?*const anyopaque) c_long, 114);
131pub const probe_read_kernel_str = @intToPtr(fn (dst: ?*anyopaque, size: u32, unsafe_ptr: ?*const anyopaque) c_long, 115);
132pub const tcp_send_ack = @intToPtr(fn (tp: ?*anyopaque, rcv_nxt: u32) c_long, 116);
133133pub const send_signal_thread = @intToPtr(fn (sig: u32) c_long, 117);
134134pub const jiffies64 = @intToPtr(fn () u64, 118);
135pub const read_branch_records = @intToPtr(fn (ctx: *kern.PerfEventData, buf: ?*c_void, size: u32, flags: u64) c_long, 119);
135pub const read_branch_records = @intToPtr(fn (ctx: *kern.PerfEventData, buf: ?*anyopaque, size: u32, flags: u64) c_long, 119);
136136pub const get_ns_current_pid_tgid = @intToPtr(fn (dev: u64, ino: u64, nsdata: *kern.PidNsInfo, size: u32) c_long, 120);
137pub const xdp_output = @intToPtr(fn (ctx: ?*c_void, map: *const kern.MapDef, flags: u64, data: ?*c_void, size: u64) c_long, 121);
138pub const get_netns_cookie = @intToPtr(fn (ctx: ?*c_void) u64, 122);
137pub const xdp_output = @intToPtr(fn (ctx: ?*anyopaque, map: *const kern.MapDef, flags: u64, data: ?*anyopaque, size: u64) c_long, 121);
138pub const get_netns_cookie = @intToPtr(fn (ctx: ?*anyopaque) u64, 122);
139139pub const get_current_ancestor_cgroup_id = @intToPtr(fn (ancestor_level: c_int) u64, 123);
140140pub const sk_assign = @intToPtr(fn (skb: *kern.SkBuff, sk: *kern.Sock, flags: u64) c_long, 124);
141141pub const ktime_get_boot_ns = @intToPtr(fn () u64, 125);
142pub const seq_printf = @intToPtr(fn (m: *kern.SeqFile, fmt: ?*const u8, fmt_size: u32, data: ?*const c_void, data_len: u32) c_long, 126);
142pub const seq_printf = @intToPtr(fn (m: *kern.SeqFile, fmt: ?*const u8, fmt_size: u32, data: ?*const anyopaque, data_len: u32) c_long, 126);
143143pub const seq_write = @intToPtr(fn (m: *kern.SeqFile, data: ?*const u8, len: u32) c_long, 127);
144144pub const sk_cgroup_id = @intToPtr(fn (sk: *kern.BpfSock) u64, 128);
145145pub const sk_ancestor_cgroup_id = @intToPtr(fn (sk: *kern.BpfSock, ancestor_level: c_long) u64, 129);
146pub const ringbuf_output = @intToPtr(fn (ringbuf: ?*c_void, data: ?*c_void, size: u64, flags: u64) ?*c_void, 130);
147pub const ringbuf_reserve = @intToPtr(fn (ringbuf: ?*c_void, size: u64, flags: u64) ?*c_void, 131);
148pub const ringbuf_submit = @intToPtr(fn (data: ?*c_void, flags: u64) void, 132);
149pub const ringbuf_discard = @intToPtr(fn (data: ?*c_void, flags: u64) void, 133);
150pub const ringbuf_query = @intToPtr(fn (ringbuf: ?*c_void, flags: u64) u64, 134);
146pub const ringbuf_output = @intToPtr(fn (ringbuf: ?*anyopaque, data: ?*anyopaque, size: u64, flags: u64) ?*anyopaque, 130);
147pub const ringbuf_reserve = @intToPtr(fn (ringbuf: ?*anyopaque, size: u64, flags: u64) ?*anyopaque, 131);
148pub const ringbuf_submit = @intToPtr(fn (data: ?*anyopaque, flags: u64) void, 132);
149pub const ringbuf_discard = @intToPtr(fn (data: ?*anyopaque, flags: u64) void, 133);
150pub const ringbuf_query = @intToPtr(fn (ringbuf: ?*anyopaque, flags: u64) u64, 134);
151151pub const csum_level = @intToPtr(fn (skb: *kern.SkBuff, level: u64) c_long, 135);
152pub const skc_to_tcp6_sock = @intToPtr(fn (sk: ?*c_void) ?*kern.Tcp6Sock, 136);
153pub const skc_to_tcp_sock = @intToPtr(fn (sk: ?*c_void) ?*kern.TcpSock, 137);
154pub const skc_to_tcp_timewait_sock = @intToPtr(fn (sk: ?*c_void) ?*kern.TcpTimewaitSock, 138);
155pub const skc_to_tcp_request_sock = @intToPtr(fn (sk: ?*c_void) ?*kern.TcpRequestSock, 139);
156pub const skc_to_udp6_sock = @intToPtr(fn (sk: ?*c_void) ?*kern.Udp6Sock, 140);
157pub const get_task_stack = @intToPtr(fn (task: ?*c_void, buf: ?*c_void, size: u32, flags: u64) c_long, 141);
152pub const skc_to_tcp6_sock = @intToPtr(fn (sk: ?*anyopaque) ?*kern.Tcp6Sock, 136);
153pub const skc_to_tcp_sock = @intToPtr(fn (sk: ?*anyopaque) ?*kern.TcpSock, 137);
154pub const skc_to_tcp_timewait_sock = @intToPtr(fn (sk: ?*anyopaque) ?*kern.TcpTimewaitSock, 138);
155pub const skc_to_tcp_request_sock = @intToPtr(fn (sk: ?*anyopaque) ?*kern.TcpRequestSock, 139);
156pub const skc_to_udp6_sock = @intToPtr(fn (sk: ?*anyopaque) ?*kern.Udp6Sock, 140);
157pub const get_task_stack = @intToPtr(fn (task: ?*anyopaque, buf: ?*anyopaque, size: u32, flags: u64) c_long, 141);
lib/std/os/linux/i386.zig+2-2
......@@ -660,7 +660,7 @@ pub const msghdr = extern struct {
660660 namelen: socklen_t,
661661 iov: [*]iovec,
662662 iovlen: i32,
663 control: ?*c_void,
663 control: ?*anyopaque,
664664 controllen: socklen_t,
665665 flags: i32,
666666};
......@@ -670,7 +670,7 @@ pub const msghdr_const = extern struct {
670670 namelen: socklen_t,
671671 iov: [*]iovec_const,
672672 iovlen: i32,
673 control: ?*c_void,
673 control: ?*anyopaque,
674674 controllen: socklen_t,
675675 flags: i32,
676676};
lib/std/os/linux/io_uring.zig+5-5
......@@ -841,7 +841,7 @@ pub const IO_Uring = struct {
841841 const res = linux.io_uring_register(
842842 self.fd,
843843 .REGISTER_FILES,
844 @ptrCast(*const c_void, fds.ptr),
844 @ptrCast(*const anyopaque, fds.ptr),
845845 @intCast(u32, fds.len),
846846 );
847847 try handle_registration_result(res);
......@@ -872,7 +872,7 @@ pub const IO_Uring = struct {
872872 const res = linux.io_uring_register(
873873 self.fd,
874874 .REGISTER_FILES_UPDATE,
875 @ptrCast(*const c_void, &update),
875 @ptrCast(*const anyopaque, &update),
876876 @intCast(u32, fds.len),
877877 );
878878 try handle_registration_result(res);
......@@ -886,7 +886,7 @@ pub const IO_Uring = struct {
886886 const res = linux.io_uring_register(
887887 self.fd,
888888 .REGISTER_EVENTFD,
889 @ptrCast(*const c_void, &fd),
889 @ptrCast(*const anyopaque, &fd),
890890 1,
891891 );
892892 try handle_registration_result(res);
......@@ -901,7 +901,7 @@ pub const IO_Uring = struct {
901901 const res = linux.io_uring_register(
902902 self.fd,
903903 .REGISTER_EVENTFD_ASYNC,
904 @ptrCast(*const c_void, &fd),
904 @ptrCast(*const anyopaque, &fd),
905905 1,
906906 );
907907 try handle_registration_result(res);
......@@ -1307,7 +1307,7 @@ pub fn io_uring_prep_poll_add(
13071307 fd: os.fd_t,
13081308 poll_mask: u32,
13091309) void {
1310 io_uring_prep_rw(.POLL_ADD, sqe, fd, @ptrToInt(@as(?*c_void, null)), 0, 0);
1310 io_uring_prep_rw(.POLL_ADD, sqe, fd, @ptrToInt(@as(?*anyopaque, null)), 0, 0);
13111311 sqe.rw_flags = __io_uring_prep_poll_mask(poll_mask);
13121312}
13131313
lib/std/os/linux/powerpc.zig+2-2
......@@ -655,7 +655,7 @@ pub const msghdr = extern struct {
655655 msg_namelen: socklen_t,
656656 msg_iov: [*]iovec,
657657 msg_iovlen: usize,
658 msg_control: ?*c_void,
658 msg_control: ?*anyopaque,
659659 msg_controllen: socklen_t,
660660 msg_flags: i32,
661661};
......@@ -665,7 +665,7 @@ pub const msghdr_const = extern struct {
665665 msg_namelen: socklen_t,
666666 msg_iov: [*]iovec_const,
667667 msg_iovlen: usize,
668 msg_control: ?*c_void,
668 msg_control: ?*anyopaque,
669669 msg_controllen: socklen_t,
670670 msg_flags: i32,
671671};
lib/std/os/linux/powerpc64.zig+3-3
......@@ -630,7 +630,7 @@ pub const msghdr = extern struct {
630630 msg_namelen: socklen_t,
631631 msg_iov: [*]iovec,
632632 msg_iovlen: usize,
633 msg_control: ?*c_void,
633 msg_control: ?*anyopaque,
634634 msg_controllen: usize,
635635 msg_flags: i32,
636636};
......@@ -640,7 +640,7 @@ pub const msghdr_const = extern struct {
640640 msg_namelen: socklen_t,
641641 msg_iov: [*]iovec_const,
642642 msg_iovlen: usize,
643 msg_control: ?*c_void,
643 msg_control: ?*anyopaque,
644644 msg_controllen: usize,
645645 msg_flags: i32,
646646};
......@@ -718,7 +718,7 @@ pub const mcontext_t = extern struct {
718718 _pad0: i32,
719719 handler: u64,
720720 oldmask: u64,
721 regs: ?*c_void,
721 regs: ?*anyopaque,
722722 gp_regs: gregset_t,
723723 fp_regs: fpregset_t,
724724 v_regs: *vrregset_t,
lib/std/os/linux/sparc64.zig+2-2
......@@ -660,7 +660,7 @@ pub const msghdr = extern struct {
660660 msg_namelen: socklen_t,
661661 msg_iov: [*]iovec,
662662 msg_iovlen: u64,
663 msg_control: ?*c_void,
663 msg_control: ?*anyopaque,
664664 msg_controllen: u64,
665665 msg_flags: i32,
666666};
......@@ -670,7 +670,7 @@ pub const msghdr_const = extern struct {
670670 msg_namelen: socklen_t,
671671 msg_iov: [*]iovec_const,
672672 msg_iovlen: u64,
673 msg_control: ?*c_void,
673 msg_control: ?*anyopaque,
674674 msg_controllen: u64,
675675 msg_flags: i32,
676676};
lib/std/os/linux/x86_64.zig+2-2
......@@ -604,7 +604,7 @@ pub const msghdr = extern struct {
604604 iov: [*]iovec,
605605 iovlen: i32,
606606 __pad1: i32 = 0,
607 control: ?*c_void,
607 control: ?*anyopaque,
608608 controllen: socklen_t,
609609 __pad2: socklen_t = 0,
610610 flags: i32,
......@@ -616,7 +616,7 @@ pub const msghdr_const = extern struct {
616616 iov: [*]iovec_const,
617617 iovlen: i32,
618618 __pad1: i32 = 0,
619 control: ?*c_void,
619 control: ?*anyopaque,
620620 controllen: socklen_t,
621621 __pad2: socklen_t = 0,
622622 flags: i32,
lib/std/os/test.zig+2-2
......@@ -408,7 +408,7 @@ test "sigaltstack" {
408408
409409// If the type is not available use void to avoid erroring out when `iter_fn` is
410410// analyzed
411const dl_phdr_info = if (@hasDecl(os.system, "dl_phdr_info")) os.dl_phdr_info else c_void;
411const dl_phdr_info = if (@hasDecl(os.system, "dl_phdr_info")) os.dl_phdr_info else anyopaque;
412412
413413const IterFnError = error{
414414 MissingPtLoadSegment,
......@@ -740,7 +740,7 @@ test "sigaction" {
740740 return error.SkipZigTest;
741741
742742 const S = struct {
743 fn handler(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const c_void) callconv(.C) void {
743 fn handler(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const anyopaque) callconv(.C) void {
744744 _ = ctx_ptr;
745745 // Check that we received the correct signal.
746746 switch (native_os) {
lib/std/os/uefi/protocols/ip6_config_protocol.zig+4-4
......@@ -4,16 +4,16 @@ const Event = uefi.Event;
44const Status = uefi.Status;
55
66pub const Ip6ConfigProtocol = extern struct {
7 _set_data: fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, usize, *const c_void) callconv(.C) Status,
8 _get_data: fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, *usize, ?*const c_void) callconv(.C) Status,
7 _set_data: fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, usize, *const anyopaque) callconv(.C) Status,
8 _get_data: fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, *usize, ?*const anyopaque) callconv(.C) Status,
99 _register_data_notify: fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, Event) callconv(.C) Status,
1010 _unregister_data_notify: fn (*const Ip6ConfigProtocol, Ip6ConfigDataType, Event) callconv(.C) Status,
1111
12 pub fn setData(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, data_size: usize, data: *const c_void) Status {
12 pub fn setData(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, data_size: usize, data: *const anyopaque) Status {
1313 return self._set_data(self, data_type, data_size, data);
1414 }
1515
16 pub fn getData(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, data_size: *usize, data: ?*const c_void) Status {
16 pub fn getData(self: *const Ip6ConfigProtocol, data_type: Ip6ConfigDataType, data_size: *usize, data: ?*const anyopaque) Status {
1717 return self._get_data(self, data_type, data_size, data);
1818 }
1919
lib/std/os/uefi/protocols/ip6_protocol.zig+1-1
......@@ -140,5 +140,5 @@ pub const Ip6IcmpType = extern struct {
140140pub const Ip6CompletionToken = extern struct {
141141 event: Event,
142142 status: Status,
143 packet: *c_void, // union TODO
143 packet: *anyopaque, // union TODO
144144};
lib/std/os/uefi/protocols/loaded_image_protocol.zig+2-2
......@@ -12,9 +12,9 @@ pub const LoadedImageProtocol = extern struct {
1212 system_table: *SystemTable,
1313 device_handle: ?Handle,
1414 file_path: *DevicePathProtocol,
15 reserved: *c_void,
15 reserved: *anyopaque,
1616 load_options_size: u32,
17 load_options: ?*c_void,
17 load_options: ?*anyopaque,
1818 image_base: [*]u8,
1919 image_size: u64,
2020 image_code_type: MemoryType,
lib/std/os/uefi/protocols/managed_network_protocol.zig+2-2
......@@ -9,7 +9,7 @@ const MacAddress = uefi.protocols.MacAddress;
99pub const ManagedNetworkProtocol = extern struct {
1010 _get_mode_data: fn (*const ManagedNetworkProtocol, ?*ManagedNetworkConfigData, ?*SimpleNetworkMode) callconv(.C) Status,
1111 _configure: fn (*const ManagedNetworkProtocol, ?*const ManagedNetworkConfigData) callconv(.C) Status,
12 _mcast_ip_to_mac: fn (*const ManagedNetworkProtocol, bool, *const c_void, *MacAddress) callconv(.C) Status,
12 _mcast_ip_to_mac: fn (*const ManagedNetworkProtocol, bool, *const anyopaque, *MacAddress) callconv(.C) Status,
1313 _groups: fn (*const ManagedNetworkProtocol, bool, ?*const MacAddress) callconv(.C) Status,
1414 _transmit: fn (*const ManagedNetworkProtocol, *const ManagedNetworkCompletionToken) callconv(.C) Status,
1515 _receive: fn (*const ManagedNetworkProtocol, *const ManagedNetworkCompletionToken) callconv(.C) Status,
......@@ -29,7 +29,7 @@ pub const ManagedNetworkProtocol = extern struct {
2929
3030 /// Translates an IP multicast address to a hardware (MAC) multicast address.
3131 /// This function may be unsupported in some MNP implementations.
32 pub fn mcastIpToMac(self: *const ManagedNetworkProtocol, ipv6flag: bool, ipaddress: *const c_void, mac_address: *MacAddress) Status {
32 pub fn mcastIpToMac(self: *const ManagedNetworkProtocol, ipv6flag: bool, ipaddress: *const anyopaque, mac_address: *MacAddress) Status {
3333 _ = mac_address;
3434 return self._mcast_ip_to_mac(self, ipv6flag, ipaddress);
3535 }
lib/std/os/uefi/protocols/simple_network_protocol.zig+2-2
......@@ -13,7 +13,7 @@ pub const SimpleNetworkProtocol = extern struct {
1313 _receive_filters: fn (*const SimpleNetworkProtocol, SimpleNetworkReceiveFilter, SimpleNetworkReceiveFilter, bool, usize, ?[*]const MacAddress) callconv(.C) Status,
1414 _station_address: fn (*const SimpleNetworkProtocol, bool, ?*const MacAddress) callconv(.C) Status,
1515 _statistics: fn (*const SimpleNetworkProtocol, bool, ?*usize, ?*NetworkStatistics) callconv(.C) Status,
16 _mcast_ip_to_mac: fn (*const SimpleNetworkProtocol, bool, *const c_void, *MacAddress) callconv(.C) Status,
16 _mcast_ip_to_mac: fn (*const SimpleNetworkProtocol, bool, *const anyopaque, *MacAddress) callconv(.C) Status,
1717 _nvdata: fn (*const SimpleNetworkProtocol, bool, usize, usize, [*]u8) callconv(.C) Status,
1818 _get_status: fn (*const SimpleNetworkProtocol, *SimpleNetworkInterruptStatus, ?*?[*]u8) callconv(.C) Status,
1919 _transmit: fn (*const SimpleNetworkProtocol, usize, usize, [*]const u8, ?*const MacAddress, ?*const MacAddress, ?*const u16) callconv(.C) Status,
......@@ -62,7 +62,7 @@ pub const SimpleNetworkProtocol = extern struct {
6262 }
6363
6464 /// Converts a multicast IP address to a multicast HW MAC address.
65 pub fn mcastIpToMac(self: *const SimpleNetworkProtocol, ipv6: bool, ip: *const c_void, mac: *MacAddress) Status {
65 pub fn mcastIpToMac(self: *const SimpleNetworkProtocol, ipv6: bool, ip: *const anyopaque, mac: *MacAddress) Status {
6666 return self._mcast_ip_to_mac(self, ipv6, ip, mac);
6767 }
6868
lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig+4-4
......@@ -9,8 +9,8 @@ pub const SimpleTextInputExProtocol = extern struct {
99 _read_key_stroke_ex: fn (*const SimpleTextInputExProtocol, *KeyData) callconv(.C) Status,
1010 wait_for_key_ex: Event,
1111 _set_state: fn (*const SimpleTextInputExProtocol, *const u8) callconv(.C) Status,
12 _register_key_notify: fn (*const SimpleTextInputExProtocol, *const KeyData, fn (*const KeyData) callconv(.C) usize, **c_void) callconv(.C) Status,
13 _unregister_key_notify: fn (*const SimpleTextInputExProtocol, *const c_void) callconv(.C) Status,
12 _register_key_notify: fn (*const SimpleTextInputExProtocol, *const KeyData, fn (*const KeyData) callconv(.C) usize, **anyopaque) callconv(.C) Status,
13 _unregister_key_notify: fn (*const SimpleTextInputExProtocol, *const anyopaque) callconv(.C) Status,
1414
1515 /// Resets the input device hardware.
1616 pub fn reset(self: *const SimpleTextInputExProtocol, verify: bool) Status {
......@@ -28,12 +28,12 @@ pub const SimpleTextInputExProtocol = extern struct {
2828 }
2929
3030 /// Register a notification function for a particular keystroke for the input device.
31 pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: fn (*const KeyData) callconv(.C) usize, handle: **c_void) Status {
31 pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: fn (*const KeyData) callconv(.C) usize, handle: **anyopaque) Status {
3232 return self._register_key_notify(self, key_data, notify, handle);
3333 }
3434
3535 /// Remove the notification that was previously registered.
36 pub fn unregisterKeyNotify(self: *const SimpleTextInputExProtocol, handle: *const c_void) Status {
36 pub fn unregisterKeyNotify(self: *const SimpleTextInputExProtocol, handle: *const anyopaque) Status {
3737 return self._unregister_key_notify(self, handle);
3838 }
3939
lib/std/os/uefi/tables/boot_services.zig+8-8
......@@ -42,7 +42,7 @@ pub const BootServices = extern struct {
4242 freePool: fn ([*]align(8) u8) callconv(.C) Status,
4343
4444 /// Creates an event.
45 createEvent: fn (u32, usize, ?fn (Event, ?*c_void) callconv(.C) void, ?*const c_void, *Event) callconv(.C) Status,
45 createEvent: fn (u32, usize, ?fn (Event, ?*anyopaque) callconv(.C) void, ?*const anyopaque, *Event) callconv(.C) Status,
4646
4747 /// Sets the type of timer and the trigger time for a timer event.
4848 setTimer: fn (Event, TimerDelay, u64) callconv(.C) Status,
......@@ -64,14 +64,14 @@ pub const BootServices = extern struct {
6464 uninstallProtocolInterface: Status, // TODO
6565
6666 /// Queries a handle to determine if it supports a specified protocol.
67 handleProtocol: fn (Handle, *align(8) const Guid, *?*c_void) callconv(.C) Status,
67 handleProtocol: fn (Handle, *align(8) const Guid, *?*anyopaque) callconv(.C) Status,
6868
69 reserved: *c_void,
69 reserved: *anyopaque,
7070
7171 registerProtocolNotify: Status, // TODO
7272
7373 /// Returns an array of handles that support a specified protocol.
74 locateHandle: fn (LocateSearchType, ?*align(8) const Guid, ?*const c_void, *usize, [*]Handle) callconv(.C) Status,
74 locateHandle: fn (LocateSearchType, ?*align(8) const Guid, ?*const anyopaque, *usize, [*]Handle) callconv(.C) Status,
7575
7676 /// Locates the handle to a device on the device path that supports the specified protocol
7777 locateDevicePath: fn (*align(8) const Guid, **const DevicePathProtocol, *?Handle) callconv(.C) Status,
......@@ -84,7 +84,7 @@ pub const BootServices = extern struct {
8484 startImage: fn (Handle, ?*usize, ?*[*]u16) callconv(.C) Status,
8585
8686 /// Terminates a loaded EFI image and returns control to boot services.
87 exit: fn (Handle, Status, usize, ?*const c_void) callconv(.C) Status,
87 exit: fn (Handle, Status, usize, ?*const anyopaque) callconv(.C) Status,
8888
8989 /// Unloads an image.
9090 unloadImage: fn (Handle) callconv(.C) Status,
......@@ -105,7 +105,7 @@ pub const BootServices = extern struct {
105105 disconnectController: Status, // TODO
106106
107107 /// Queries a handle to determine if it supports a specified protocol.
108 openProtocol: fn (Handle, *align(8) const Guid, *?*c_void, ?Handle, ?Handle, OpenProtocolAttributes) callconv(.C) Status,
108 openProtocol: fn (Handle, *align(8) const Guid, *?*anyopaque, ?Handle, ?Handle, OpenProtocolAttributes) callconv(.C) Status,
109109
110110 /// Closes a protocol on a handle that was opened using openProtocol().
111111 closeProtocol: fn (Handle, *align(8) const Guid, Handle, ?Handle) callconv(.C) Status,
......@@ -117,10 +117,10 @@ pub const BootServices = extern struct {
117117 protocolsPerHandle: fn (Handle, *[*]*align(8) const Guid, *usize) callconv(.C) Status,
118118
119119 /// Returns an array of handles that support the requested protocol in a buffer allocated from pool.
120 locateHandleBuffer: fn (LocateSearchType, ?*align(8) const Guid, ?*const c_void, *usize, *[*]Handle) callconv(.C) Status,
120 locateHandleBuffer: fn (LocateSearchType, ?*align(8) const Guid, ?*const anyopaque, *usize, *[*]Handle) callconv(.C) Status,
121121
122122 /// Returns the first protocol instance that matches the given protocol.
123 locateProtocol: fn (*align(8) const Guid, ?*const c_void, *?*c_void) callconv(.C) Status,
123 locateProtocol: fn (*align(8) const Guid, ?*const anyopaque, *?*anyopaque) callconv(.C) Status,
124124
125125 installMultipleProtocolInterfaces: Status, // TODO
126126 uninstallMultipleProtocolInterfaces: Status, // TODO
lib/std/os/uefi/tables/configuration_table.zig+1-1
......@@ -3,7 +3,7 @@ const Guid = uefi.Guid;
33
44pub const ConfigurationTable = extern struct {
55 vendor_guid: Guid,
6 vendor_table: *c_void,
6 vendor_table: *anyopaque,
77
88 pub const acpi_20_table_guid align(8) = Guid{
99 .time_low = 0x8868e871,
lib/std/os/uefi/tables/runtime_services.zig+4-4
......@@ -28,21 +28,21 @@ pub const RuntimeServices = extern struct {
2828 setVirtualAddressMap: fn (usize, usize, u32, [*]MemoryDescriptor) callconv(.C) Status,
2929
3030 /// Determines the new virtual address that is to be used on subsequent memory accesses.
31 convertPointer: fn (usize, **c_void) callconv(.C) Status,
31 convertPointer: fn (usize, **anyopaque) callconv(.C) Status,
3232
3333 /// Returns the value of a variable.
34 getVariable: fn ([*:0]const u16, *align(8) const Guid, ?*u32, *usize, ?*c_void) callconv(.C) Status,
34 getVariable: fn ([*:0]const u16, *align(8) const Guid, ?*u32, *usize, ?*anyopaque) callconv(.C) Status,
3535
3636 /// Enumerates the current variable names.
3737 getNextVariableName: fn (*usize, [*:0]u16, *align(8) Guid) callconv(.C) Status,
3838
3939 /// Sets the value of a variable.
40 setVariable: fn ([*:0]const u16, *align(8) const Guid, u32, usize, *c_void) callconv(.C) Status,
40 setVariable: fn ([*:0]const u16, *align(8) const Guid, u32, usize, *anyopaque) callconv(.C) Status,
4141
4242 getNextHighMonotonicCount: Status, // TODO
4343
4444 /// Resets the entire platform.
45 resetSystem: fn (ResetType, Status, usize, ?*const c_void) callconv(.C) noreturn,
45 resetSystem: fn (ResetType, Status, usize, ?*const anyopaque) callconv(.C) noreturn,
4646
4747 updateCapsule: Status, // TODO
4848 queryCapsuleCapabilities: Status, // TODO
lib/std/os/windows.zig+16-16
......@@ -1553,7 +1553,7 @@ pub fn CreateProcessW(
15531553 lpThreadAttributes: ?*SECURITY_ATTRIBUTES,
15541554 bInheritHandles: BOOL,
15551555 dwCreationFlags: DWORD,
1556 lpEnvironment: ?*c_void,
1556 lpEnvironment: ?*anyopaque,
15571557 lpCurrentDirectory: ?LPWSTR,
15581558 lpStartupInfo: *STARTUPINFOW,
15591559 lpProcessInformation: *PROCESS_INFORMATION,
......@@ -1619,11 +1619,11 @@ pub fn QueryPerformanceCounter() u64 {
16191619 return @bitCast(u64, result);
16201620}
16211621
1622pub fn InitOnceExecuteOnce(InitOnce: *INIT_ONCE, InitFn: INIT_ONCE_FN, Parameter: ?*c_void, Context: ?*c_void) void {
1622pub fn InitOnceExecuteOnce(InitOnce: *INIT_ONCE, InitFn: INIT_ONCE_FN, Parameter: ?*anyopaque, Context: ?*anyopaque) void {
16231623 assert(kernel32.InitOnceExecuteOnce(InitOnce, InitFn, Parameter, Context) != 0);
16241624}
16251625
1626pub fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: *c_void) void {
1626pub fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: *anyopaque) void {
16271627 assert(kernel32.HeapFree(hHeap, dwFlags, lpMem) != 0);
16281628}
16291629
......@@ -1675,7 +1675,7 @@ pub fn LockFile(
16751675 FileHandle: HANDLE,
16761676 Event: ?HANDLE,
16771677 ApcRoutine: ?*IO_APC_ROUTINE,
1678 ApcContext: ?*c_void,
1678 ApcContext: ?*anyopaque,
16791679 IoStatusBlock: *IO_STATUS_BLOCK,
16801680 ByteOffset: *const LARGE_INTEGER,
16811681 Length: *const LARGE_INTEGER,
......@@ -1954,7 +1954,7 @@ pub fn loadWinsockExtensionFunction(comptime T: type, sock: ws2_32.SOCKET, guid:
19541954 const rc = ws2_32.WSAIoctl(
19551955 sock,
19561956 ws2_32.SIO_GET_EXTENSION_FUNCTION_POINTER,
1957 @ptrCast(*const c_void, &guid),
1957 @ptrCast(*const anyopaque, &guid),
19581958 @sizeOf(GUID),
19591959 &function,
19601960 @sizeOf(T),
......@@ -2055,7 +2055,7 @@ pub const BYTE = u8;
20552055pub const CHAR = u8;
20562056pub const UCHAR = u8;
20572057pub const FLOAT = f32;
2058pub const HANDLE = *c_void;
2058pub const HANDLE = *anyopaque;
20592059pub const HCRYPTPROV = ULONG_PTR;
20602060pub const ATOM = u16;
20612061pub const HBRUSH = *opaque {};
......@@ -2070,12 +2070,12 @@ pub const HGLRC = *opaque {};
20702070pub const FARPROC = *opaque {};
20712071pub const INT = c_int;
20722072pub const LPCSTR = [*:0]const CHAR;
2073pub const LPCVOID = *const c_void;
2073pub const LPCVOID = *const anyopaque;
20742074pub const LPSTR = [*:0]CHAR;
2075pub const LPVOID = *c_void;
2075pub const LPVOID = *anyopaque;
20762076pub const LPWSTR = [*:0]WCHAR;
20772077pub const LPCWSTR = [*:0]const WCHAR;
2078pub const PVOID = *c_void;
2078pub const PVOID = *anyopaque;
20792079pub const PWSTR = [*:0]WCHAR;
20802080pub const SIZE_T = usize;
20812081pub const UINT = c_uint;
......@@ -2289,7 +2289,7 @@ pub const IO_STATUS_BLOCK = extern struct {
22892289 // "DUMMYUNIONNAME" expands to "u"
22902290 u: extern union {
22912291 Status: NTSTATUS,
2292 Pointer: ?*c_void,
2292 Pointer: ?*anyopaque,
22932293 },
22942294 Information: ULONG_PTR,
22952295};
......@@ -2457,7 +2457,7 @@ pub const VOLUME_NAME_NT = 0x2;
24572457
24582458pub const SECURITY_ATTRIBUTES = extern struct {
24592459 nLength: DWORD,
2460 lpSecurityDescriptor: ?*c_void,
2460 lpSecurityDescriptor: ?*anyopaque,
24612461 bInheritHandle: BOOL,
24622462};
24632463
......@@ -2923,10 +2923,10 @@ pub const RTL_CRITICAL_SECTION = extern struct {
29232923pub const CRITICAL_SECTION = RTL_CRITICAL_SECTION;
29242924pub const INIT_ONCE = RTL_RUN_ONCE;
29252925pub const INIT_ONCE_STATIC_INIT = RTL_RUN_ONCE_INIT;
2926pub const INIT_ONCE_FN = fn (InitOnce: *INIT_ONCE, Parameter: ?*c_void, Context: ?*c_void) callconv(.C) BOOL;
2926pub const INIT_ONCE_FN = fn (InitOnce: *INIT_ONCE, Parameter: ?*anyopaque, Context: ?*anyopaque) callconv(.C) BOOL;
29272927
29282928pub const RTL_RUN_ONCE = extern struct {
2929 Ptr: ?*c_void,
2929 Ptr: ?*anyopaque,
29302930};
29312931
29322932pub const RTL_RUN_ONCE_INIT = RTL_RUN_ONCE{ .Ptr = null };
......@@ -2966,7 +2966,7 @@ pub const EXCEPTION_RECORD = extern struct {
29662966 ExceptionCode: u32,
29672967 ExceptionFlags: u32,
29682968 ExceptionRecord: *EXCEPTION_RECORD,
2969 ExceptionAddress: *c_void,
2969 ExceptionAddress: *anyopaque,
29702970 NumberParameters: u32,
29712971 ExceptionInformation: [15]usize,
29722972};
......@@ -3202,8 +3202,8 @@ pub const OBJECT_ATTRIBUTES = extern struct {
32023202 RootDirectory: ?HANDLE,
32033203 ObjectName: *UNICODE_STRING,
32043204 Attributes: ULONG,
3205 SecurityDescriptor: ?*c_void,
3206 SecurityQualityOfService: ?*c_void,
3205 SecurityDescriptor: ?*anyopaque,
3206 SecurityQualityOfService: ?*anyopaque,
32073207};
32083208
32093209pub const OBJ_INHERIT = 0x00000002;
lib/std/os/windows/kernel32.zig+10-10
......@@ -57,7 +57,7 @@ const UCHAR = windows.UCHAR;
5757const FARPROC = windows.FARPROC;
5858const INIT_ONCE_FN = windows.INIT_ONCE_FN;
5959
60pub extern "kernel32" fn AddVectoredExceptionHandler(First: c_ulong, Handler: ?VECTORED_EXCEPTION_HANDLER) callconv(WINAPI) ?*c_void;
60pub extern "kernel32" fn AddVectoredExceptionHandler(First: c_ulong, Handler: ?VECTORED_EXCEPTION_HANDLER) callconv(WINAPI) ?*anyopaque;
6161pub extern "kernel32" fn RemoveVectoredExceptionHandler(Handle: HANDLE) callconv(WINAPI) c_ulong;
6262
6363pub extern "kernel32" fn CancelIo(hFile: HANDLE) callconv(WINAPI) BOOL;
......@@ -110,7 +110,7 @@ pub extern "kernel32" fn CreateProcessW(
110110 lpThreadAttributes: ?*SECURITY_ATTRIBUTES,
111111 bInheritHandles: BOOL,
112112 dwCreationFlags: DWORD,
113 lpEnvironment: ?*c_void,
113 lpEnvironment: ?*anyopaque,
114114 lpCurrentDirectory: ?LPWSTR,
115115 lpStartupInfo: *STARTUPINFOW,
116116 lpProcessInformation: *PROCESS_INFORMATION,
......@@ -125,7 +125,7 @@ pub extern "kernel32" fn CreateThread(lpThreadAttributes: ?*SECURITY_ATTRIBUTES,
125125pub extern "kernel32" fn DeviceIoControl(
126126 h: HANDLE,
127127 dwIoControlCode: DWORD,
128 lpInBuffer: ?*const c_void,
128 lpInBuffer: ?*const anyopaque,
129129 nInBufferSize: DWORD,
130130 lpOutBuffer: ?LPVOID,
131131 nOutBufferSize: DWORD,
......@@ -194,7 +194,7 @@ pub extern "kernel32" fn GetFileInformationByHandle(
194194pub extern "kernel32" fn GetFileInformationByHandleEx(
195195 in_hFile: HANDLE,
196196 in_FileInformationClass: FILE_INFO_BY_HANDLE_CLASS,
197 out_lpFileInformation: *c_void,
197 out_lpFileInformation: *anyopaque,
198198 in_dwBufferSize: DWORD,
199199) callconv(WINAPI) BOOL;
200200
......@@ -230,18 +230,18 @@ pub extern "kernel32" fn GetSystemTimeAsFileTime(*FILETIME) callconv(WINAPI) voi
230230
231231pub extern "kernel32" fn HeapCreate(flOptions: DWORD, dwInitialSize: SIZE_T, dwMaximumSize: SIZE_T) callconv(WINAPI) ?HANDLE;
232232pub extern "kernel32" fn HeapDestroy(hHeap: HANDLE) callconv(WINAPI) BOOL;
233pub extern "kernel32" fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: *c_void, dwBytes: SIZE_T) callconv(WINAPI) ?*c_void;
234pub extern "kernel32" fn HeapSize(hHeap: HANDLE, dwFlags: DWORD, lpMem: *const c_void) callconv(WINAPI) SIZE_T;
233pub extern "kernel32" fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: *anyopaque, dwBytes: SIZE_T) callconv(WINAPI) ?*anyopaque;
234pub extern "kernel32" fn HeapSize(hHeap: HANDLE, dwFlags: DWORD, lpMem: *const anyopaque) callconv(WINAPI) SIZE_T;
235235pub extern "kernel32" fn HeapCompact(hHeap: HANDLE, dwFlags: DWORD) callconv(WINAPI) SIZE_T;
236236pub extern "kernel32" fn HeapSummary(hHeap: HANDLE, dwFlags: DWORD, lpSummary: LPHEAP_SUMMARY) callconv(WINAPI) BOOL;
237237
238238pub extern "kernel32" fn GetStdHandle(in_nStdHandle: DWORD) callconv(WINAPI) ?HANDLE;
239239
240pub extern "kernel32" fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T) callconv(WINAPI) ?*c_void;
240pub extern "kernel32" fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T) callconv(WINAPI) ?*anyopaque;
241241
242pub extern "kernel32" fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: *c_void) callconv(WINAPI) BOOL;
242pub extern "kernel32" fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: *anyopaque) callconv(WINAPI) BOOL;
243243
244pub extern "kernel32" fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: ?*const c_void) callconv(WINAPI) BOOL;
244pub extern "kernel32" fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: ?*const anyopaque) callconv(WINAPI) BOOL;
245245
246246pub extern "kernel32" fn VirtualAlloc(lpAddress: ?LPVOID, dwSize: SIZE_T, flAllocationType: DWORD, flProtect: DWORD) callconv(WINAPI) ?LPVOID;
247247pub extern "kernel32" fn VirtualFree(lpAddress: ?LPVOID, dwSize: SIZE_T, dwFreeType: DWORD) callconv(WINAPI) BOOL;
......@@ -356,7 +356,7 @@ pub extern "kernel32" fn EnterCriticalSection(lpCriticalSection: *CRITICAL_SECTI
356356pub extern "kernel32" fn LeaveCriticalSection(lpCriticalSection: *CRITICAL_SECTION) callconv(WINAPI) void;
357357pub extern "kernel32" fn DeleteCriticalSection(lpCriticalSection: *CRITICAL_SECTION) callconv(WINAPI) void;
358358
359pub extern "kernel32" fn InitOnceExecuteOnce(InitOnce: *INIT_ONCE, InitFn: INIT_ONCE_FN, Parameter: ?*c_void, Context: ?*c_void) callconv(WINAPI) BOOL;
359pub extern "kernel32" fn InitOnceExecuteOnce(InitOnce: *INIT_ONCE, InitFn: INIT_ONCE_FN, Parameter: ?*anyopaque, Context: ?*anyopaque) callconv(WINAPI) BOOL;
360360
361361pub extern "kernel32" fn K32EmptyWorkingSet(hProcess: HANDLE) callconv(WINAPI) BOOL;
362362pub extern "kernel32" fn K32EnumDeviceDrivers(lpImageBase: [*]LPVOID, cb: DWORD, lpcbNeeded: *DWORD) callconv(WINAPI) BOOL;
lib/std/os/windows/ntdll.zig+16-16
......@@ -29,13 +29,13 @@ pub extern "NtDll" fn RtlGetVersion(
2929pub extern "NtDll" fn RtlCaptureStackBackTrace(
3030 FramesToSkip: DWORD,
3131 FramesToCapture: DWORD,
32 BackTrace: **c_void,
32 BackTrace: **anyopaque,
3333 BackTraceHash: ?*DWORD,
3434) callconv(WINAPI) WORD;
3535pub extern "NtDll" fn NtQueryInformationFile(
3636 FileHandle: HANDLE,
3737 IoStatusBlock: *IO_STATUS_BLOCK,
38 FileInformation: *c_void,
38 FileInformation: *anyopaque,
3939 Length: ULONG,
4040 FileInformationClass: FILE_INFORMATION_CLASS,
4141) callconv(WINAPI) NTSTATUS;
......@@ -62,17 +62,17 @@ pub extern "NtDll" fn NtCreateFile(
6262 ShareAccess: ULONG,
6363 CreateDisposition: ULONG,
6464 CreateOptions: ULONG,
65 EaBuffer: ?*c_void,
65 EaBuffer: ?*anyopaque,
6666 EaLength: ULONG,
6767) callconv(WINAPI) NTSTATUS;
6868pub extern "NtDll" fn NtDeviceIoControlFile(
6969 FileHandle: HANDLE,
7070 Event: ?HANDLE,
7171 ApcRoutine: ?IO_APC_ROUTINE,
72 ApcContext: ?*c_void,
72 ApcContext: ?*anyopaque,
7373 IoStatusBlock: *IO_STATUS_BLOCK,
7474 IoControlCode: ULONG,
75 InputBuffer: ?*const c_void,
75 InputBuffer: ?*const anyopaque,
7676 InputBufferLength: ULONG,
7777 OutputBuffer: ?PVOID,
7878 OutputBufferLength: ULONG,
......@@ -81,10 +81,10 @@ pub extern "NtDll" fn NtFsControlFile(
8181 FileHandle: HANDLE,
8282 Event: ?HANDLE,
8383 ApcRoutine: ?IO_APC_ROUTINE,
84 ApcContext: ?*c_void,
84 ApcContext: ?*anyopaque,
8585 IoStatusBlock: *IO_STATUS_BLOCK,
8686 FsControlCode: ULONG,
87 InputBuffer: ?*const c_void,
87 InputBuffer: ?*const anyopaque,
8888 InputBufferLength: ULONG,
8989 OutputBuffer: ?PVOID,
9090 OutputBufferLength: ULONG,
......@@ -102,9 +102,9 @@ pub extern "NtDll" fn NtQueryDirectoryFile(
102102 FileHandle: HANDLE,
103103 Event: ?HANDLE,
104104 ApcRoutine: ?IO_APC_ROUTINE,
105 ApcContext: ?*c_void,
105 ApcContext: ?*anyopaque,
106106 IoStatusBlock: *IO_STATUS_BLOCK,
107 FileInformation: *c_void,
107 FileInformation: *anyopaque,
108108 Length: ULONG,
109109 FileInformationClass: FILE_INFORMATION_CLASS,
110110 ReturnSingleEntry: BOOLEAN,
......@@ -121,14 +121,14 @@ pub extern "NtDll" fn NtCreateKeyedEvent(
121121
122122pub extern "NtDll" fn NtReleaseKeyedEvent(
123123 EventHandle: ?HANDLE,
124 Key: ?*const c_void,
124 Key: ?*const anyopaque,
125125 Alertable: BOOLEAN,
126126 Timeout: ?*const LARGE_INTEGER,
127127) callconv(WINAPI) NTSTATUS;
128128
129129pub extern "NtDll" fn NtWaitForKeyedEvent(
130130 EventHandle: ?HANDLE,
131 Key: ?*const c_void,
131 Key: ?*const anyopaque,
132132 Alertable: BOOLEAN,
133133 Timeout: ?*const LARGE_INTEGER,
134134) callconv(WINAPI) NTSTATUS;
......@@ -144,16 +144,16 @@ pub extern "NtDll" fn NtQueryObject(
144144) callconv(WINAPI) NTSTATUS;
145145
146146pub extern "NtDll" fn RtlWakeAddressAll(
147 Address: ?*const c_void,
147 Address: ?*const anyopaque,
148148) callconv(WINAPI) void;
149149
150150pub extern "NtDll" fn RtlWakeAddressSingle(
151 Address: ?*const c_void,
151 Address: ?*const anyopaque,
152152) callconv(WINAPI) void;
153153
154154pub extern "NtDll" fn RtlWaitOnAddress(
155 Address: ?*const c_void,
156 CompareAddress: ?*const c_void,
155 Address: ?*const anyopaque,
156 CompareAddress: ?*const anyopaque,
157157 AddressSize: SIZE_T,
158158 Timeout: ?*const LARGE_INTEGER,
159159) callconv(WINAPI) NTSTATUS;
......@@ -162,7 +162,7 @@ pub extern "NtDll" fn NtLockFile(
162162 FileHandle: HANDLE,
163163 Event: ?HANDLE,
164164 ApcRoutine: ?*IO_APC_ROUTINE,
165 ApcContext: ?*c_void,
165 ApcContext: ?*anyopaque,
166166 IoStatusBlock: *IO_STATUS_BLOCK,
167167 ByteOffset: *const LARGE_INTEGER,
168168 Length: *const LARGE_INTEGER,
lib/std/os/windows/user32.zig+2-2
......@@ -1280,7 +1280,7 @@ pub const WS_EX_PALETTEWINDOW = WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPM
12801280pub const CW_USEDEFAULT = @bitCast(i32, @as(u32, 0x80000000));
12811281
12821282pub extern "user32" fn CreateWindowExA(dwExStyle: DWORD, lpClassName: [*:0]const u8, lpWindowName: [*:0]const u8, dwStyle: DWORD, X: i32, Y: i32, nWidth: i32, nHeight: i32, hWindParent: ?HWND, hMenu: ?HMENU, hInstance: HINSTANCE, lpParam: ?LPVOID) callconv(WINAPI) ?HWND;
1283pub fn createWindowExA(dwExStyle: u32, lpClassName: [*:0]const u8, lpWindowName: [*:0]const u8, dwStyle: u32, X: i32, Y: i32, nWidth: i32, nHeight: i32, hWindParent: ?HWND, hMenu: ?HMENU, hInstance: HINSTANCE, lpParam: ?*c_void) !HWND {
1283pub fn createWindowExA(dwExStyle: u32, lpClassName: [*:0]const u8, lpWindowName: [*:0]const u8, dwStyle: u32, X: i32, Y: i32, nWidth: i32, nHeight: i32, hWindParent: ?HWND, hMenu: ?HMENU, hInstance: HINSTANCE, lpParam: ?*anyopaque) !HWND {
12841284 const window = CreateWindowExA(dwExStyle, lpClassName, lpWindowName, dwStyle, X, Y, nWidth, nHeight, hWindParent, hMenu, hInstance, lpParam);
12851285 if (window) |win| return win;
12861286
......@@ -1293,7 +1293,7 @@ pub fn createWindowExA(dwExStyle: u32, lpClassName: [*:0]const u8, lpWindowName:
12931293
12941294pub extern "user32" fn CreateWindowExW(dwExStyle: DWORD, lpClassName: [*:0]const u16, lpWindowName: [*:0]const u16, dwStyle: DWORD, X: i32, Y: i32, nWidth: i32, nHeight: i32, hWindParent: ?HWND, hMenu: ?HMENU, hInstance: HINSTANCE, lpParam: ?LPVOID) callconv(WINAPI) ?HWND;
12951295pub var pfnCreateWindowExW: @TypeOf(CreateWindowExW) = undefined;
1296pub fn createWindowExW(dwExStyle: u32, lpClassName: [*:0]const u16, lpWindowName: [*:0]const u16, dwStyle: u32, X: i32, Y: i32, nWidth: i32, nHeight: i32, hWindParent: ?HWND, hMenu: ?HMENU, hInstance: HINSTANCE, lpParam: ?*c_void) !HWND {
1296pub fn createWindowExW(dwExStyle: u32, lpClassName: [*:0]const u16, lpWindowName: [*:0]const u16, dwStyle: u32, X: i32, Y: i32, nWidth: i32, nHeight: i32, hWindParent: ?HWND, hMenu: ?HMENU, hInstance: HINSTANCE, lpParam: ?*anyopaque) !HWND {
12971297 const function = selectSymbol(CreateWindowExW, pfnCreateWindowExW, .win2k);
12981298 const window = function(dwExStyle, lpClassName, lpWindowName, dwStyle, X, Y, nWidth, nHeight, hWindParent, hMenu, hInstance, lpParam);
12991299 if (window) |win| return win;
lib/std/os/windows/ws2_32.zig+13-13
......@@ -1095,7 +1095,7 @@ pub const addrinfoexA = extern struct {
10951095 ai_addrlen: usize,
10961096 ai_canonname: [*:0]u8,
10971097 ai_addr: *sockaddr,
1098 ai_blob: *c_void,
1098 ai_blob: *anyopaque,
10991099 ai_bloblen: usize,
11001100 ai_provider: *GUID,
11011101 ai_next: *addrinfoexA,
......@@ -1167,9 +1167,9 @@ pub const pollfd = extern struct {
11671167};
11681168
11691169pub const TRANSMIT_FILE_BUFFERS = extern struct {
1170 Head: *c_void,
1170 Head: *anyopaque,
11711171 HeadLength: u32,
1172 Tail: *c_void,
1172 Tail: *anyopaque,
11731173 TailLength: u32,
11741174};
11751175
......@@ -1186,7 +1186,7 @@ pub const LPFN_TRANSMITFILE = fn (
11861186pub const LPFN_ACCEPTEX = fn (
11871187 sListenSocket: SOCKET,
11881188 sAcceptSocket: SOCKET,
1189 lpOutputBuffer: *c_void,
1189 lpOutputBuffer: *anyopaque,
11901190 dwReceiveDataLength: u32,
11911191 dwLocalAddressLength: u32,
11921192 dwRemoteAddressLength: u32,
......@@ -1195,7 +1195,7 @@ pub const LPFN_ACCEPTEX = fn (
11951195) callconv(WINAPI) BOOL;
11961196
11971197pub const LPFN_GETACCEPTEXSOCKADDRS = fn (
1198 lpOutputBuffer: *c_void,
1198 lpOutputBuffer: *anyopaque,
11991199 dwReceiveDataLength: u32,
12001200 dwLocalAddressLength: u32,
12011201 dwRemoteAddressLength: u32,
......@@ -2017,9 +2017,9 @@ pub extern "ws2_32" fn WSAHtons(
20172017pub extern "ws2_32" fn WSAIoctl(
20182018 s: SOCKET,
20192019 dwIoControlCode: u32,
2020 lpvInBuffer: ?*const c_void,
2020 lpvInBuffer: ?*const anyopaque,
20212021 cbInBuffer: u32,
2022 lpvOutbuffer: ?*c_void,
2022 lpvOutbuffer: ?*anyopaque,
20232023 cbOutbuffer: u32,
20242024 lpcbBytesReturned: *u32,
20252025 lpOverlapped: ?*OVERLAPPED,
......@@ -2216,7 +2216,7 @@ pub extern "mswsock" fn TransmitFile(
22162216pub extern "mswsock" fn AcceptEx(
22172217 sListenSocket: SOCKET,
22182218 sAcceptSocket: SOCKET,
2219 lpOutputBuffer: *c_void,
2219 lpOutputBuffer: *anyopaque,
22202220 dwReceiveDataLength: u32,
22212221 dwLocalAddressLength: u32,
22222222 dwRemoteAddressLength: u32,
......@@ -2225,7 +2225,7 @@ pub extern "mswsock" fn AcceptEx(
22252225) callconv(WINAPI) BOOL;
22262226
22272227pub extern "mswsock" fn GetAcceptExSockaddrs(
2228 lpOutputBuffer: *c_void,
2228 lpOutputBuffer: *anyopaque,
22292229 dwReceiveDataLength: u32,
22302230 dwLocalAddressLength: u32,
22312231 dwRemoteAddressLength: u32,
......@@ -2242,13 +2242,13 @@ pub extern "ws2_32" fn WSAProviderCompleteAsyncCall(
22422242
22432243pub extern "mswsock" fn EnumProtocolsA(
22442244 lpiProtocols: ?*i32,
2245 lpProtocolBuffer: *c_void,
2245 lpProtocolBuffer: *anyopaque,
22462246 lpdwBufferLength: *u32,
22472247) callconv(WINAPI) i32;
22482248
22492249pub extern "mswsock" fn EnumProtocolsW(
22502250 lpiProtocols: ?*i32,
2251 lpProtocolBuffer: *c_void,
2251 lpProtocolBuffer: *anyopaque,
22522252 lpdwBufferLength: *u32,
22532253) callconv(WINAPI) i32;
22542254
......@@ -2259,7 +2259,7 @@ pub extern "mswsock" fn GetAddressByNameA(
22592259 lpiProtocols: ?*i32,
22602260 dwResolution: u32,
22612261 lpServiceAsyncInfo: ?*SERVICE_ASYNC_INFO,
2262 lpCsaddrBuffer: *c_void,
2262 lpCsaddrBuffer: *anyopaque,
22632263 lpAliasBuffer: ?[*:0]const u8,
22642264 lpdwAliasBufferLength: *u32,
22652265) callconv(WINAPI) i32;
......@@ -2271,7 +2271,7 @@ pub extern "mswsock" fn GetAddressByNameW(
22712271 lpiProtocols: ?*i32,
22722272 dwResolution: u32,
22732273 lpServiceAsyncInfo: ?*SERVICE_ASYNC_INFO,
2274 lpCsaddrBuffer: *c_void,
2274 lpCsaddrBuffer: *anyopaque,
22752275 ldwBufferLEngth: *u32,
22762276 lpAliasBuffer: ?[*:0]u16,
22772277 lpdwAliasBufferLength: *u32,
lib/std/rand.zig+3-3
......@@ -29,8 +29,8 @@ pub const Xoshiro256 = @import("rand/Xoshiro256.zig");
2929pub const Sfc64 = @import("rand/Sfc64.zig");
3030
3131pub const Random = struct {
32 ptr: *c_void,
33 fillFn: fn (ptr: *c_void, buf: []u8) void,
32 ptr: *anyopaque,
33 fillFn: fn (ptr: *anyopaque, buf: []u8) void,
3434
3535 pub fn init(pointer: anytype, comptime fillFn: fn (ptr: @TypeOf(pointer), buf: []u8) void) Random {
3636 const Ptr = @TypeOf(pointer);
......@@ -38,7 +38,7 @@ pub const Random = struct {
3838 assert(@typeInfo(Ptr).Pointer.size == .One); // Must be a single-item pointer
3939 assert(@typeInfo(@typeInfo(Ptr).Pointer.child) == .Struct); // Must point to a struct
4040 const gen = struct {
41 fn fill(ptr: *c_void, buf: []u8) void {
41 fn fill(ptr: *anyopaque, buf: []u8) void {
4242 const alignment = @typeInfo(Ptr).Pointer.alignment;
4343 const self = @ptrCast(Ptr, @alignCast(alignment, ptr));
4444 fillFn(self, buf);
lib/std/special/compiler_rt/emutls.zig+12-12
......@@ -20,7 +20,7 @@ comptime {
2020}
2121
2222/// public entrypoint for generated code using EmulatedTLS
23pub fn __emutls_get_address(control: *emutls_control) callconv(.C) *c_void {
23pub fn __emutls_get_address(control: *emutls_control) callconv(.C) *anyopaque {
2424 return control.getPointer();
2525}
2626
......@@ -47,7 +47,7 @@ const simple_allocator = struct {
4747 pub fn advancedAlloc(alignment: u29, size: usize) [*]u8 {
4848 const minimal_alignment = std.math.max(@alignOf(usize), alignment);
4949
50 var aligned_ptr: ?*c_void = undefined;
50 var aligned_ptr: ?*anyopaque = undefined;
5151 if (std.c.posix_memalign(&aligned_ptr, minimal_alignment, size) != 0) {
5252 abort();
5353 }
......@@ -57,7 +57,7 @@ const simple_allocator = struct {
5757
5858 /// Resize a slice.
5959 pub fn reallocSlice(comptime T: type, slice: []T, len: usize) []T {
60 var c_ptr: *c_void = @ptrCast(*c_void, slice.ptr);
60 var c_ptr: *anyopaque = @ptrCast(*anyopaque, slice.ptr);
6161 var new_array: [*]T = @ptrCast([*]T, @alignCast(
6262 @alignOf(T),
6363 std.c.realloc(c_ptr, @sizeOf(T) * len) orelse abort(),
......@@ -67,14 +67,14 @@ const simple_allocator = struct {
6767
6868 /// Free a memory chunk allocated with simple_allocator.
6969 pub fn free(ptr: anytype) void {
70 std.c.free(@ptrCast(*c_void, ptr));
70 std.c.free(@ptrCast(*anyopaque, ptr));
7171 }
7272};
7373
7474/// Simple array of ?ObjectPointer with automatic resizing and
7575/// automatic storage allocation.
7676const ObjectArray = struct {
77 const ObjectPointer = *c_void;
77 const ObjectPointer = *anyopaque;
7878
7979 // content of the array
8080 slots: []?ObjectPointer,
......@@ -143,7 +143,7 @@ const ObjectArray = struct {
143143 @memset(data, 0, size);
144144 }
145145
146 self.slots[index] = @ptrCast(*c_void, data);
146 self.slots[index] = @ptrCast(*anyopaque, data);
147147 }
148148
149149 return self.slots[index].?;
......@@ -189,7 +189,7 @@ const current_thread_storage = struct {
189189
190190 /// Set casted thread specific value.
191191 fn setspecific(new: ?*ObjectArray) void {
192 if (std.c.pthread_setspecific(current_thread_storage.key, @ptrCast(*c_void, new)) != 0) {
192 if (std.c.pthread_setspecific(current_thread_storage.key, @ptrCast(*anyopaque, new)) != 0) {
193193 abort();
194194 }
195195 }
......@@ -202,7 +202,7 @@ const current_thread_storage = struct {
202202 }
203203
204204 /// Invoked by pthread specific destructor. the passed argument is the ObjectArray pointer.
205 fn deinit(arrayPtr: *c_void) callconv(.C) void {
205 fn deinit(arrayPtr: *anyopaque) callconv(.C) void {
206206 var array = @ptrCast(
207207 *ObjectArray,
208208 @alignCast(@alignOf(ObjectArray), arrayPtr),
......@@ -228,11 +228,11 @@ const emutls_control = extern struct {
228228 index: usize,
229229
230230 // object address, when in single thread env (not used)
231 address: *c_void,
231 address: *anyopaque,
232232 },
233233
234234 // null or non-zero initial value for the object
235 default_value: ?*c_void,
235 default_value: ?*anyopaque,
236236
237237 // global Mutex used to serialize control.index initialization.
238238 var mutex: std.c.pthread_mutex_t = std.c.PTHREAD_MUTEX_INITIALIZER;
......@@ -292,12 +292,12 @@ const emutls_control = extern struct {
292292 .size = @sizeOf(T),
293293 .alignment = @alignOf(T),
294294 .object = .{ .index = 0 },
295 .default_value = @ptrCast(?*c_void, default_value),
295 .default_value = @ptrCast(?*anyopaque, default_value),
296296 };
297297 }
298298
299299 /// Get the pointer on allocated storage for emutls variable.
300 pub fn getPointer(self: *emutls_control) *c_void {
300 pub fn getPointer(self: *emutls_control) *anyopaque {
301301 // ensure current_thread_storage initialization is done
302302 current_thread_storage.init_once.call();
303303
lib/std/start_windows_tls.zig+4-4
......@@ -31,10 +31,10 @@ comptime {
3131//};
3232// This is the workaround because we can't do @ptrToInt at comptime like that.
3333pub const IMAGE_TLS_DIRECTORY = extern struct {
34 StartAddressOfRawData: *c_void,
35 EndAddressOfRawData: *c_void,
36 AddressOfIndex: *c_void,
37 AddressOfCallBacks: *c_void,
34 StartAddressOfRawData: *anyopaque,
35 EndAddressOfRawData: *anyopaque,
36 AddressOfIndex: *anyopaque,
37 AddressOfCallBacks: *anyopaque,
3838 SizeOfZeroFill: u32,
3939 Characteristics: u32,
4040};
lib/std/zig/c_builtins.zig+11-11
......@@ -129,7 +129,7 @@ pub inline fn __builtin_strcmp(s1: [*c]const u8, s2: [*c]const u8) c_int {
129129 return @as(c_int, std.cstr.cmp(s1, s2));
130130}
131131
132pub inline fn __builtin_object_size(ptr: ?*const c_void, ty: c_int) usize {
132pub inline fn __builtin_object_size(ptr: ?*const anyopaque, ty: c_int) usize {
133133 _ = ptr;
134134 // clang semantics match gcc's: https://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html
135135 // If it is not possible to determine which objects ptr points to at compile time,
......@@ -141,36 +141,36 @@ pub inline fn __builtin_object_size(ptr: ?*const c_void, ty: c_int) usize {
141141}
142142
143143pub inline fn __builtin___memset_chk(
144 dst: ?*c_void,
144 dst: ?*anyopaque,
145145 val: c_int,
146146 len: usize,
147147 remaining: usize,
148) ?*c_void {
148) ?*anyopaque {
149149 if (len > remaining) @panic("std.c.builtins.memset_chk called with len > remaining");
150150 return __builtin_memset(dst, val, len);
151151}
152152
153pub inline fn __builtin_memset(dst: ?*c_void, val: c_int, len: usize) ?*c_void {
153pub inline fn __builtin_memset(dst: ?*anyopaque, val: c_int, len: usize) ?*anyopaque {
154154 const dst_cast = @ptrCast([*c]u8, dst);
155155 @memset(dst_cast, @bitCast(u8, @truncate(i8, val)), len);
156156 return dst;
157157}
158158
159159pub inline fn __builtin___memcpy_chk(
160 noalias dst: ?*c_void,
161 noalias src: ?*const c_void,
160 noalias dst: ?*anyopaque,
161 noalias src: ?*const anyopaque,
162162 len: usize,
163163 remaining: usize,
164) ?*c_void {
164) ?*anyopaque {
165165 if (len > remaining) @panic("std.c.builtins.memcpy_chk called with len > remaining");
166166 return __builtin_memcpy(dst, src, len);
167167}
168168
169169pub inline fn __builtin_memcpy(
170 noalias dst: ?*c_void,
171 noalias src: ?*const c_void,
170 noalias dst: ?*anyopaque,
171 noalias src: ?*const anyopaque,
172172 len: usize,
173) ?*c_void {
173) ?*anyopaque {
174174 const dst_cast = @ptrCast([*c]u8, dst);
175175 const src_cast = @ptrCast([*c]const u8, src);
176176
......@@ -232,4 +232,4 @@ pub inline fn __builtin_isinf_sign(x: anytype) c_int {
232232// It is used in a run-translated-c test and a test-translate-c test to ensure that non-implemented
233233// builtins are correctly demoted. If you implement __builtin_alloca_with_align, please update the
234234// run-translated-c test and the test-translate-c test to use a different non-implemented builtin.
235// pub fn __builtin_alloca_with_align(size: usize, alignment: usize) callconv(.Inline) *c_void {}
235// pub fn __builtin_alloca_with_align(size: usize, alignment: usize) callconv(.Inline) *anyopaque {}
lib/std/zig/c_translation.zig+12-12
......@@ -110,15 +110,15 @@ test "cast" {
110110 try testing.expectEqual(@intToPtr(*u8, 2), cast(*u8, @intToPtr(*const u8, 2)));
111111 try testing.expectEqual(@intToPtr(*u8, 2), cast(*u8, @intToPtr(*volatile u8, 2)));
112112
113 try testing.expectEqual(@intToPtr(?*c_void, 2), cast(?*c_void, @intToPtr(*u8, 2)));
113 try testing.expectEqual(@intToPtr(?*anyopaque, 2), cast(?*anyopaque, @intToPtr(*u8, 2)));
114114
115115 var foo: c_int = -1;
116 try testing.expect(cast(*c_void, -1) == @intToPtr(*c_void, @bitCast(usize, @as(isize, -1))));
117 try testing.expect(cast(*c_void, foo) == @intToPtr(*c_void, @bitCast(usize, @as(isize, -1))));
118 try testing.expect(cast(?*c_void, -1) == @intToPtr(?*c_void, @bitCast(usize, @as(isize, -1))));
119 try testing.expect(cast(?*c_void, foo) == @intToPtr(?*c_void, @bitCast(usize, @as(isize, -1))));
116 try testing.expect(cast(*anyopaque, -1) == @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -1))));
117 try testing.expect(cast(*anyopaque, foo) == @intToPtr(*anyopaque, @bitCast(usize, @as(isize, -1))));
118 try testing.expect(cast(?*anyopaque, -1) == @intToPtr(?*anyopaque, @bitCast(usize, @as(isize, -1))));
119 try testing.expect(cast(?*anyopaque, foo) == @intToPtr(?*anyopaque, @bitCast(usize, @as(isize, -1))));
120120
121 const FnPtr = ?fn (*c_void) void;
121 const FnPtr = ?fn (*anyopaque) void;
122122 try testing.expect(cast(FnPtr, 0) == @intToPtr(FnPtr, @as(usize, 0)));
123123 try testing.expect(cast(FnPtr, foo) == @intToPtr(FnPtr, @bitCast(usize, @as(isize, -1))));
124124}
......@@ -133,13 +133,13 @@ pub fn sizeof(target: anytype) usize {
133133 // We cannot distinguish those types in Zig, so use pointer size.
134134 return @sizeOf(T);
135135 },
136 .Null => return @sizeOf(*c_void),
136 .Null => return @sizeOf(*anyopaque),
137137 .Void => {
138138 // Note: sizeof(void) is 1 on clang/gcc and 0 on MSVC.
139139 return 1;
140140 },
141141 .Opaque => {
142 if (T == c_void) {
142 if (T == anyopaque) {
143143 // Note: sizeof(void) is 1 on clang/gcc and 0 on MSVC.
144144 return 1;
145145 } else {
......@@ -175,7 +175,7 @@ pub fn sizeof(target: anytype) usize {
175175 // When zero sized pointers are removed, this case will no
176176 // longer be reachable and can be deleted.
177177 if (@sizeOf(T) == 0) {
178 return @sizeOf(*c_void);
178 return @sizeOf(*anyopaque);
179179 }
180180 return @sizeOf(T);
181181 },
......@@ -195,7 +195,7 @@ pub fn sizeof(target: anytype) usize {
195195test "sizeof" {
196196 const S = extern struct { a: u32 };
197197
198 const ptr_size = @sizeOf(*c_void);
198 const ptr_size = @sizeOf(*anyopaque);
199199
200200 try testing.expect(sizeof(u32) == 4);
201201 try testing.expect(sizeof(@as(u32, 2)) == 4);
......@@ -215,7 +215,7 @@ test "sizeof" {
215215 try testing.expect(sizeof([*c]u32) == ptr_size);
216216 try testing.expect(sizeof(?*u32) == ptr_size);
217217 try testing.expect(sizeof(?[*]u32) == ptr_size);
218 try testing.expect(sizeof(*c_void) == ptr_size);
218 try testing.expect(sizeof(*anyopaque) == ptr_size);
219219 try testing.expect(sizeof(*void) == ptr_size);
220220 try testing.expect(sizeof(null) == ptr_size);
221221
......@@ -230,7 +230,7 @@ test "sizeof" {
230230 try testing.expect(sizeof(sizeof) == @sizeOf(@TypeOf(sizeof)));
231231
232232 try testing.expect(sizeof(void) == 1);
233 try testing.expect(sizeof(c_void) == 1);
233 try testing.expect(sizeof(anyopaque) == 1);
234234}
235235
236236pub const CIntLiteralRadix = enum { decimal, octal, hexadecimal };
lib/std/zig/parser_test.zig+23
......@@ -87,6 +87,29 @@ test "zig fmt: rewrite @byteOffsetOf to @offsetOf" {
8787 );
8888}
8989
90// TODO Remove this after zig 0.10.0 is released.
91test "zig fmt: rewrite c_void to anyopaque" {
92 try testTransform(
93 \\const Foo = struct {
94 \\ c_void: *c_void,
95 \\};
96 \\
97 \\fn foo(a: ?*c_void) !*c_void {
98 \\ return a orelse unreachable;
99 \\}
100 \\
101 ,
102 \\const Foo = struct {
103 \\ c_void: *anyopaque,
104 \\};
105 \\
106 \\fn foo(a: ?*anyopaque) !*anyopaque {
107 \\ return a orelse unreachable;
108 \\}
109 \\
110 );
111}
112
90113test "zig fmt: simple top level comptime block" {
91114 try testCanonical(
92115 \\// line comment
lib/std/zig/render.zig+22-5
......@@ -183,7 +183,21 @@ fn renderExpression(gpa: Allocator, ais: *Ais, tree: Ast, node: Ast.Node.Index,
183183 const node_tags = tree.nodes.items(.tag);
184184 const datas = tree.nodes.items(.data);
185185 switch (node_tags[node]) {
186 .identifier,
186 // TODO remove this c_void -> anyopaque rewrite after the 0.10.0 release.
187 // Also get rid of renderSpace() as it will no longer be necessary.
188 .identifier => {
189 const token_index = main_tokens[node];
190
191 const lexeme = tokenSliceForRender(tree, token_index);
192 if (mem.eql(u8, lexeme, "c_void")) {
193 try ais.writer().writeAll("anyopaque");
194 } else {
195 try ais.writer().writeAll(lexeme);
196 }
197
198 return renderSpace(ais, tree, token_index, lexeme.len, space);
199 },
200
187201 .integer_literal,
188202 .float_literal,
189203 .char_literal,
......@@ -2284,13 +2298,16 @@ const Space = enum {
22842298};
22852299
22862300fn renderToken(ais: *Ais, tree: Ast, token_index: Ast.TokenIndex, space: Space) Error!void {
2301 const lexeme = tokenSliceForRender(tree, token_index);
2302 try ais.writer().writeAll(lexeme);
2303 try renderSpace(ais, tree, token_index, lexeme.len, space);
2304}
2305
2306fn renderSpace(ais: *Ais, tree: Ast, token_index: Ast.TokenIndex, lexeme_len: usize, space: Space) Error!void {
22872307 const token_tags = tree.tokens.items(.tag);
22882308 const token_starts = tree.tokens.items(.start);
22892309
22902310 const token_start = token_starts[token_index];
2291 const lexeme = tokenSliceForRender(tree, token_index);
2292
2293 try ais.writer().writeAll(lexeme);
22942311
22952312 if (space == .skip) return;
22962313
......@@ -2298,7 +2315,7 @@ fn renderToken(ais: *Ais, tree: Ast, token_index: Ast.TokenIndex, space: Space)
22982315 try ais.writer().writeByte(',');
22992316 }
23002317
2301 const comment = try renderComments(ais, tree, token_start + lexeme.len, token_starts[token_index + 1]);
2318 const comment = try renderComments(ais, tree, token_start + lexeme_len, token_starts[token_index + 1]);
23022319 switch (space) {
23032320 .none => {},
23042321 .space => if (!comment) try ais.writer().writeByte(' '),
src/AstGen.zig+2-2
......@@ -7597,6 +7597,7 @@ fn calleeExpr(
75977597const primitives = std.ComptimeStringMap(Zir.Inst.Ref, .{
75987598 .{ "anyerror", .anyerror_type },
75997599 .{ "anyframe", .anyframe_type },
7600 .{ "anyopaque", .anyopaque_type },
76007601 .{ "bool", .bool_type },
76017602 .{ "c_int", .c_int_type },
76027603 .{ "c_long", .c_long_type },
......@@ -7607,7 +7608,6 @@ const primitives = std.ComptimeStringMap(Zir.Inst.Ref, .{
76077608 .{ "c_ulong", .c_ulong_type },
76087609 .{ "c_ulonglong", .c_ulonglong_type },
76097610 .{ "c_ushort", .c_ushort_type },
7610 .{ "c_void", .c_void_type },
76117611 .{ "comptime_float", .comptime_float_type },
76127612 .{ "comptime_int", .comptime_int_type },
76137613 .{ "f128", .f128_type },
......@@ -8324,7 +8324,7 @@ fn rvalue(
83248324 as_ty | @enumToInt(Zir.Inst.Ref.f32_type),
83258325 as_ty | @enumToInt(Zir.Inst.Ref.f64_type),
83268326 as_ty | @enumToInt(Zir.Inst.Ref.f128_type),
8327 as_ty | @enumToInt(Zir.Inst.Ref.c_void_type),
8327 as_ty | @enumToInt(Zir.Inst.Ref.anyopaque_type),
83288328 as_ty | @enumToInt(Zir.Inst.Ref.bool_type),
83298329 as_ty | @enumToInt(Zir.Inst.Ref.void_type),
83308330 as_ty | @enumToInt(Zir.Inst.Ref.type_type),
src/Sema.zig+4-4
......@@ -12354,9 +12354,9 @@ fn coerce(
1235412354 }
1235512355 }
1235612356
12357 // cast from *T and [*]T to *c_void
12357 // cast from *T and [*]T to *anyopaque
1235812358 // but don't do it if the source type is a double pointer
12359 if (dest_info.pointee_type.tag() == .c_void and inst_ty.zigTypeTag() == .Pointer and
12359 if (dest_info.pointee_type.tag() == .anyopaque and inst_ty.zigTypeTag() == .Pointer and
1236012360 inst_ty.childType().zigTypeTag() != .Pointer)
1236112361 {
1236212362 return sema.coerceCompatiblePtrs(block, dest_ty, inst, inst_src);
......@@ -14809,7 +14809,7 @@ fn typeHasOnePossibleValue(
1480914809 .const_slice_u8,
1481014810 .const_slice,
1481114811 .mut_slice,
14812 .c_void,
14812 .anyopaque,
1481314813 .optional,
1481414814 .optional_single_mut_pointer,
1481514815 .optional_single_const_pointer,
......@@ -15026,7 +15026,7 @@ pub fn addType(sema: *Sema, ty: Type) !Air.Inst.Ref {
1502615026 .f32 => return .f32_type,
1502715027 .f64 => return .f64_type,
1502815028 .f128 => return .f128_type,
15029 .c_void => return .c_void_type,
15029 .anyopaque => return .anyopaque_type,
1503015030 .bool => return .bool_type,
1503115031 .void => return .void_type,
1503215032 .type => return .type_type,
src/Zir.zig+3-3
......@@ -1632,7 +1632,7 @@ pub const Inst = struct {
16321632 f32_type,
16331633 f64_type,
16341634 f128_type,
1635 c_void_type,
1635 anyopaque_type,
16361636 bool_type,
16371637 void_type,
16381638 type_type,
......@@ -1805,9 +1805,9 @@ pub const Inst = struct {
18051805 .ty = Type.initTag(.type),
18061806 .val = Value.initTag(.f128_type),
18071807 },
1808 .c_void_type = .{
1808 .anyopaque_type = .{
18091809 .ty = Type.initTag(.type),
1810 .val = Value.initTag(.c_void_type),
1810 .val = Value.initTag(.anyopaque_type),
18111811 },
18121812 .bool_type = .{
18131813 .ty = Type.initTag(.type),
src/clang.zig+6-6
......@@ -9,7 +9,7 @@ pub const SourceLocation = extern struct {
99};
1010
1111pub const QualType = extern struct {
12 ptr: ?*c_void,
12 ptr: ?*anyopaque,
1313
1414 pub const getCanonicalType = ZigClangQualType_getCanonicalType;
1515 extern fn ZigClangQualType_getCanonicalType(QualType) QualType;
......@@ -37,7 +37,7 @@ pub const QualType = extern struct {
3737};
3838
3939pub const APValueLValueBase = extern struct {
40 Ptr: ?*c_void,
40 Ptr: ?*anyopaque,
4141 CallIndex: c_uint,
4242 Version: c_uint,
4343
......@@ -85,7 +85,7 @@ pub const APValue = extern struct {
8585pub const ExprEvalResult = extern struct {
8686 HasSideEffects: bool,
8787 HasUndefinedBehavior: bool,
88 SmallVectorImpl: ?*c_void,
88 SmallVectorImpl: ?*anyopaque,
8989 Val: APValue,
9090};
9191
......@@ -161,7 +161,7 @@ pub const ASTUnit = opaque {
161161 extern fn ZigClangASTUnit_getSourceManager(*ASTUnit) *SourceManager;
162162
163163 pub const visitLocalTopLevelDecls = ZigClangASTUnit_visitLocalTopLevelDecls;
164 extern fn ZigClangASTUnit_visitLocalTopLevelDecls(*ASTUnit, context: ?*c_void, Fn: ?fn (?*c_void, *const Decl) callconv(.C) bool) bool;
164 extern fn ZigClangASTUnit_visitLocalTopLevelDecls(*ASTUnit, context: ?*anyopaque, Fn: ?fn (?*anyopaque, *const Decl) callconv(.C) bool) bool;
165165
166166 pub const getLocalPreprocessingEntities_begin = ZigClangASTUnit_getLocalPreprocessingEntities_begin;
167167 extern fn ZigClangASTUnit_getLocalPreprocessingEntities_begin(*ASTUnit) PreprocessingRecord.iterator;
......@@ -418,7 +418,7 @@ pub const EnumDecl = opaque {
418418 extern fn ZigClangEnumDecl_enumerator_end(*const EnumDecl) enumerator_iterator;
419419
420420 pub const enumerator_iterator = extern struct {
421 ptr: *c_void,
421 ptr: *anyopaque,
422422
423423 pub const next = ZigClangEnumDecl_enumerator_iterator_next;
424424 extern fn ZigClangEnumDecl_enumerator_iterator_next(enumerator_iterator) enumerator_iterator;
......@@ -778,7 +778,7 @@ pub const RecordDecl = opaque {
778778 extern fn ZigClangRecordDecl_field_end(*const RecordDecl) field_iterator;
779779
780780 pub const field_iterator = extern struct {
781 ptr: *c_void,
781 ptr: *anyopaque,
782782
783783 pub const next = ZigClangRecordDecl_field_iterator_next;
784784 extern fn ZigClangRecordDecl_field_iterator_next(field_iterator) field_iterator;
src/crash_report.zig+1-1
......@@ -179,7 +179,7 @@ pub fn attachSegfaultHandler() void {
179179 os.sigaction(os.SIG.BUS, &act, null);
180180}
181181
182fn handleSegfaultLinux(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const c_void) callconv(.C) noreturn {
182fn handleSegfaultLinux(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const anyopaque) callconv(.C) noreturn {
183183 // TODO: use alarm() here to prevent infinite loops
184184 PanicSwitch.preDispatch();
185185
src/stage1/all_types.hpp+1-1
......@@ -2076,7 +2076,7 @@ struct CodeGen {
20762076 ZigType *entry_bool;
20772077 ZigType *entry_c_int[CIntTypeCount];
20782078 ZigType *entry_c_longdouble;
2079 ZigType *entry_c_void;
2079 ZigType *entry_anyopaque;
20802080 ZigType *entry_u8;
20812081 ZigType *entry_u16;
20822082 ZigType *entry_u32;
src/stage1/codegen.cpp+3-3
......@@ -9014,9 +9014,9 @@ static void define_builtin_types(CodeGen *g) {
90149014 g->builtin_types.entry_i64 = get_int_type(g, true, 64);
90159015
90169016 {
9017 g->builtin_types.entry_c_void = get_opaque_type(g, nullptr, nullptr, "c_void",
9018 buf_create_from_str("c_void"));
9019 g->primitive_type_table.put(&g->builtin_types.entry_c_void->name, g->builtin_types.entry_c_void);
9017 g->builtin_types.entry_anyopaque = get_opaque_type(g, nullptr, nullptr, "anyopaque",
9018 buf_create_from_str("anyopaque"));
9019 g->primitive_type_table.put(&g->builtin_types.entry_anyopaque->name, g->builtin_types.entry_anyopaque);
90209020 }
90219021
90229022 {
src/stage1/ir.cpp+3-3
......@@ -7884,18 +7884,18 @@ static Stage1AirInst *ir_analyze_cast(IrAnalyze *ira, Scope *scope, AstNode *sou
78847884 }
78857885 }
78867886
7887 // cast from *T and [*]T to *c_void and ?*c_void
7887 // cast from *T and [*]T to *anyopaque and ?*anyopaque
78887888 // but don't do it if the actual type is a double pointer
78897889 if (is_pointery_and_elem_is_not_pointery(actual_type)) {
78907890 ZigType *dest_ptr_type = nullptr;
78917891 if (wanted_type->id == ZigTypeIdPointer &&
78927892 actual_type->id != ZigTypeIdOptional &&
7893 wanted_type->data.pointer.child_type == ira->codegen->builtin_types.entry_c_void)
7893 wanted_type->data.pointer.child_type == ira->codegen->builtin_types.entry_anyopaque)
78947894 {
78957895 dest_ptr_type = wanted_type;
78967896 } else if (wanted_type->id == ZigTypeIdOptional &&
78977897 wanted_type->data.maybe.child_type->id == ZigTypeIdPointer &&
7898 wanted_type->data.maybe.child_type->data.pointer.child_type == ira->codegen->builtin_types.entry_c_void)
7898 wanted_type->data.maybe.child_type->data.pointer.child_type == ira->codegen->builtin_types.entry_anyopaque)
78997899 {
79007900 dest_ptr_type = wanted_type->data.maybe.child_type;
79017901 }
src/tracy.zig+8-8
......@@ -284,14 +284,14 @@ extern fn ___tracy_emit_zone_name(ctx: ___tracy_c_zone_context, txt: [*]const u8
284284extern fn ___tracy_emit_zone_color(ctx: ___tracy_c_zone_context, color: u32) void;
285285extern fn ___tracy_emit_zone_value(ctx: ___tracy_c_zone_context, value: u64) void;
286286extern fn ___tracy_emit_zone_end(ctx: ___tracy_c_zone_context) void;
287extern fn ___tracy_emit_memory_alloc(ptr: *const c_void, size: usize, secure: c_int) void;
288extern fn ___tracy_emit_memory_alloc_callstack(ptr: *const c_void, size: usize, depth: c_int, secure: c_int) void;
289extern fn ___tracy_emit_memory_free(ptr: *const c_void, secure: c_int) void;
290extern fn ___tracy_emit_memory_free_callstack(ptr: *const c_void, depth: c_int, secure: c_int) void;
291extern fn ___tracy_emit_memory_alloc_named(ptr: *const c_void, size: usize, secure: c_int, name: [*:0]const u8) void;
292extern fn ___tracy_emit_memory_alloc_callstack_named(ptr: *const c_void, size: usize, depth: c_int, secure: c_int, name: [*:0]const u8) void;
293extern fn ___tracy_emit_memory_free_named(ptr: *const c_void, secure: c_int, name: [*:0]const u8) void;
294extern fn ___tracy_emit_memory_free_callstack_named(ptr: *const c_void, depth: c_int, secure: c_int, name: [*:0]const u8) void;
287extern fn ___tracy_emit_memory_alloc(ptr: *const anyopaque, size: usize, secure: c_int) void;
288extern fn ___tracy_emit_memory_alloc_callstack(ptr: *const anyopaque, size: usize, depth: c_int, secure: c_int) void;
289extern fn ___tracy_emit_memory_free(ptr: *const anyopaque, secure: c_int) void;
290extern fn ___tracy_emit_memory_free_callstack(ptr: *const anyopaque, depth: c_int, secure: c_int) void;
291extern fn ___tracy_emit_memory_alloc_named(ptr: *const anyopaque, size: usize, secure: c_int, name: [*:0]const u8) void;
292extern fn ___tracy_emit_memory_alloc_callstack_named(ptr: *const anyopaque, size: usize, depth: c_int, secure: c_int, name: [*:0]const u8) void;
293extern fn ___tracy_emit_memory_free_named(ptr: *const anyopaque, secure: c_int, name: [*:0]const u8) void;
294extern fn ___tracy_emit_memory_free_callstack_named(ptr: *const anyopaque, depth: c_int, secure: c_int, name: [*:0]const u8) void;
295295extern fn ___tracy_emit_message(txt: [*]const u8, size: usize, callstack: c_int) void;
296296extern fn ___tracy_emit_messageL(txt: [*:0]const u8, callstack: c_int) void;
297297extern fn ___tracy_emit_messageC(txt: [*]const u8, size: usize, color: u32, callstack: c_int) void;
src/translate_c.zig+8-8
......@@ -448,13 +448,13 @@ fn prepopulateGlobalNameTable(ast_unit: *clang.ASTUnit, c: *Context) !void {
448448 }
449449}
450450
451fn declVisitorNamesOnlyC(context: ?*c_void, decl: *const clang.Decl) callconv(.C) bool {
451fn declVisitorNamesOnlyC(context: ?*anyopaque, decl: *const clang.Decl) callconv(.C) bool {
452452 const c = @ptrCast(*Context, @alignCast(@alignOf(Context), context));
453453 declVisitorNamesOnly(c, decl) catch return false;
454454 return true;
455455}
456456
457fn declVisitorC(context: ?*c_void, decl: *const clang.Decl) callconv(.C) bool {
457fn declVisitorC(context: ?*anyopaque, decl: *const clang.Decl) callconv(.C) bool {
458458 const c = @ptrCast(*Context, @alignCast(@alignOf(Context), context));
459459 declVisitor(c, decl) catch return false;
460460 return true;
......@@ -698,7 +698,7 @@ fn visitFnDecl(c: *Context, fn_decl: *const clang.FunctionDecl) Error!void {
698698 // add return statement if the function didn't have one
699699 blk: {
700700 const maybe_body = try block_scope.complete(c);
701 if (fn_ty.getNoReturnAttr() or isCVoid(return_qt) or maybe_body.isNoreturn(false)) {
701 if (fn_ty.getNoReturnAttr() or isAnyopaque(return_qt) or maybe_body.isNoreturn(false)) {
702702 proto_node.data.body = maybe_body;
703703 break :blk;
704704 }
......@@ -4618,7 +4618,7 @@ fn transType(c: *Context, scope: *Scope, ty: *const clang.Type, source_loc: clan
46184618 .Builtin => {
46194619 const builtin_ty = @ptrCast(*const clang.BuiltinType, ty);
46204620 return Tag.type.create(c.arena, switch (builtin_ty.getKind()) {
4621 .Void => "c_void",
4621 .Void => "anyopaque",
46224622 .Bool => "bool",
46234623 .Char_U, .UChar, .Char_S, .Char8 => "u8",
46244624 .SChar => "i8",
......@@ -4822,7 +4822,7 @@ fn qualTypeWasDemotedToOpaque(c: *Context, qt: clang.QualType) bool {
48224822 }
48234823}
48244824
4825fn isCVoid(qt: clang.QualType) bool {
4825fn isAnyopaque(qt: clang.QualType) bool {
48264826 const ty = qt.getTypePtr();
48274827 if (ty.getTypeClass() == .Builtin) {
48284828 const builtin_ty = @ptrCast(*const clang.BuiltinType, ty);
......@@ -4955,8 +4955,8 @@ fn finishTransFnProto(
49554955 break :blk Tag.noreturn_type.init();
49564956 } else {
49574957 const return_qt = fn_ty.getReturnType();
4958 if (isCVoid(return_qt)) {
4959 // convert primitive c_void to actual void (only for return type)
4958 if (isAnyopaque(return_qt)) {
4959 // convert primitive anyopaque to actual void (only for return type)
49604960 break :blk Tag.void_type.init();
49614961 } else {
49624962 break :blk transQualType(c, scope, return_qt, source_loc) catch |err| switch (err) {
......@@ -6096,7 +6096,7 @@ fn parseCSpecifierQualifierList(c: *Context, m: *MacroCtx, scope: *Scope, allow_
60966096 return try Tag.identifier.create(c.arena, mangled_name);
60976097 }
60986098 },
6099 .Keyword_void => return try Tag.type.create(c.arena, "c_void"),
6099 .Keyword_void => return try Tag.type.create(c.arena, "anyopaque"),
61006100 .Keyword_bool => return try Tag.type.create(c.arena, "bool"),
61016101 .Keyword_char,
61026102 .Keyword_int,
src/type.zig+13-13
......@@ -68,7 +68,7 @@ pub const Type = extern union {
6868 .error_set_merged,
6969 => return .ErrorSet,
7070
71 .c_void, .@"opaque" => return .Opaque,
71 .anyopaque, .@"opaque" => return .Opaque,
7272 .bool => return .Bool,
7373 .void => return .Void,
7474 .type => return .Type,
......@@ -764,7 +764,7 @@ pub const Type = extern union {
764764 .c_longlong,
765765 .c_ulonglong,
766766 .c_longdouble,
767 .c_void,
767 .anyopaque,
768768 .f16,
769769 .f32,
770770 .f64,
......@@ -965,7 +965,7 @@ pub const Type = extern union {
965965 .c_longlong,
966966 .c_ulonglong,
967967 .c_longdouble,
968 .c_void,
968 .anyopaque,
969969 .f16,
970970 .f32,
971971 .f64,
......@@ -1257,7 +1257,7 @@ pub const Type = extern union {
12571257 .c_longlong,
12581258 .c_ulonglong,
12591259 .c_longdouble,
1260 .c_void,
1260 .anyopaque,
12611261 .f16,
12621262 .f32,
12631263 .f64,
......@@ -1365,7 +1365,7 @@ pub const Type = extern union {
13651365 .f32,
13661366 .f64,
13671367 .f128,
1368 .c_void,
1368 .anyopaque,
13691369 .bool,
13701370 .void,
13711371 .anyerror,
......@@ -1476,7 +1476,7 @@ pub const Type = extern union {
14761476 .c_longlong => return Value.initTag(.c_longlong_type),
14771477 .c_ulonglong => return Value.initTag(.c_ulonglong_type),
14781478 .c_longdouble => return Value.initTag(.c_longdouble_type),
1479 .c_void => return Value.initTag(.c_void_type),
1479 .anyopaque => return Value.initTag(.anyopaque_type),
14801480 .f16 => return Value.initTag(.f16_type),
14811481 .f32 => return Value.initTag(.f32_type),
14821482 .f64 => return Value.initTag(.f64_type),
......@@ -1653,7 +1653,7 @@ pub const Type = extern union {
16531653 return payload.error_set.hasCodeGenBits() or payload.payload.hasCodeGenBits();
16541654 },
16551655
1656 .c_void,
1656 .anyopaque,
16571657 .void,
16581658 .type,
16591659 .comptime_int,
......@@ -1897,7 +1897,7 @@ pub const Type = extern union {
18971897
18981898 .empty_struct,
18991899 .void,
1900 .c_void,
1900 .anyopaque,
19011901 => return 0,
19021902
19031903 .empty_struct_literal,
......@@ -1942,7 +1942,7 @@ pub const Type = extern union {
19421942 .extern_options => unreachable, // missing call to resolveTypeFields
19431943 .type_info => unreachable, // missing call to resolveTypeFields
19441944
1945 .c_void,
1945 .anyopaque,
19461946 .type,
19471947 .comptime_int,
19481948 .comptime_float,
......@@ -2116,7 +2116,7 @@ pub const Type = extern union {
21162116 .fn_naked_noreturn_no_args => unreachable, // represents machine code; not a pointer
21172117 .fn_ccc_void_no_args => unreachable, // represents machine code; not a pointer
21182118 .function => unreachable, // represents machine code; not a pointer
2119 .c_void => unreachable,
2119 .anyopaque => unreachable,
21202120 .void => unreachable,
21212121 .type => unreachable,
21222122 .comptime_int => unreachable,
......@@ -3283,7 +3283,7 @@ pub const Type = extern union {
32833283 .const_slice_u8,
32843284 .const_slice,
32853285 .mut_slice,
3286 .c_void,
3286 .anyopaque,
32873287 .optional,
32883288 .optional_single_mut_pointer,
32893289 .optional_single_const_pointer,
......@@ -3860,7 +3860,7 @@ pub const Type = extern union {
38603860 f32,
38613861 f64,
38623862 f128,
3863 c_void,
3863 anyopaque,
38643864 bool,
38653865 void,
38663866 type,
......@@ -3975,7 +3975,7 @@ pub const Type = extern union {
39753975 .f32,
39763976 .f64,
39773977 .f128,
3978 .c_void,
3978 .anyopaque,
39793979 .bool,
39803980 .void,
39813981 .type,
src/value.zig+5-5
......@@ -48,7 +48,7 @@ pub const Value = extern union {
4848 f32_type,
4949 f64_type,
5050 f128_type,
51 c_void_type,
51 anyopaque_type,
5252 bool_type,
5353 void_type,
5454 type_type,
......@@ -204,7 +204,7 @@ pub const Value = extern union {
204204 .f32_type,
205205 .f64_type,
206206 .f128_type,
207 .c_void_type,
207 .anyopaque_type,
208208 .bool_type,
209209 .void_type,
210210 .type_type,
......@@ -395,7 +395,7 @@ pub const Value = extern union {
395395 .f32_type,
396396 .f64_type,
397397 .f128_type,
398 .c_void_type,
398 .anyopaque_type,
399399 .bool_type,
400400 .void_type,
401401 .type_type,
......@@ -625,7 +625,7 @@ pub const Value = extern union {
625625 .f32_type => return out_stream.writeAll("f32"),
626626 .f64_type => return out_stream.writeAll("f64"),
627627 .f128_type => return out_stream.writeAll("f128"),
628 .c_void_type => return out_stream.writeAll("c_void"),
628 .anyopaque_type => return out_stream.writeAll("anyopaque"),
629629 .bool_type => return out_stream.writeAll("bool"),
630630 .void_type => return out_stream.writeAll("void"),
631631 .type_type => return out_stream.writeAll("type"),
......@@ -804,7 +804,7 @@ pub const Value = extern union {
804804 .f32_type => Type.initTag(.f32),
805805 .f64_type => Type.initTag(.f64),
806806 .f128_type => Type.initTag(.f128),
807 .c_void_type => Type.initTag(.c_void),
807 .anyopaque_type => Type.initTag(.anyopaque),
808808 .bool_type => Type.initTag(.bool),
809809 .void_type => Type.initTag(.void),
810810 .type_type => Type.initTag(.type),
test/behavior/async_fn.zig+2-2
......@@ -1631,9 +1631,9 @@ test "nosuspend resume async function calls" {
16311631 try expectEqual(@as(i32, 42), (try await frame_d).b);
16321632}
16331633
1634test "avoid forcing frame alignment resolution implicit cast to *c_void" {
1634test "avoid forcing frame alignment resolution implicit cast to *anyopaque" {
16351635 const S = struct {
1636 var x: ?*c_void = null;
1636 var x: ?*anyopaque = null;
16371637
16381638 fn foo() bool {
16391639 suspend {
test/behavior/bugs/2578.zig+1-1
......@@ -5,7 +5,7 @@ const Foo = struct {
55var foo: Foo = undefined;
66const t = &foo;
77
8fn bar(pointer: ?*c_void) void {
8fn bar(pointer: ?*anyopaque) void {
99 _ = pointer;
1010}
1111
test/behavior/cast_llvm.zig+10-10
......@@ -31,14 +31,14 @@ fn expectFloatToInt(comptime F: type, f: F, comptime I: type, i: I) !void {
3131 try expect(@floatToInt(I, f) == i);
3232}
3333
34test "implicit cast from [*]T to ?*c_void" {
34test "implicit cast from [*]T to ?*anyopaque" {
3535 var a = [_]u8{ 3, 2, 1 };
3636 var runtime_zero: usize = 0;
3737 incrementVoidPtrArray(a[runtime_zero..].ptr, 3);
3838 try expect(std.mem.eql(u8, &a, &[_]u8{ 4, 3, 2 }));
3939}
4040
41fn incrementVoidPtrArray(array: ?*c_void, len: usize) void {
41fn incrementVoidPtrArray(array: ?*anyopaque, len: usize) void {
4242 var n: usize = 0;
4343 while (n < len) : (n += 1) {
4444 @ptrCast([*]u8, array.?)[n] += 1;
......@@ -50,18 +50,18 @@ test "compile time int to ptr of function" {
5050}
5151
5252pub const FUNCTION_CONSTANT = @intToPtr(PFN_void, maxInt(usize));
53pub const PFN_void = fn (*c_void) callconv(.C) void;
53pub const PFN_void = fn (*anyopaque) callconv(.C) void;
5454
5555fn foobar(func: PFN_void) !void {
5656 try std.testing.expect(@ptrToInt(func) == maxInt(usize));
5757}
5858
59test "implicit ptr to *c_void" {
59test "implicit ptr to *anyopaque" {
6060 var a: u32 = 1;
61 var ptr: *align(@alignOf(u32)) c_void = &a;
61 var ptr: *align(@alignOf(u32)) anyopaque = &a;
6262 var b: *u32 = @ptrCast(*u32, ptr);
6363 try expect(b.* == 1);
64 var ptr2: ?*align(@alignOf(u32)) c_void = &a;
64 var ptr2: ?*align(@alignOf(u32)) anyopaque = &a;
6565 var c: *u32 = @ptrCast(*u32, ptr2.?);
6666 try expect(c.* == 1);
6767}
......@@ -135,13 +135,13 @@ test "implicit cast from *[N]T to ?[*]T" {
135135 try expect(std.mem.eql(u16, x.?[0..4], y[0..4]));
136136}
137137
138test "implicit cast from *T to ?*c_void" {
138test "implicit cast from *T to ?*anyopaque" {
139139 var a: u8 = 1;
140140 incrementVoidPtrValue(&a);
141141 try std.testing.expect(a == 2);
142142}
143143
144fn incrementVoidPtrValue(value: ?*c_void) void {
144fn incrementVoidPtrValue(value: ?*anyopaque) void {
145145 @ptrCast(*u8, value.?).* += 1;
146146}
147147
......@@ -188,8 +188,8 @@ test "cast between [*c]T and ?[*:0]T on fn parameter" {
188188
189189var global_struct: struct { f0: usize } = undefined;
190190test "assignment to optional pointer result loc" {
191 var foo: struct { ptr: ?*c_void } = .{ .ptr = &global_struct };
192 try expect(foo.ptr.? == @ptrCast(*c_void, &global_struct));
191 var foo: struct { ptr: ?*anyopaque } = .{ .ptr = &global_struct };
192 try expect(foo.ptr.? == @ptrCast(*anyopaque, &global_struct));
193193}
194194
195195test "cast between *[N]void and []void" {
test/behavior/ptrcast_stage1.zig+2-2
......@@ -64,10 +64,10 @@ test "comptime ptrcast keeps larger alignment" {
6464 }
6565}
6666
67test "implicit optional pointer to optional c_void pointer" {
67test "implicit optional pointer to optional anyopaque pointer" {
6868 var buf: [4]u8 = "aoeu".*;
6969 var x: ?[*]u8 = &buf;
70 var y: ?*c_void = x;
70 var y: ?*anyopaque = x;
7171 var z = @ptrCast(*[4]u8, y);
7272 try expect(std.mem.eql(u8, z, "aoeu"));
7373}
test/behavior/translate_c_macros_stage1.zig+1-1
......@@ -22,5 +22,5 @@ test "reference to a struct type" {
2222}
2323
2424test "cast negative integer to pointer" {
25 try expectEqual(@intToPtr(?*c_void, @bitCast(usize, @as(isize, -1))), h.MAP_FAILED);
25 try expectEqual(@intToPtr(?*anyopaque, @bitCast(usize, @as(isize, -1))), h.MAP_FAILED);
2626}
test/behavior/type_info.zig+3-3
......@@ -227,13 +227,13 @@ fn testUnion() !void {
227227 try expect(notag_union_info.Union.fields[1].alignment == @alignOf(u32));
228228
229229 const TestExternUnion = extern union {
230 foo: *c_void,
230 foo: *anyopaque,
231231 };
232232
233233 const extern_union_info = @typeInfo(TestExternUnion);
234234 try expect(extern_union_info.Union.layout == .Extern);
235235 try expect(extern_union_info.Union.tag_type == null);
236 try expect(extern_union_info.Union.fields[0].field_type == *c_void);
236 try expect(extern_union_info.Union.fields[0].field_type == *anyopaque);
237237}
238238
239239test "type info: struct info" {
......@@ -407,7 +407,7 @@ test "data field is a compile-time value" {
407407}
408408
409409test "sentinel of opaque pointer type" {
410 const c_void_info = @typeInfo(*c_void);
410 const c_void_info = @typeInfo(*anyopaque);
411411 try expect(c_void_info.Pointer.sentinel == null);
412412}
413413
test/compare_output.zig+2-2
......@@ -179,7 +179,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
179179 cases.addC("expose function pointer to C land",
180180 \\const c = @cImport(@cInclude("stdlib.h"));
181181 \\
182 \\export fn compare_fn(a: ?*const c_void, b: ?*const c_void) c_int {
182 \\export fn compare_fn(a: ?*const anyopaque, b: ?*const anyopaque) c_int {
183183 \\ const a_int = @ptrCast(*const i32, @alignCast(@alignOf(i32), a));
184184 \\ const b_int = @ptrCast(*const i32, @alignCast(@alignOf(i32), b));
185185 \\ if (a_int.* < b_int.*) {
......@@ -194,7 +194,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
194194 \\pub export fn main() c_int {
195195 \\ var array = [_]u32{ 1, 7, 3, 2, 0, 9, 4, 8, 6, 5 };
196196 \\
197 \\ c.qsort(@ptrCast(?*c_void, &array), @intCast(c_ulong, array.len), @sizeOf(i32), compare_fn);
197 \\ c.qsort(@ptrCast(?*anyopaque, &array), @intCast(c_ulong, array.len), @sizeOf(i32), compare_fn);
198198 \\
199199 \\ for (array) |item, i| {
200200 \\ if (item != i) {
test/compile_errors.zig+18-18
......@@ -3058,10 +3058,10 @@ pub fn addCases(ctx: *TestContext) !void {
30583058 "tmp.zig:1:15: error: parameter of type 'anytype' not allowed in function with calling convention 'C'",
30593059 });
30603060
3061 ctx.objErrStage1("C pointer to c_void",
3061 ctx.objErrStage1("C pointer to anyopaque",
30623062 \\export fn a() void {
3063 \\ var x: *c_void = undefined;
3064 \\ var y: [*c]c_void = x;
3063 \\ var x: *anyopaque = undefined;
3064 \\ var y: [*c]anyopaque = x;
30653065 \\ _ = y;
30663066 \\}
30673067 , &[_][]const u8{
......@@ -3305,7 +3305,7 @@ pub fn addCases(ctx: *TestContext) !void {
33053305
33063306 ctx.objErrStage1("compile log a pointer to an opaque value",
33073307 \\export fn entry() void {
3308 \\ @compileLog(@ptrCast(*const c_void, &entry));
3308 \\ @compileLog(@ptrCast(*const anyopaque, &entry));
33093309 \\}
33103310 , &[_][]const u8{
33113311 "tmp.zig:2:5: error: found compile log statement",
......@@ -3465,16 +3465,16 @@ pub fn addCases(ctx: *TestContext) !void {
34653465 "tmp.zig:2:11: error: use of undeclared identifier 'SymbolThatDoesNotExist'",
34663466 });
34673467
3468 ctx.objErrStage1("don't implicit cast double pointer to *c_void",
3468 ctx.objErrStage1("don't implicit cast double pointer to *anyopaque",
34693469 \\export fn entry() void {
34703470 \\ var a: u32 = 1;
3471 \\ var ptr: *align(@alignOf(u32)) c_void = &a;
3471 \\ var ptr: *align(@alignOf(u32)) anyopaque = &a;
34723472 \\ var b: *u32 = @ptrCast(*u32, ptr);
3473 \\ var ptr2: *c_void = &b;
3473 \\ var ptr2: *anyopaque = &b;
34743474 \\ _ = ptr2;
34753475 \\}
34763476 , &[_][]const u8{
3477 "tmp.zig:5:26: error: expected type '*c_void', found '**u32'",
3477 "tmp.zig:5:29: error: expected type '*anyopaque', found '**u32'",
34783478 });
34793479
34803480 ctx.objErrStage1("runtime index into comptime type slice",
......@@ -4045,9 +4045,9 @@ pub fn addCases(ctx: *TestContext) !void {
40454045 "tmp.zig:8:9: error: integer value '256' cannot be stored in type 'u8'",
40464046 });
40474047
4048 ctx.objErrStage1("use c_void as return type of fn ptr",
4048 ctx.objErrStage1("use anyopaque as return type of fn ptr",
40494049 \\export fn entry() void {
4050 \\ const a: fn () c_void = undefined;
4050 \\ const a: fn () anyopaque = undefined;
40514051 \\ _ = a;
40524052 \\}
40534053 , &[_][]const u8{
......@@ -7469,10 +7469,10 @@ pub fn addCases(ctx: *TestContext) !void {
74697469 \\extern fn bar(d: *Derp) void;
74707470 \\export fn foo() void {
74717471 \\ var x = @as(u8, 1);
7472 \\ bar(@ptrCast(*c_void, &x));
7472 \\ bar(@ptrCast(*anyopaque, &x));
74737473 \\}
74747474 , &[_][]const u8{
7475 "tmp.zig:5:9: error: expected type '*Derp', found '*c_void'",
7475 "tmp.zig:5:9: error: expected type '*Derp', found '*anyopaque'",
74767476 });
74777477
74787478 ctx.objErrStage1("non-const variables of things that require const variables",
......@@ -8765,10 +8765,10 @@ pub fn addCases(ctx: *TestContext) !void {
87658765
87668766 ctx.objErrStage1("integer underflow error",
87678767 \\export fn entry() void {
8768 \\ _ = @intToPtr(*c_void, ~@as(usize, @import("std").math.maxInt(usize)) - 1);
8768 \\ _ = @intToPtr(*anyopaque, ~@as(usize, @import("std").math.maxInt(usize)) - 1);
87698769 \\}
87708770 , &[_][]const u8{
8771 ":2:75: error: operation caused overflow",
8771 ":2:78: error: operation caused overflow",
87728772 });
87738773
87748774 {
......@@ -8864,14 +8864,14 @@ pub fn addCases(ctx: *TestContext) !void {
88648864 "tmp.zig:8:12: error: negation of type 'u32'",
88658865 });
88668866
8867 ctx.objErrStage1("Issue #5618: coercion of ?*c_void to *c_void must fail.",
8867 ctx.objErrStage1("Issue #5618: coercion of ?*anyopaque to *anyopaque must fail.",
88688868 \\export fn foo() void {
8869 \\ var u: ?*c_void = null;
8870 \\ var v: *c_void = undefined;
8869 \\ var u: ?*anyopaque = null;
8870 \\ var v: *anyopaque = undefined;
88718871 \\ v = u;
88728872 \\}
88738873 , &[_][]const u8{
8874 "tmp.zig:4:9: error: expected type '*c_void', found '?*c_void'",
8874 "tmp.zig:4:9: error: expected type '*anyopaque', found '?*anyopaque'",
88758875 });
88768876
88778877 ctx.objErrStage1("Issue #6823: don't allow .* to be followed by **",
test/stage1/c_abi/main.zig+3-3
......@@ -97,13 +97,13 @@ export fn zig_f64(x: f64) void {
9797 expect(x == 56.78) catch @panic("test failure");
9898}
9999
100extern fn c_ptr(*c_void) void;
100extern fn c_ptr(*anyopaque) void;
101101
102102test "C ABI pointer" {
103 c_ptr(@intToPtr(*c_void, 0xdeadbeef));
103 c_ptr(@intToPtr(*anyopaque, 0xdeadbeef));
104104}
105105
106export fn zig_ptr(x: *c_void) void {
106export fn zig_ptr(x: *anyopaque) void {
107107 expect(@ptrToInt(x) == 0xdeadbeef) catch @panic("test failure");
108108}
109109
test/translate_c.zig+25-25
......@@ -99,7 +99,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
9999 \\ .b = @import("std").mem.zeroes(struct_Bar),
100100 \\};
101101 ,
102 \\pub const PTR = ?*c_void;
102 \\pub const PTR = ?*anyopaque;
103103 });
104104
105105 cases.add("scoped record",
......@@ -199,8 +199,8 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
199199 \\#define SYS_BASE_CACHED 0
200200 \\#define MEM_PHYSICAL_TO_K0(x) (void*)((uint32_t)(x) + SYS_BASE_CACHED)
201201 , &[_][]const u8{
202 \\pub inline fn MEM_PHYSICAL_TO_K0(x: anytype) ?*c_void {
203 \\ return @import("std").zig.c_translation.cast(?*c_void, @import("std").zig.c_translation.cast(u32, x) + SYS_BASE_CACHED);
202 \\pub inline fn MEM_PHYSICAL_TO_K0(x: anytype) ?*anyopaque {
203 \\ return @import("std").zig.c_translation.cast(?*anyopaque, @import("std").zig.c_translation.cast(u32, x) + SYS_BASE_CACHED);
204204 \\}
205205 });
206206
......@@ -511,9 +511,9 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
511511 \\void ((f1)) (void *L);
512512 \\void (((f2))) (void *L);
513513 , &[_][]const u8{
514 \\pub extern fn f0(L: ?*c_void) void;
515 \\pub extern fn f1(L: ?*c_void) void;
516 \\pub extern fn f2(L: ?*c_void) void;
514 \\pub extern fn f0(L: ?*anyopaque) void;
515 \\pub extern fn f1(L: ?*anyopaque) void;
516 \\pub extern fn f2(L: ?*anyopaque) void;
517517 });
518518
519519 cases.add("array initializer w/ typedef",
......@@ -812,7 +812,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
812812 \\typedef void Foo;
813813 \\Foo fun(Foo *a);
814814 , &[_][]const u8{
815 \\pub const Foo = c_void;
815 \\pub const Foo = anyopaque;
816816 ,
817817 \\pub extern fn fun(a: ?*Foo) Foo;
818818 });
......@@ -837,7 +837,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
837837 , &[_][]const u8{
838838 \\pub extern fn foo() void;
839839 \\pub export fn bar() void {
840 \\ var func_ptr: ?*c_void = @ptrCast(?*c_void, foo);
840 \\ var func_ptr: ?*anyopaque = @ptrCast(?*anyopaque, foo);
841841 \\ var typed_func_ptr: ?fn () callconv(.C) void = @intToPtr(?fn () callconv(.C) void, @intCast(c_ulong, @ptrToInt(func_ptr)));
842842 \\ _ = typed_func_ptr;
843843 \\}
......@@ -1264,9 +1264,9 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
12641264 \\ return x;
12651265 \\}
12661266 , &[_][]const u8{
1267 \\pub export fn foo() ?*c_void {
1267 \\pub export fn foo() ?*anyopaque {
12681268 \\ var x: [*c]c_ushort = undefined;
1269 \\ return @ptrCast(?*c_void, x);
1269 \\ return @ptrCast(?*anyopaque, x);
12701270 \\}
12711271 });
12721272
......@@ -1410,7 +1410,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
14101410 \\}
14111411 , &[_][]const u8{
14121412 \\pub export fn test_ptr_cast() void {
1413 \\ var p: ?*c_void = undefined;
1413 \\ var p: ?*anyopaque = undefined;
14141414 \\ {
14151415 \\ var to_char: [*c]u8 = @ptrCast([*c]u8, @alignCast(@import("std").meta.alignment(u8), p));
14161416 \\ _ = to_char;
......@@ -1448,7 +1448,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
14481448 \\pub export fn while_none_bool() c_int {
14491449 \\ var a: c_int = undefined;
14501450 \\ var b: f32 = undefined;
1451 \\ var c: ?*c_void = undefined;
1451 \\ var c: ?*anyopaque = undefined;
14521452 \\ while (a != 0) return 0;
14531453 \\ while (b != 0) return 1;
14541454 \\ while (c != null) return 2;
......@@ -1470,7 +1470,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
14701470 \\pub export fn for_none_bool() c_int {
14711471 \\ var a: c_int = undefined;
14721472 \\ var b: f32 = undefined;
1473 \\ var c: ?*c_void = undefined;
1473 \\ var c: ?*anyopaque = undefined;
14741474 \\ while (a != 0) return 0;
14751475 \\ while (b != 0) return 1;
14761476 \\ while (c != null) return 2;
......@@ -1551,7 +1551,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
15511551 \\pub export fn foo() c_int {
15521552 \\ var a: c_int = undefined;
15531553 \\ var b: f32 = undefined;
1554 \\ var c: ?*c_void = undefined;
1554 \\ var c: ?*anyopaque = undefined;
15551555 \\ return @boolToInt(!(a == @as(c_int, 0)));
15561556 \\ return @boolToInt(!(a != 0));
15571557 \\ return @boolToInt(!(b != 0));
......@@ -2200,7 +2200,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
22002200 cases.add("restrict -> noalias",
22012201 \\void foo(void *restrict bar, void *restrict);
22022202 , &[_][]const u8{
2203 \\pub extern fn foo(noalias bar: ?*c_void, noalias ?*c_void) void;
2203 \\pub extern fn foo(noalias bar: ?*anyopaque, noalias ?*anyopaque) void;
22042204 });
22052205
22062206 cases.add("assign",
......@@ -2362,7 +2362,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
23622362 ++ " " ++ default_enum_type ++
23632363 \\;
23642364 \\pub const SomeTypedef = c_int;
2365 \\pub export fn and_or_non_bool(arg_a: c_int, arg_b: f32, arg_c: ?*c_void) c_int {
2365 \\pub export fn and_or_non_bool(arg_a: c_int, arg_b: f32, arg_c: ?*anyopaque) c_int {
23662366 \\ var a = arg_a;
23672367 \\ var b = arg_b;
23682368 \\ var c = arg_c;
......@@ -2686,7 +2686,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
26862686 \\pub const enum_SomeEnum =
26872687 ++ " " ++ default_enum_type ++
26882688 \\;
2689 \\pub export fn if_none_bool(arg_a: c_int, arg_b: f32, arg_c: ?*c_void, arg_d: enum_SomeEnum) c_int {
2689 \\pub export fn if_none_bool(arg_a: c_int, arg_b: f32, arg_c: ?*anyopaque, arg_d: enum_SomeEnum) c_int {
26902690 \\ var a = arg_a;
26912691 \\ var b = arg_b;
26922692 \\ var c = arg_c;
......@@ -3089,7 +3089,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
30893089 \\pub extern fn fn_f64(x: f64) void;
30903090 \\pub extern fn fn_char(x: u8) void;
30913091 \\pub extern fn fn_bool(x: bool) void;
3092 \\pub extern fn fn_ptr(x: ?*c_void) void;
3092 \\pub extern fn fn_ptr(x: ?*anyopaque) void;
30933093 \\pub export fn call() void {
30943094 \\ fn_int(@floatToInt(c_int, 3.0));
30953095 \\ fn_int(@floatToInt(c_int, 3.0));
......@@ -3105,7 +3105,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
31053105 \\ fn_bool(@as(c_int, 0) != 0);
31063106 \\ fn_bool(@ptrToInt(fn_int) != 0);
31073107 \\ fn_int(@intCast(c_int, @ptrToInt(fn_int)));
3108 \\ fn_ptr(@intToPtr(?*c_void, @as(c_int, 42)));
3108 \\ fn_ptr(@intToPtr(?*anyopaque, @as(c_int, 42)));
31093109 \\}
31103110 });
31113111
......@@ -3161,12 +3161,12 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
31613161 \\#define BAZ (uint32_t)(2)
31623162 \\#define a 2
31633163 , &[_][]const u8{
3164 \\pub inline fn FOO(bar: anytype) @TypeOf(baz(@import("std").zig.c_translation.cast(?*c_void, baz))) {
3164 \\pub inline fn FOO(bar: anytype) @TypeOf(baz(@import("std").zig.c_translation.cast(?*anyopaque, baz))) {
31653165 \\ _ = bar;
3166 \\ return baz(@import("std").zig.c_translation.cast(?*c_void, baz));
3166 \\ return baz(@import("std").zig.c_translation.cast(?*anyopaque, baz));
31673167 \\}
31683168 ,
3169 \\pub const BAR = @import("std").zig.c_translation.cast(?*c_void, a);
3169 \\pub const BAR = @import("std").zig.c_translation.cast(?*anyopaque, a);
31703170 ,
31713171 \\pub const BAZ = @import("std").zig.c_translation.cast(u32, @as(c_int, 2));
31723172 });
......@@ -3404,7 +3404,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
34043404 \\#define NULL ((void*)0)
34053405 \\#define FOO ((int)0x8000)
34063406 , &[_][]const u8{
3407 \\pub const NULL = @import("std").zig.c_translation.cast(?*c_void, @as(c_int, 0));
3407 \\pub const NULL = @import("std").zig.c_translation.cast(?*anyopaque, @as(c_int, 0));
34083408 ,
34093409 \\pub const FOO = @import("std").zig.c_translation.cast(c_int, @import("std").zig.c_translation.promoteIntLiteral(c_int, 0x8000, .hexadecimal));
34103410 });
......@@ -3623,8 +3623,8 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
36233623 \\typedef long long LONG_PTR;
36243624 \\#define INVALID_HANDLE_VALUE ((void *)(LONG_PTR)-1)
36253625 , &[_][]const u8{
3626 \\pub const MAP_FAILED = @import("std").zig.c_translation.cast(?*c_void, -@as(c_int, 1));
3627 \\pub const INVALID_HANDLE_VALUE = @import("std").zig.c_translation.cast(?*c_void, @import("std").zig.c_translation.cast(LONG_PTR, -@as(c_int, 1)));
3626 \\pub const MAP_FAILED = @import("std").zig.c_translation.cast(?*anyopaque, -@as(c_int, 1));
3627 \\pub const INVALID_HANDLE_VALUE = @import("std").zig.c_translation.cast(?*anyopaque, @import("std").zig.c_translation.cast(LONG_PTR, -@as(c_int, 1)));
36283628 });
36293629
36303630 cases.add("discard unused local variables and function parameters",