authorgravatar for 77312308+billzez@users.noreply.github.combillzez <77312308+billzez@users.noreply.github.com> 2022-09-16 21:20:24-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-09-16 20:20:24-05:00
logdfcadd22bb71f1137aae532b78c1785d1c35e894
treea5599dc894f77c92d331d7e11e8ce7ff6fe680bd
parentb2aedb07096fa4ed8766d3aa87e70704cee68265
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

fix android definition of pthread_rwlock_t (#12830)

1 files changed, 2 insertions(+), 14 deletions(-)

lib/std/c/linux.zig+2-14
...@@ -312,22 +312,10 @@ pub const pthread_cond_t = extern struct {...@@ -312,22 +312,10 @@ pub const pthread_cond_t = extern struct {
312pub const pthread_rwlock_t = switch (native_abi) {312pub const pthread_rwlock_t = switch (native_abi) {
313 .android => switch (@sizeOf(usize)) {313 .android => switch (@sizeOf(usize)) {
314 4 => extern struct {314 4 => extern struct {
315 lock: std.c.pthread_mutex_t = std.c.PTHREAD_MUTEX_INITIALIZER,315 size: [40]u8 align(@alignOf(usize)) = [_]u8{0} ** 40,
316 cond: std.c.pthread_cond_t = std.c.PTHREAD_COND_INITIALIZER,
317 numLocks: c_int = 0,
318 writerThreadId: c_int = 0,
319 pendingReaders: c_int = 0,
320 pendingWriters: c_int = 0,
321 attr: i32 = 0,
322 __reserved: [12]u8 = [_]u8{0} ** 2,
323 },316 },
324 8 => extern struct {317 8 => extern struct {
325 numLocks: c_int = 0,318 size: [56]u8 align(@alignOf(usize)) = [_]u8{0} ** 56,
326 writerThreadId: c_int = 0,
327 pendingReaders: c_int = 0,
328 pendingWriters: c_int = 0,
329 attr: i32 = 0,
330 __reserved: [36]u8 = [_]u8{0} ** 36,
331 },319 },
332 else => @compileError("impossible pointer size"),320 else => @compileError("impossible pointer size"),
333 },321 },