Merge #334: fix ffi for platform-specific uint_fast types for macOS and Android

7a77539 Bump simplicity-sys version to 0.6.1 (Kyryl R)
4126e2e fix ffi for platform-specific uint_fast types for macOS and Android (Kyryl R)

Pull request description:

  Fixes: 
  
  - macOS (x86_64 and arm64): uint_fast16_t is u16, not usize
  - Android (Bionic libc): uint_fast16_t is u32, not u16
  - jet FFI calls failing on Intel Mac and Android
  
  Because of the previous setup I have encountered failures the one below:
  Blockstream/gdk#221


ACKs for top commit:
  apoelstra:
    ACK 7a77539; successfully ran local tests


Tree-SHA512: e37f218916f086af480baf341756c94f27fc59700e38fe99595743bbae1f5d7dd2fc4b8f9734a189f8249ad857666dcd608abc981a1df9d47f5924e94a3bf01a

Author: apoelstra

Cargo-recent.lock

@@ -503,7 +503,7 @@ dependencies = [
  "miniscript",
  "santiago",
  "serde",
- "simplicity-sys 0.6.0",
+ "simplicity-sys 0.6.1",
 ]
 
 [[package]]
@@ -518,7 +518,7 @@ dependencies = [
 
 [[package]]
 name = "simplicity-sys"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
  "bitcoin_hashes",
  "cc",

Cargo.toml

@@ -30,14 +30,14 @@ ghost-cell = { version = "0.2.6", default-features = false }
 hashes = { package = "bitcoin_hashes", version = "0.14" }
 hex = { package = "hex-conservative", version = "0.2.1" }
 santiago = "1.3"
-simplicity-sys = { version = "0.6.0", path = "./simplicity-sys" }
+simplicity-sys = { version = "0.6.1", path = "./simplicity-sys" }
 serde = { version = "1.0.103", features = ["derive"], optional = true }
 
 [target.wasm32-unknown-unknown.dependencies]
 getrandom = { version = "0.2", features = ["js"] }
 
 [dev-dependencies]
-simplicity-sys = { version = "0.6.0", path = "./simplicity-sys", features = [
+simplicity-sys = { version = "0.6.1", path = "./simplicity-sys", features = [
     "test-utils",
 ] }
 

simplicity-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "simplicity-sys"
-version = "0.6.0"
+version = "0.6.1"
 license = "CC0-1.0"
 homepage = "https://github.com/BlockstreamResearch/rust-simplicity/"
 repository = "https://github.com/BlockstreamResearch/rust-simplicity/"

simplicity-sys/src/ffi.rs

@@ -19,18 +19,36 @@ pub type c_int = i32;
 pub type c_uint = u32;
 pub type c_size_t = usize;
 pub type c_uint_fast8_t = u8;
-#[cfg(all(
-    any(target_arch = "wasm32", target_arch = "aarch64"),
-    not(target_os = "windows")
-))]
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 pub type c_uint_fast16_t = u16;
-#[cfg(target_os = "windows")]
+#[cfg(any(target_os = "windows", target_os = "android"))]
 pub type c_uint_fast16_t = u32;
-#[cfg(not(any(target_arch = "wasm32", target_arch = "aarch64", target_os = "windows")))]
+#[cfg(target_arch = "wasm32")]
+pub type c_uint_fast16_t = u16;
+#[cfg(not(any(
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "windows",
+    target_os = "android",
+    target_arch = "wasm32"
+)))]
 pub type c_uint_fast16_t = usize;
-#[cfg(any(target_arch = "wasm32", target_arch = "aarch64", target_os = "windows"))]
+
+#[cfg(any(
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "windows",
+    target_os = "android",
+    target_arch = "wasm32"
+))]
 pub type c_uint_fast32_t = u32;
-#[cfg(not(any(target_arch = "wasm32", target_arch = "aarch64", target_os = "windows")))]
+#[cfg(not(any(
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "windows",
+    target_os = "android",
+    target_arch = "wasm32"
+)))]
 pub type c_uint_fast32_t = usize;
 #[cfg(target_arch = "wasm32")]
 pub type c_uint_fast64_t = u64;