chore: sync current workspace changes
Desktop CI Build / Build macOS ARM64 DMG (push) Has been cancelled
Desktop CI Build / Build Windows x64 (push) Has been cancelled

This commit is contained in:
boos
2026-07-14 03:21:10 +08:00
parent 1512fa23ce
commit 557914fea8
745 changed files with 124917 additions and 11222 deletions
+23
View File
@@ -0,0 +1,23 @@
diff --git a/crates/backend/libpq/ldap_openldap_ffi/Cargo.toml b/crates/backend/libpq/ldap_openldap_ffi/Cargo.toml
--- a/crates/backend/libpq/ldap_openldap_ffi/Cargo.toml
+++ b/crates/backend/libpq/ldap_openldap_ffi/Cargo.toml
@@ -15,6 +15,6 @@ path = "src/lib.rs"
# exactly as a non-`--with-ldap` C build does. When ON, the system OpenLDAP
# `libldap` is bound — the SAME library PostgreSQL's `--with-ldap` links.
-default = ["with-ldap"]
+default = []
with-ldap = []
[dependencies]
diff --git a/crates/backend/libpq/pam_libpam_ffi/Cargo.toml b/crates/backend/libpq/pam_libpam_ffi/Cargo.toml
--- a/crates/backend/libpq/pam_libpam_ffi/Cargo.toml
+++ b/crates/backend/libpq/pam_libpam_ffi/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/lib.rs"
# rejected at hba parse time exactly as a non-PAM C build does. When ON, the
# system PAM library (`libpam`) is bound — the SAME library PostgreSQL's
# `--with-pam` links — and the CheckPAMAuth conversation runs against it.
-default = ["with-pam"]
+default = []
with-pam = []
[dependencies]
+37
View File
@@ -0,0 +1,37 @@
diff --git a/crates/backend/port/sysv/sema/src/lib.rs b/crates/backend/port/sysv/sema/src/lib.rs
index 7d70bf1..38438b4 100644
--- a/crates/backend/port/sysv/sema/src/lib.rs
+++ b/crates/backend/port/sysv/sema/src/lib.rs
@@ -130,13 +130,31 @@ const PG_SEMA_MAGIC: libc::c_int = 537;
type IpcSemaphoreKey = libc::key_t;
type IpcSemaphoreId = libc::c_int;
+#[cfg(target_env = "musl")]
+#[repr(C)]
+struct PlatformSemidDs {
+ sem_perm: libc::ipc_perm,
+ sem_otime: libc::time_t,
+ unused1: libc::c_long,
+ sem_ctime: libc::time_t,
+ unused2: libc::c_long,
+ sem_nsems: libc::c_ushort,
+ sem_nsems_pad:
+ [u8; core::mem::size_of::<libc::c_long>() - core::mem::size_of::<libc::c_ushort>()],
+ unused3: libc::c_long,
+ unused4: libc::c_long,
+}
+
+#[cfg(not(target_env = "musl"))]
+type PlatformSemidDs = libc::semid_ds;
+
/// The `union semun` argument to `semctl(2)` (C builds it locally; on
/// platforms without `HAVE_UNION_SEMUN` the union is declared in-file).
#[repr(C)]
#[derive(Clone, Copy)]
union Semun {
val: libc::c_int,
- buf: *mut libc::semid_ds,
+ buf: *mut PlatformSemidDs,
array: *mut libc::c_ushort,
}