Merge pull request #296 from PyO3/fix-npy-aligned-struct

Since npy_char is c_char which can be u8 or i8, we cannot unconditionally use negation.
PyO3 · Mar 17, 2022 · bdf9d53 · bdf9d53
2 parents a556d79 + 996d4bc
commit bdf9d53
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 - Unreleased
+  - Fix build on platforms where `c_char` is `u8` like Linux/AArch64. ([#296](https://github.com/PyO3/rust-numpy/pull/296))
 
 - v0.16.1
   - Fix build when PyO3's `multiple-pymethods` feature is used. ([#288](https://github.com/PyO3/rust-numpy/pull/288))

diff --git a/src/npyffi/flags.rs b/src/npyffi/flags.rs
@@ -71,7 +71,8 @@ pub const NPY_NEEDS_INIT: npy_char = 0x08;
 pub const NPY_NEEDS_PYAPI: npy_char = 0x10;
 pub const NPY_USE_GETITEM: npy_char = 0x20;
 pub const NPY_USE_SETITEM: npy_char = 0x40;
-pub const NPY_ALIGNED_STRUCT: npy_char = -128; // 0x80
+#[allow(overflowing_literals)]
+pub const NPY_ALIGNED_STRUCT: npy_char = 0x80;
 pub const NPY_FROM_FIELDS: npy_char =
     NPY_NEEDS_INIT | NPY_LIST_PICKLE | NPY_ITEM_REFCOUNT | NPY_NEEDS_PYAPI;
 pub const NPY_OBJECT_DTYPE_FLAGS: npy_char = NPY_LIST_PICKLE