Auto merge of #1246 - emilio:macro-constants, r=nox

ir: Make macro constants not being architecture-dependent.

Fixes #1185

16 files changed, 110 insertions, 128 deletions

diff --git a/tests/expectations/tests/jsval_layout_opaque.rs b/tests/expectations/tests/jsval_layout_opaque.rs
index fa4999ca..75945e7a 100644
--- a/tests/expectations/tests/jsval_layout_opaque.rs
+++ b/tests/expectations/tests/jsval_layout_opaque.rs
@@ -81,9 +81,9 @@ where
         }
     }
 }
-pub const JSVAL_TAG_SHIFT: ::std::os::raw::c_uint = 47;
-pub const JSVAL_PAYLOAD_MASK: ::std::os::raw::c_ulonglong = 140737488355327;
-pub const JSVAL_TAG_MASK: ::std::os::raw::c_longlong = -140737488355328;
+pub const JSVAL_TAG_SHIFT: u32 = 47;
+pub const JSVAL_PAYLOAD_MASK: u64 = 140737488355327;
+pub const JSVAL_TAG_MASK: i64 = -140737488355328;
 #[repr(u8)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum JSValueType {
diff --git a/tests/expectations/tests/jsval_layout_opaque_1_0.rs b/tests/expectations/tests/jsval_layout_opaque_1_0.rs
index dc41c49c..593c8f6f 100644
--- a/tests/expectations/tests/jsval_layout_opaque_1_0.rs
+++ b/tests/expectations/tests/jsval_layout_opaque_1_0.rs
@@ -124,9 +124,9 @@ impl<T> ::std::cmp::PartialEq for __BindgenUnionField<T> {
     }
 }
 impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {}
-pub const JSVAL_TAG_SHIFT: ::std::os::raw::c_uint = 47;
-pub const JSVAL_PAYLOAD_MASK: ::std::os::raw::c_ulonglong = 140737488355327;
-pub const JSVAL_TAG_MASK: ::std::os::raw::c_longlong = -140737488355328;
+pub const JSVAL_TAG_SHIFT: u32 = 47;
+pub const JSVAL_PAYLOAD_MASK: u64 = 140737488355327;
+pub const JSVAL_TAG_MASK: i64 = -140737488355328;
 #[repr(u8)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum JSValueType {
diff --git a/tests/expectations/tests/layout_arp.rs b/tests/expectations/tests/layout_arp.rs
index 4978b152..7516f5e4 100644
--- a/tests/expectations/tests/layout_arp.rs
+++ b/tests/expectations/tests/layout_arp.rs
@@ -1,17 +1,15 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
-pub const ETHER_ADDR_LEN: ::std::os::raw::c_uint = 6;
-pub const ARP_HRD_ETHER: ::std::os::raw::c_uint = 1;
-pub const ARP_OP_REQUEST: ::std::os::raw::c_uint = 1;
-pub const ARP_OP_REPLY: ::std::os::raw::c_uint = 2;
-pub const ARP_OP_REVREQUEST: ::std::os::raw::c_uint = 3;
-pub const ARP_OP_REVREPLY: ::std::os::raw::c_uint = 4;
-pub const ARP_OP_INVREQUEST: ::std::os::raw::c_uint = 8;
-pub const ARP_OP_INVREPLY: ::std::os::raw::c_uint = 9;
+pub const ETHER_ADDR_LEN: u32 = 6;
+pub const ARP_HRD_ETHER: u32 = 1;
+pub const ARP_OP_REQUEST: u32 = 1;
+pub const ARP_OP_REPLY: u32 = 2;
+pub const ARP_OP_REVREQUEST: u32 = 3;
+pub const ARP_OP_REVREPLY: u32 = 4;
+pub const ARP_OP_INVREQUEST: u32 = 8;
+pub const ARP_OP_INVREPLY: u32 = 9;
 /// Ethernet address:
 /// A universally administered address is uniquely assigned to a device by its
 /// manufacturer. The first three octets (in transmission order) contain the
diff --git a/tests/expectations/tests/layout_array.rs b/tests/expectations/tests/layout_array.rs
index 8429c4d4..7ca267dc 100644
--- a/tests/expectations/tests/layout_array.rs
+++ b/tests/expectations/tests/layout_array.rs
@@ -2,10 +2,10 @@
 
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-pub const RTE_CACHE_LINE_SIZE: ::std::os::raw::c_uint = 64;
-pub const RTE_MEMPOOL_OPS_NAMESIZE: ::std::os::raw::c_uint = 32;
-pub const RTE_MEMPOOL_MAX_OPS_IDX: ::std::os::raw::c_uint = 16;
-pub const RTE_HEAP_NUM_FREELISTS: ::std::os::raw::c_uint = 13;
+pub const RTE_CACHE_LINE_SIZE: u32 = 64;
+pub const RTE_MEMPOOL_OPS_NAMESIZE: u32 = 32;
+pub const RTE_MEMPOOL_MAX_OPS_IDX: u32 = 16;
+pub const RTE_HEAP_NUM_FREELISTS: u32 = 13;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct rte_mempool {
diff --git a/tests/expectations/tests/layout_array_too_long.rs b/tests/expectations/tests/layout_array_too_long.rs
index bb98704f..40f2fc5d 100644
--- a/tests/expectations/tests/layout_array_too_long.rs
+++ b/tests/expectations/tests/layout_array_too_long.rs
@@ -2,8 +2,8 @@
 
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-pub const RTE_CACHE_LINE_SIZE: ::std::os::raw::c_uint = 64;
-pub const RTE_LIBRTE_IP_FRAG_MAX_FRAG: ::std::os::raw::c_uint = 4;
+pub const RTE_CACHE_LINE_SIZE: u32 = 64;
+pub const RTE_LIBRTE_IP_FRAG_MAX_FRAG: u32 = 4;
 pub const IP_LAST_FRAG_IDX: _bindgen_ty_1 = _bindgen_ty_1::IP_LAST_FRAG_IDX;
 pub const IP_FIRST_FRAG_IDX: _bindgen_ty_1 = _bindgen_ty_1::IP_FIRST_FRAG_IDX;
 pub const IP_MIN_FRAG_NUM: _bindgen_ty_1 = _bindgen_ty_1::IP_MIN_FRAG_NUM;
diff --git a/tests/expectations/tests/layout_eth_conf.rs b/tests/expectations/tests/layout_eth_conf.rs
index 176e0d55..a06f62b0 100644
--- a/tests/expectations/tests/layout_eth_conf.rs
+++ b/tests/expectations/tests/layout_eth_conf.rs
@@ -81,38 +81,38 @@ where
         }
     }
 }
-pub const ETH_MQ_RX_RSS_FLAG: ::std::os::raw::c_uint = 1;
-pub const ETH_MQ_RX_DCB_FLAG: ::std::os::raw::c_uint = 2;
-pub const ETH_MQ_RX_VMDQ_FLAG: ::std::os::raw::c_uint = 4;
-pub const ETH_VMDQ_MAX_VLAN_FILTERS: ::std::os::raw::c_uint = 64;
-pub const ETH_DCB_NUM_USER_PRIORITIES: ::std::os::raw::c_uint = 8;
-pub const ETH_VMDQ_DCB_NUM_QUEUES: ::std::os::raw::c_uint = 128;
-pub const ETH_DCB_NUM_QUEUES: ::std::os::raw::c_uint = 128;
-pub const RTE_ETH_FDIR_MAX_FLEXLEN: ::std::os::raw::c_uint = 16;
-pub const RTE_ETH_INSET_SIZE_MAX: ::std::os::raw::c_uint = 128;
-pub const RTE_ETH_FLOW_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const RTE_ETH_FLOW_RAW: ::std::os::raw::c_uint = 1;
-pub const RTE_ETH_FLOW_IPV4: ::std::os::raw::c_uint = 2;
-pub const RTE_ETH_FLOW_FRAG_IPV4: ::std::os::raw::c_uint = 3;
-pub const RTE_ETH_FLOW_NONFRAG_IPV4_TCP: ::std::os::raw::c_uint = 4;
-pub const RTE_ETH_FLOW_NONFRAG_IPV4_UDP: ::std::os::raw::c_uint = 5;
-pub const RTE_ETH_FLOW_NONFRAG_IPV4_SCTP: ::std::os::raw::c_uint = 6;
-pub const RTE_ETH_FLOW_NONFRAG_IPV4_OTHER: ::std::os::raw::c_uint = 7;
-pub const RTE_ETH_FLOW_IPV6: ::std::os::raw::c_uint = 8;
-pub const RTE_ETH_FLOW_FRAG_IPV6: ::std::os::raw::c_uint = 9;
-pub const RTE_ETH_FLOW_NONFRAG_IPV6_TCP: ::std::os::raw::c_uint = 10;
-pub const RTE_ETH_FLOW_NONFRAG_IPV6_UDP: ::std::os::raw::c_uint = 11;
-pub const RTE_ETH_FLOW_NONFRAG_IPV6_SCTP: ::std::os::raw::c_uint = 12;
-pub const RTE_ETH_FLOW_NONFRAG_IPV6_OTHER: ::std::os::raw::c_uint = 13;
-pub const RTE_ETH_FLOW_L2_PAYLOAD: ::std::os::raw::c_uint = 14;
-pub const RTE_ETH_FLOW_IPV6_EX: ::std::os::raw::c_uint = 15;
-pub const RTE_ETH_FLOW_IPV6_TCP_EX: ::std::os::raw::c_uint = 16;
-pub const RTE_ETH_FLOW_IPV6_UDP_EX: ::std::os::raw::c_uint = 17;
-pub const RTE_ETH_FLOW_PORT: ::std::os::raw::c_uint = 18;
-pub const RTE_ETH_FLOW_VXLAN: ::std::os::raw::c_uint = 19;
-pub const RTE_ETH_FLOW_GENEVE: ::std::os::raw::c_uint = 20;
-pub const RTE_ETH_FLOW_NVGRE: ::std::os::raw::c_uint = 21;
-pub const RTE_ETH_FLOW_MAX: ::std::os::raw::c_uint = 22;
+pub const ETH_MQ_RX_RSS_FLAG: u32 = 1;
+pub const ETH_MQ_RX_DCB_FLAG: u32 = 2;
+pub const ETH_MQ_RX_VMDQ_FLAG: u32 = 4;
+pub const ETH_VMDQ_MAX_VLAN_FILTERS: u32 = 64;
+pub const ETH_DCB_NUM_USER_PRIORITIES: u32 = 8;
+pub const ETH_VMDQ_DCB_NUM_QUEUES: u32 = 128;
+pub const ETH_DCB_NUM_QUEUES: u32 = 128;
+pub const RTE_ETH_FDIR_MAX_FLEXLEN: u32 = 16;
+pub const RTE_ETH_INSET_SIZE_MAX: u32 = 128;
+pub const RTE_ETH_FLOW_UNKNOWN: u32 = 0;
+pub const RTE_ETH_FLOW_RAW: u32 = 1;
+pub const RTE_ETH_FLOW_IPV4: u32 = 2;
+pub const RTE_ETH_FLOW_FRAG_IPV4: u32 = 3;
+pub const RTE_ETH_FLOW_NONFRAG_IPV4_TCP: u32 = 4;
+pub const RTE_ETH_FLOW_NONFRAG_IPV4_UDP: u32 = 5;
+pub const RTE_ETH_FLOW_NONFRAG_IPV4_SCTP: u32 = 6;
+pub const RTE_ETH_FLOW_NONFRAG_IPV4_OTHER: u32 = 7;
+pub const RTE_ETH_FLOW_IPV6: u32 = 8;
+pub const RTE_ETH_FLOW_FRAG_IPV6: u32 = 9;
+pub const RTE_ETH_FLOW_NONFRAG_IPV6_TCP: u32 = 10;
+pub const RTE_ETH_FLOW_NONFRAG_IPV6_UDP: u32 = 11;
+pub const RTE_ETH_FLOW_NONFRAG_IPV6_SCTP: u32 = 12;
+pub const RTE_ETH_FLOW_NONFRAG_IPV6_OTHER: u32 = 13;
+pub const RTE_ETH_FLOW_L2_PAYLOAD: u32 = 14;
+pub const RTE_ETH_FLOW_IPV6_EX: u32 = 15;
+pub const RTE_ETH_FLOW_IPV6_TCP_EX: u32 = 16;
+pub const RTE_ETH_FLOW_IPV6_UDP_EX: u32 = 17;
+pub const RTE_ETH_FLOW_PORT: u32 = 18;
+pub const RTE_ETH_FLOW_VXLAN: u32 = 19;
+pub const RTE_ETH_FLOW_GENEVE: u32 = 20;
+pub const RTE_ETH_FLOW_NVGRE: u32 = 21;
+pub const RTE_ETH_FLOW_MAX: u32 = 22;
 #[repr(u32)]
 /// A set of values to identify what method is to be used to route
 /// packets to multiple queues.
diff --git a/tests/expectations/tests/layout_eth_conf_1_0.rs b/tests/expectations/tests/layout_eth_conf_1_0.rs
index 8323460a..5f614ca9 100644
--- a/tests/expectations/tests/layout_eth_conf_1_0.rs
+++ b/tests/expectations/tests/layout_eth_conf_1_0.rs
@@ -124,38 +124,38 @@ impl<T> ::std::cmp::PartialEq for __BindgenUnionField<T> {
     }
 }
 impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {}
-pub const ETH_MQ_RX_RSS_FLAG: ::std::os::raw::c_uint = 1;
-pub const ETH_MQ_RX_DCB_FLAG: ::std::os::raw::c_uint = 2;
-pub const ETH_MQ_RX_VMDQ_FLAG: ::std::os::raw::c_uint = 4;
-pub const ETH_VMDQ_MAX_VLAN_FILTERS: ::std::os::raw::c_uint = 64;
-pub const ETH_DCB_NUM_USER_PRIORITIES: ::std::os::raw::c_uint = 8;
-pub const ETH_VMDQ_DCB_NUM_QUEUES: ::std::os::raw::c_uint = 128;
-pub const ETH_DCB_NUM_QUEUES: ::std::os::raw::c_uint = 128;
-pub const RTE_ETH_FDIR_MAX_FLEXLEN: ::std::os::raw::c_uint = 16;
-pub const RTE_ETH_INSET_SIZE_MAX: ::std::os::raw::c_uint = 128;
-pub const RTE_ETH_FLOW_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const RTE_ETH_FLOW_RAW: ::std::os::raw::c_uint = 1;
-pub const RTE_ETH_FLOW_IPV4: ::std::os::raw::c_uint = 2;
-pub const RTE_ETH_FLOW_FRAG_IPV4: ::std::os::raw::c_uint = 3;
-pub const RTE_ETH_FLOW_NONFRAG_IPV4_TCP: ::std::os::raw::c_uint = 4;
-pub const RTE_ETH_FLOW_NONFRAG_IPV4_UDP: ::std::os::raw::c_uint = 5;
-pub const RTE_ETH_FLOW_NONFRAG_IPV4_SCTP: ::std::os::raw::c_uint = 6;
-pub const RTE_ETH_FLOW_NONFRAG_IPV4_OTHER: ::std::os::raw::c_uint = 7;
-pub const RTE_ETH_FLOW_IPV6: ::std::os::raw::c_uint = 8;
-pub const RTE_ETH_FLOW_FRAG_IPV6: ::std::os::raw::c_uint = 9;
-pub const RTE_ETH_FLOW_NONFRAG_IPV6_TCP: ::std::os::raw::c_uint = 10;
-pub const RTE_ETH_FLOW_NONFRAG_IPV6_UDP: ::std::os::raw::c_uint = 11;
-pub const RTE_ETH_FLOW_NONFRAG_IPV6_SCTP: ::std::os::raw::c_uint = 12;
-pub const RTE_ETH_FLOW_NONFRAG_IPV6_OTHER: ::std::os::raw::c_uint = 13;
-pub const RTE_ETH_FLOW_L2_PAYLOAD: ::std::os::raw::c_uint = 14;
-pub const RTE_ETH_FLOW_IPV6_EX: ::std::os::raw::c_uint = 15;
-pub const RTE_ETH_FLOW_IPV6_TCP_EX: ::std::os::raw::c_uint = 16;
-pub const RTE_ETH_FLOW_IPV6_UDP_EX: ::std::os::raw::c_uint = 17;
-pub const RTE_ETH_FLOW_PORT: ::std::os::raw::c_uint = 18;
-pub const RTE_ETH_FLOW_VXLAN: ::std::os::raw::c_uint = 19;
-pub const RTE_ETH_FLOW_GENEVE: ::std::os::raw::c_uint = 20;
-pub const RTE_ETH_FLOW_NVGRE: ::std::os::raw::c_uint = 21;
-pub const RTE_ETH_FLOW_MAX: ::std::os::raw::c_uint = 22;
+pub const ETH_MQ_RX_RSS_FLAG: u32 = 1;
+pub const ETH_MQ_RX_DCB_FLAG: u32 = 2;
+pub const ETH_MQ_RX_VMDQ_FLAG: u32 = 4;
+pub const ETH_VMDQ_MAX_VLAN_FILTERS: u32 = 64;
+pub const ETH_DCB_NUM_USER_PRIORITIES: u32 = 8;
+pub const ETH_VMDQ_DCB_NUM_QUEUES: u32 = 128;
+pub const ETH_DCB_NUM_QUEUES: u32 = 128;
+pub const RTE_ETH_FDIR_MAX_FLEXLEN: u32 = 16;
+pub const RTE_ETH_INSET_SIZE_MAX: u32 = 128;
+pub const RTE_ETH_FLOW_UNKNOWN: u32 = 0;
+pub const RTE_ETH_FLOW_RAW: u32 = 1;
+pub const RTE_ETH_FLOW_IPV4: u32 = 2;
+pub const RTE_ETH_FLOW_FRAG_IPV4: u32 = 3;
+pub const RTE_ETH_FLOW_NONFRAG_IPV4_TCP: u32 = 4;
+pub const RTE_ETH_FLOW_NONFRAG_IPV4_UDP: u32 = 5;
+pub const RTE_ETH_FLOW_NONFRAG_IPV4_SCTP: u32 = 6;
+pub const RTE_ETH_FLOW_NONFRAG_IPV4_OTHER: u32 = 7;
+pub const RTE_ETH_FLOW_IPV6: u32 = 8;
+pub const RTE_ETH_FLOW_FRAG_IPV6: u32 = 9;
+pub const RTE_ETH_FLOW_NONFRAG_IPV6_TCP: u32 = 10;
+pub const RTE_ETH_FLOW_NONFRAG_IPV6_UDP: u32 = 11;
+pub const RTE_ETH_FLOW_NONFRAG_IPV6_SCTP: u32 = 12;
+pub const RTE_ETH_FLOW_NONFRAG_IPV6_OTHER: u32 = 13;
+pub const RTE_ETH_FLOW_L2_PAYLOAD: u32 = 14;
+pub const RTE_ETH_FLOW_IPV6_EX: u32 = 15;
+pub const RTE_ETH_FLOW_IPV6_TCP_EX: u32 = 16;
+pub const RTE_ETH_FLOW_IPV6_UDP_EX: u32 = 17;
+pub const RTE_ETH_FLOW_PORT: u32 = 18;
+pub const RTE_ETH_FLOW_VXLAN: u32 = 19;
+pub const RTE_ETH_FLOW_GENEVE: u32 = 20;
+pub const RTE_ETH_FLOW_NVGRE: u32 = 21;
+pub const RTE_ETH_FLOW_MAX: u32 = 22;
 #[repr(u32)]
 /// A set of values to identify what method is to be used to route
 /// packets to multiple queues.
diff --git a/tests/expectations/tests/layout_kni_mbuf.rs b/tests/expectations/tests/layout_kni_mbuf.rs
index a8989c10..80ab1be9 100644
--- a/tests/expectations/tests/layout_kni_mbuf.rs
+++ b/tests/expectations/tests/layout_kni_mbuf.rs
@@ -1,11 +1,9 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
-pub const RTE_CACHE_LINE_MIN_SIZE: ::std::os::raw::c_uint = 64;
-pub const RTE_CACHE_LINE_SIZE: ::std::os::raw::c_uint = 64;
+pub const RTE_CACHE_LINE_MIN_SIZE: u32 = 64;
+pub const RTE_CACHE_LINE_SIZE: u32 = 64;
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct rte_kni_mbuf {
diff --git a/tests/expectations/tests/layout_large_align_field.rs b/tests/expectations/tests/layout_large_align_field.rs
index cbe84e3b..15b7a4b7 100644
--- a/tests/expectations/tests/layout_large_align_field.rs
+++ b/tests/expectations/tests/layout_large_align_field.rs
@@ -39,8 +39,8 @@ impl<T> ::std::clone::Clone for __IncompleteArrayField<T> {
     }
 }
 impl<T> ::std::marker::Copy for __IncompleteArrayField<T> {}
-pub const RTE_CACHE_LINE_SIZE: ::std::os::raw::c_uint = 64;
-pub const RTE_LIBRTE_IP_FRAG_MAX_FRAG: ::std::os::raw::c_uint = 4;
+pub const RTE_CACHE_LINE_SIZE: u32 = 64;
+pub const RTE_LIBRTE_IP_FRAG_MAX_FRAG: u32 = 4;
 pub const IP_LAST_FRAG_IDX: _bindgen_ty_1 = _bindgen_ty_1::IP_LAST_FRAG_IDX;
 pub const IP_FIRST_FRAG_IDX: _bindgen_ty_1 = _bindgen_ty_1::IP_FIRST_FRAG_IDX;
 pub const IP_MIN_FRAG_NUM: _bindgen_ty_1 = _bindgen_ty_1::IP_MIN_FRAG_NUM;
diff --git a/tests/expectations/tests/layout_mbuf.rs b/tests/expectations/tests/layout_mbuf.rs
index e6809ab8..c42cd0ba 100644
--- a/tests/expectations/tests/layout_mbuf.rs
+++ b/tests/expectations/tests/layout_mbuf.rs
@@ -1,9 +1,7 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct __BindgenBitfieldUnit<Storage, Align>
@@ -83,8 +81,8 @@ where
         }
     }
 }
-pub const RTE_CACHE_LINE_MIN_SIZE: ::std::os::raw::c_uint = 64;
-pub const RTE_CACHE_LINE_SIZE: ::std::os::raw::c_uint = 64;
+pub const RTE_CACHE_LINE_MIN_SIZE: u32 = 64;
+pub const RTE_CACHE_LINE_SIZE: u32 = 64;
 pub type phys_addr_t = u64;
 pub type MARKER = [*mut ::std::os::raw::c_void; 0usize];
 pub type MARKER8 = [u8; 0usize];
diff --git a/tests/expectations/tests/layout_mbuf_1_0.rs b/tests/expectations/tests/layout_mbuf_1_0.rs
index e9a0900b..2fd51418 100644
--- a/tests/expectations/tests/layout_mbuf_1_0.rs
+++ b/tests/expectations/tests/layout_mbuf_1_0.rs
@@ -1,9 +1,7 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct __BindgenBitfieldUnit<Storage, Align>
@@ -126,8 +124,8 @@ impl<T> ::std::cmp::PartialEq for __BindgenUnionField<T> {
     }
 }
 impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {}
-pub const RTE_CACHE_LINE_MIN_SIZE: ::std::os::raw::c_uint = 64;
-pub const RTE_CACHE_LINE_SIZE: ::std::os::raw::c_uint = 64;
+pub const RTE_CACHE_LINE_MIN_SIZE: u32 = 64;
+pub const RTE_CACHE_LINE_SIZE: u32 = 64;
 pub type phys_addr_t = u64;
 pub type MARKER = [*mut ::std::os::raw::c_void; 0usize];
 pub type MARKER8 = [u8; 0usize];
diff --git a/tests/expectations/tests/macro-expr-basic.rs b/tests/expectations/tests/macro-expr-basic.rs
index 7c9bc783..55590ff6 100644
--- a/tests/expectations/tests/macro-expr-basic.rs
+++ b/tests/expectations/tests/macro-expr-basic.rs
@@ -1,15 +1,13 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
-pub const FOO: ::std::os::raw::c_uint = 1;
-pub const BAR: ::std::os::raw::c_uint = 4;
-pub const BAZ: ::std::os::raw::c_uint = 5;
-pub const MIN: ::std::os::raw::c_longlong = -9223372036854775808;
-pub const BARR: ::std::os::raw::c_uint = 1;
-pub const BAZZ: ::std::os::raw::c_uint = 7;
-pub const I_RAN_OUT_OF_DUMB_NAMES: ::std::os::raw::c_uint = 7;
-pub const HAZ_A_COMMENT: ::std::os::raw::c_uint = 1;
-pub const HAZ_A_COMMENT_INSIDE: ::std::os::raw::c_uint = 2;
+pub const FOO: u32 = 1;
+pub const BAR: u32 = 4;
+pub const BAZ: u32 = 5;
+pub const MIN: i64 = -9223372036854775808;
+pub const BARR: u32 = 1;
+pub const BAZZ: u32 = 7;
+pub const I_RAN_OUT_OF_DUMB_NAMES: u32 = 7;
+pub const HAZ_A_COMMENT: u32 = 1;
+pub const HAZ_A_COMMENT_INSIDE: u32 = 2;
diff --git a/tests/expectations/tests/macro-expr-uncommon-token.rs b/tests/expectations/tests/macro-expr-uncommon-token.rs
index d0d515a4..95093ad6 100644
--- a/tests/expectations/tests/macro-expr-uncommon-token.rs
+++ b/tests/expectations/tests/macro-expr-uncommon-token.rs
@@ -1,10 +1,8 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
-pub const MODBUS_WOOT: ::std::os::raw::c_uint = 3;
+pub const MODBUS_WOOT: u32 = 3;
 extern "C" {
     pub fn foo();
 }
diff --git a/tests/expectations/tests/macro-redef.rs b/tests/expectations/tests/macro-redef.rs
index 826f44c2..e7132232 100644
--- a/tests/expectations/tests/macro-redef.rs
+++ b/tests/expectations/tests/macro-redef.rs
@@ -1,9 +1,7 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
-pub const FOO: ::std::os::raw::c_uint = 4;
-pub const BAR: ::std::os::raw::c_uint = 5;
-pub const BAZ: ::std::os::raw::c_uint = 6;
+pub const FOO: u32 = 4;
+pub const BAR: u32 = 5;
+pub const BAZ: u32 = 6;
diff --git a/tests/expectations/tests/ref_argument_array.rs b/tests/expectations/tests/ref_argument_array.rs
index 14675a67..89ae83c9 100644
--- a/tests/expectations/tests/ref_argument_array.rs
+++ b/tests/expectations/tests/ref_argument_array.rs
@@ -1,10 +1,8 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
-pub const NSID_LENGTH: ::std::os::raw::c_uint = 10;
+pub const NSID_LENGTH: u32 = 10;
 #[repr(C)]
 pub struct nsID__bindgen_vtable(::std::os::raw::c_void);
 #[repr(C)]
diff --git a/tests/expectations/tests/whitelist_vars.rs b/tests/expectations/tests/whitelist_vars.rs
index e9e01fe1..b8f10998 100644
--- a/tests/expectations/tests/whitelist_vars.rs
+++ b/tests/expectations/tests/whitelist_vars.rs
@@ -1,10 +1,8 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
-pub const NONE: ::std::os::raw::c_uint = 0;
-pub const FOO: ::std::os::raw::c_uint = 5;
-pub const FOOB: ::std::os::raw::c_int = -2;
-pub const FOOBAR: ::std::os::raw::c_int = -10;
+pub const NONE: u32 = 0;
+pub const FOO: u32 = 5;
+pub const FOOB: i32 = -2;
+pub const FOOBAR: i32 = -10;