From 428a6dc2f63ac7f2798c0cb56cf099108d7cbd00 Mon Sep 17 00:00:00 2001
From: Bjerg <onbjerg@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:02:46 +0200
Subject: [PATCH] fix: correct types in `libmdbx-rs` for windows (#3608)

---
 crates/storage/libmdbx-rs/src/cursor.rs      | 6 +++---
 crates/storage/libmdbx-rs/src/database.rs    | 4 ++--
 crates/storage/libmdbx-rs/src/flags.rs       | 5 ++---
 crates/storage/libmdbx-rs/src/transaction.rs | 5 ++++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/crates/storage/libmdbx-rs/src/cursor.rs b/crates/storage/libmdbx-rs/src/cursor.rs
index 5aa4946d56..4bfb2f2568 100644
--- a/crates/storage/libmdbx-rs/src/cursor.rs
+++ b/crates/storage/libmdbx-rs/src/cursor.rs
@@ -11,7 +11,7 @@ use ffi::{
     MDBX_NEXT_MULTIPLE, MDBX_NEXT_NODUP, MDBX_PREV, MDBX_PREV_DUP, MDBX_PREV_MULTIPLE,
     MDBX_PREV_NODUP, MDBX_SET, MDBX_SET_KEY, MDBX_SET_LOWERBOUND, MDBX_SET_RANGE,
 };
-use libc::{c_uint, c_void};
+use libc::c_void;
 use parking_lot::Mutex;
 use std::{borrow::Cow, fmt, marker::PhantomData, mem, ptr, rc::Rc, result};
 
@@ -709,7 +709,7 @@ where
         cursor: &'cur mut Cursor<'txn, K>,
 
         /// The first operation to perform when the consumer calls Iter.next().
-        op: c_uint,
+        op: MDBX_cursor_op,
 
         _marker: PhantomData<fn(&'txn (Key, Value))>,
     },
@@ -722,7 +722,7 @@ where
     Value: TableObject<'txn>,
 {
     /// Creates a new iterator backed by the given cursor.
-    fn new(cursor: &'cur mut Cursor<'txn, K>, op: c_uint) -> Self {
+    fn new(cursor: &'cur mut Cursor<'txn, K>, op: MDBX_cursor_op) -> Self {
         IterDup::Ok { cursor, op, _marker: PhantomData }
     }
 }
diff --git a/crates/storage/libmdbx-rs/src/database.rs b/crates/storage/libmdbx-rs/src/database.rs
index fb198a4c48..a64e0382e4 100644
--- a/crates/storage/libmdbx-rs/src/database.rs
+++ b/crates/storage/libmdbx-rs/src/database.rs
@@ -4,7 +4,7 @@ use crate::{
     transaction::{txn_execute, TransactionKind},
     Transaction,
 };
-use libc::c_uint;
+use ffi::MDBX_db_flags_t;
 use std::{ffi::CString, marker::PhantomData, ptr};
 
 /// A handle to an individual database in an environment.
@@ -24,7 +24,7 @@ impl<'txn> Database<'txn> {
     pub(crate) fn new<'env, K: TransactionKind, E: EnvironmentKind>(
         txn: &'txn Transaction<'env, K, E>,
         name: Option<&str>,
-        flags: c_uint,
+        flags: MDBX_db_flags_t,
     ) -> Result<Self> {
         let c_name = name.map(|n| CString::new(n).unwrap());
         let name_ptr = if let Some(c_name) = &c_name { c_name.as_ptr() } else { ptr::null() };
diff --git a/crates/storage/libmdbx-rs/src/flags.rs b/crates/storage/libmdbx-rs/src/flags.rs
index f0cefd859f..ac11b03e8b 100644
--- a/crates/storage/libmdbx-rs/src/flags.rs
+++ b/crates/storage/libmdbx-rs/src/flags.rs
@@ -1,6 +1,5 @@
 use bitflags::bitflags;
 use ffi::*;
-use libc::c_uint;
 
 /// MDBX sync mode
 #[derive(Clone, Copy, Debug)]
@@ -188,7 +187,7 @@ impl EnvironmentFlags {
 bitflags! {
     #[doc="Database options."]
     #[derive(Default)]
-    pub struct DatabaseFlags: c_uint {
+    pub struct DatabaseFlags: MDBX_env_flags_t {
         const REVERSE_KEY = MDBX_REVERSEKEY;
         const DUP_SORT = MDBX_DUPSORT;
         const INTEGER_KEY = MDBX_INTEGERKEY;
@@ -203,7 +202,7 @@ bitflags! {
 bitflags! {
     #[doc="Write options."]
     #[derive(Default)]
-    pub struct WriteFlags: c_uint {
+    pub struct WriteFlags: MDBX_env_flags_t {
         const UPSERT = MDBX_UPSERT;
         const NO_OVERWRITE = MDBX_NOOVERWRITE;
         const NO_DUP_DATA = MDBX_NODUPDATA;
diff --git a/crates/storage/libmdbx-rs/src/transaction.rs b/crates/storage/libmdbx-rs/src/transaction.rs
index 210f8f15fc..df391e94e0 100644
--- a/crates/storage/libmdbx-rs/src/transaction.rs
+++ b/crates/storage/libmdbx-rs/src/transaction.rs
@@ -193,7 +193,10 @@ where
                 ffi::mdbx_dbi_flags_ex(txn, db.dbi(), &mut flags, ptr::null_mut())
             }))?;
         }
-        Ok(DatabaseFlags::from_bits_truncate(flags))
+
+        // The types are not the same on Windows. Great!
+        #[cfg_attr(not(windows), allow(clippy::useless_conversion))]
+        Ok(DatabaseFlags::from_bits_truncate(flags.try_into().unwrap()))
     }
 
     /// Retrieves database statistics.