diff options
| author | sin-ack <sin-ack@users.noreply.github.com> | 2023-06-03 23:21:43 +0000 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2023-06-04 05:39:32 +0200 |
| commit | 910bff9e94ee9c304b61d342f23a4962e51a05af (patch) | |
| tree | bda1339d6fe3df986f2c8430934a717f12dc1b53 | |
| parent | 874202045d34d6ab89a2ab06e8643d475b7a56a0 (diff) | |
| download | serenity-910bff9e94ee9c304b61d342f23a4962e51a05af.zip | |
Ports: Update the Zig port's Serenity type definitions
After b98f537, the Zig port's types for Serenity no longer matched what
Serenity actually returned from LibC; this caused weird errors due to
stat() not returning valid values anymore.
| -rw-r--r-- | Ports/zig/patches/0012-Implement-SerenityOS-support-in-std.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Ports/zig/patches/0012-Implement-SerenityOS-support-in-std.patch b/Ports/zig/patches/0012-Implement-SerenityOS-support-in-std.patch index dad707d1b6..626b852480 100644 --- a/Ports/zig/patches/0012-Implement-SerenityOS-support-in-std.patch +++ b/Ports/zig/patches/0012-Implement-SerenityOS-support-in-std.patch @@ -43,7 +43,7 @@ index 5f03f1c61902a191de87b49f0dcbdfec4a872d34..92c4bfcccb6bf45fcd8df748d346c8ec diff --git a/zig/lib/std/c/serenity.zig b/zig/lib/std/c/serenity.zig new file mode 100644 -index 0000000000000000000000000000000000000000..057813c1b13fcedc87271003220c42da7ef36e0e +index 0000000000000000000000000000000000000000..747023f1b1b5613b24751312058a5460c79bd3ba --- /dev/null +++ b/zig/lib/std/c/serenity.zig @@ -0,0 +1,396 @@ @@ -51,10 +51,10 @@ index 0000000000000000000000000000000000000000..057813c1b13fcedc87271003220c42da +pub const SerenityConstants = @import("serenity/constants.zig"); + +pub const fd_t = c_int; -+pub const dev_t = u32; ++pub const dev_t = u64; +pub const ino_t = u64; +pub const off_t = i64; -+pub const nlink_t = u32; ++pub const nlink_t = u64; + +pub const E = enum(i32) { + SUCCESS = SerenityConstants.ESUCCESS, @@ -144,7 +144,7 @@ index 0000000000000000000000000000000000000000..057813c1b13fcedc87271003220c42da +pub const PATH_MAX = SerenityConstants.PATH_MAX; + +pub const time_t = i64; -+pub const timespec = struct { ++pub const timespec = extern struct { + tv_sec: time_t, + tv_nsec: c_long, +}; @@ -222,14 +222,14 @@ index 0000000000000000000000000000000000000000..057813c1b13fcedc87271003220c42da + +pub const IOV_MAX = SerenityConstants.IOV_MAX; + -+pub const pthread_mutex_t = struct { ++pub const pthread_mutex_t = extern struct { + lock: u32 = 0, + owner: ?std.c.pthread_t = null, + level: c_int = 0, + type: c_int = 0, // __PTHREAD_MUTEX_NORMAL +}; + -+pub const pthread_cond_t = struct { ++pub const pthread_cond_t = extern struct { + mutex: ?*pthread_mutex_t = null, + value: u32 = 0, + clockid: c_int = CLOCK.MONOTONIC_COARSE, // clockid_t @@ -238,10 +238,10 @@ index 0000000000000000000000000000000000000000..057813c1b13fcedc87271003220c42da +pub const uid_t = u32; +pub const gid_t = u32; + -+pub const blksize_t = u32; -+pub const blkcnt_t = u32; ++pub const blksize_t = u64; ++pub const blkcnt_t = u64; + -+pub const Stat = struct { ++pub const Stat = extern struct { + dev: dev_t, + ino: ino_t, + mode: mode_t, |