zig

commit f4bf061d8a8023ec2188f3ffdc861317da56fd44 (tree)
parent 508a8739e25e5f4ddf75df336b7315949aa3201b
Author: mlugg <mlugg@mlugg.co.uk>
Date:   Thu,  7 Mar 2024 19:10:24 +0000

std.c: remove unnecessary use of `usingnamespace`

Thanks to Zig's lazy analysis, it's fine for these symbols to be
declared on platform they won't exist on. This is already done in
several places in this file; e.g. `pthread` functions are declared
unconditionally.

Eliminates one more usage of `usingnamespace` from the standard library.
4 remain.

Diffstat:
M
lib/std/c.zig
 | 
45
++++++++++++++++++++-------------------------

1 file changed, 20 insertions(+), 25 deletions(-)
diff --git a/lib/std/c.zig b/lib/std/c.zig
@@ -1494,38 +1494,33 @@ pub const speed_t = switch (native_os) {
 pub const whence_t = if (native_os == .wasi) std.os.wasi.whence_t else c_int;
 
 // Unix-like systems
-pub usingnamespace switch (native_os) {
-    .netbsd, .windows => struct {},
-    else => struct {
-        pub const DIR = opaque {};
-        pub extern "c" fn opendir(pathname: [*:0]const u8) ?*DIR;
-        pub extern "c" fn fdopendir(fd: c_int) ?*DIR;
-        pub extern "c" fn rewinddir(dp: *DIR) void;
-        pub extern "c" fn closedir(dp: *DIR) c_int;
-        pub extern "c" fn telldir(dp: *DIR) c_long;
-        pub extern "c" fn seekdir(dp: *DIR, loc: c_long) void;
+pub const DIR = opaque {};
+pub extern "c" fn opendir(pathname: [*:0]const u8) ?*DIR;
+pub extern "c" fn fdopendir(fd: c_int) ?*DIR;
+pub extern "c" fn rewinddir(dp: *DIR) void;
+pub extern "c" fn closedir(dp: *DIR) c_int;
+pub extern "c" fn telldir(dp: *DIR) c_long;
+pub extern "c" fn seekdir(dp: *DIR, loc: c_long) void;
 
-        pub extern "c" fn clock_gettime(clk_id: c_int, tp: *c.timespec) c_int;
-        pub extern "c" fn clock_getres(clk_id: c_int, tp: *c.timespec) c_int;
-        pub extern "c" fn gettimeofday(noalias tv: ?*c.timeval, noalias tz: ?*c.timezone) c_int;
-        pub extern "c" fn nanosleep(rqtp: *const c.timespec, rmtp: ?*c.timespec) c_int;
+pub extern "c" fn clock_gettime(clk_id: c_int, tp: *c.timespec) c_int;
+pub extern "c" fn clock_getres(clk_id: c_int, tp: *c.timespec) c_int;
+pub extern "c" fn gettimeofday(noalias tv: ?*c.timeval, noalias tz: ?*c.timezone) c_int;
+pub extern "c" fn nanosleep(rqtp: *const c.timespec, rmtp: ?*c.timespec) c_int;
 
-        pub extern "c" fn getrusage(who: c_int, usage: *c.rusage) c_int;
+pub extern "c" fn getrusage(who: c_int, usage: *c.rusage) c_int;
 
-        pub extern "c" fn sched_yield() c_int;
+pub extern "c" fn sched_yield() c_int;
 
-        pub extern "c" fn sigaction(sig: c_int, noalias act: ?*const c.Sigaction, noalias oact: ?*c.Sigaction) c_int;
-        pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const c.sigset_t, noalias oset: ?*c.sigset_t) c_int;
-        pub extern "c" fn sigfillset(set: ?*c.sigset_t) void;
-        pub extern "c" fn sigwait(set: ?*c.sigset_t, sig: ?*c_int) c_int;
+pub extern "c" fn sigaction(sig: c_int, noalias act: ?*const c.Sigaction, noalias oact: ?*c.Sigaction) c_int;
+pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const c.sigset_t, noalias oset: ?*c.sigset_t) c_int;
+pub extern "c" fn sigfillset(set: ?*c.sigset_t) void;
+pub extern "c" fn sigwait(set: ?*c.sigset_t, sig: ?*c_int) c_int;
 
-        pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
+pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
 
-        pub extern "c" fn alarm(seconds: c_uint) c_uint;
+pub extern "c" fn alarm(seconds: c_uint) c_uint;
 
-        pub extern "c" fn msync(addr: *align(page_size) const anyopaque, len: usize, flags: c_int) c_int;
-    },
-};
+pub extern "c" fn msync(addr: *align(page_size) const anyopaque, len: usize, flags: c_int) c_int;
 
 pub const fstat = switch (native_os) {
     .macos => switch (native_arch) {