Skip to content

Commit 9fe7b4e

Browse files
committed
Tidy up a few type usages to be internally consistent
1 parent d2deccd commit 9fe7b4e

File tree

1 file changed

+25
-26
lines changed

1 file changed

+25
-26
lines changed

src/unix/newlib/zephyr/mod.rs

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,40 +63,40 @@ s! {
6363
}
6464
}
6565

66-
pub const NET_SOCKADDR_MAX_SIZE: size_t = crate::mem::size_of::<sockaddr_in6>();
66+
pub const NET_SOCKADDR_MAX_SIZE: ::size_t = crate::mem::size_of::<sockaddr_in6>();
6767

68-
pub const PF_UNSPEC: ::c_long = 0;
68+
pub const PF_UNSPEC: c_long = 0;
6969
/**< Unspecified protocol family. */
70-
pub const PF_INET: ::c_long = 1;
70+
pub const PF_INET: c_long = 1;
7171
/**< IP protocol family version 4. */
72-
pub const PF_INET6: ::c_long = 2;
72+
pub const PF_INET6: c_long = 2;
7373
/**< IP protocol family version 6. */
74-
pub const PF_PACKET: ::c_long = 3;
74+
pub const PF_PACKET: c_long = 3;
7575
/**< Packet family. */
76-
pub const PF_CAN: ::c_long = 4;
76+
pub const PF_CAN: c_long = 4;
7777
/**< Controller Area Network. */
78-
pub const PF_NET_MGMT: ::c_long = 5;
78+
pub const PF_NET_MGMT: c_long = 5;
7979
/**< Network management info. */
80-
pub const PF_LOCAL: ::c_long = 6;
80+
pub const PF_LOCAL: c_long = 6;
8181
/**< Inter-process communication */
82-
pub const PF_UNIX: ::c_long = PF_LOCAL;
82+
pub const PF_UNIX: c_long = PF_LOCAL;
8383
/**< Inter-process communication */
8484

85-
pub const AF_UNSPEC: ::c_long = PF_UNSPEC;
85+
pub const AF_UNSPEC: c_long = PF_UNSPEC;
8686
/**< Unspecified address family. */
87-
pub const AF_INET: ::c_long = PF_INET;
87+
pub const AF_INET: c_long = PF_INET;
8888
/**< IP protocol family version 4. */
89-
pub const AF_INET6: ::c_long = PF_INET6;
89+
pub const AF_INET6: c_long = PF_INET6;
9090
/**< IP protocol family version 6. */
91-
pub const AF_PACKET: ::c_long = PF_PACKET;
91+
pub const AF_PACKET: c_long = PF_PACKET;
9292
/**< Packet family. */
93-
pub const AF_CAN: ::c_long = PF_CAN;
93+
pub const AF_CAN: c_long = PF_CAN;
9494
/**< Controller Area Network. */
95-
pub const AF_NET_MGMT: ::c_long = PF_NET_MGMT;
95+
pub const AF_NET_MGMT: c_long = PF_NET_MGMT;
9696
/**< Network management info. */
97-
pub const AF_LOCAL: ::c_long = PF_LOCAL;
97+
pub const AF_LOCAL: c_long = PF_LOCAL;
9898
/**< Inter-process communication */
99-
pub const AF_UNIX: ::c_long = PF_UNIX;
99+
pub const AF_UNIX: c_long = PF_UNIX;
100100
/**< Inter-process communication */
101101

102102
pub const FIONBIO: ::c_ulong = 2147772030;
@@ -136,15 +136,15 @@ pub const SIGALRM: ::c_int = 14; /* alarm clock */
136136
pub const SIGTERM: ::c_int = 15; /* software termination signal from kill */
137137
pub const SOL_SOCKET: ::c_int = 0xfff;
138138

139-
pub const ZSOCK_MSG_PEEK: ::c_long = 0x02;
140-
pub const ZSOCK_MSG_TRUNC: ::c_long = 0x20;
141-
pub const ZSOCK_MSG_DONTWAIT: ::c_long = 0x40;
142-
pub const ZSOCK_MSG_WAITALL: ::c_long = 0x100;
139+
pub const ZSOCK_MSG_PEEK: c_long = 0x02;
140+
pub const ZSOCK_MSG_TRUNC: c_long = 0x20;
141+
pub const ZSOCK_MSG_DONTWAIT: c_long = 0x40;
142+
pub const ZSOCK_MSG_WAITALL: c_long = 0x100;
143143

144-
pub const MSG_PEEK: ::c_long = ZSOCK_MSG_PEEK;
145-
pub const MSG_TRUNC: ::c_long = ZSOCK_MSG_TRUNC;
146-
pub const MSG_DONTWAIT: ::c_long = ZSOCK_MSG_DONTWAIT;
147-
pub const MSG_WAITALL: ::c_long = ZSOCK_MSG_WAITALL;
144+
pub const MSG_PEEK: c_long = ZSOCK_MSG_PEEK;
145+
pub const MSG_TRUNC: c_long = ZSOCK_MSG_TRUNC;
146+
pub const MSG_DONTWAIT: c_long = ZSOCK_MSG_DONTWAIT;
147+
pub const MSG_WAITALL: c_long = ZSOCK_MSG_WAITALL;
148148

149149
pub const DNS_EAI_BADFLAGS: ::c_int = -1;
150150
pub const DNS_EAI_NONAME: ::c_int = -2;
@@ -208,4 +208,3 @@ extern "C" {
208208
}
209209

210210
pub use crate::unix::newlib::generic::{sigset_t, stat};
211-
use size_t;

0 commit comments

Comments
 (0)