Skip to content

Commit 66d8273

Browse files
committed
Auto merge of #2154 - nielx:fix/haiku-pubfields, r=JohnTitor
Haiku: mark all struct fields public This corrects an oversight when the structs were added.
2 parents fad1e6f + a65256c commit 66d8273

File tree

1 file changed

+37
-37
lines changed

1 file changed

+37
-37
lines changed

src/unix/haiku/native.rs

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -96,29 +96,29 @@ s! {
9696
}
9797

9898
pub struct team_info {
99-
team: team_id,
100-
thread_count: i32,
101-
image_count: i32,
102-
area_count: i32,
103-
debugger_nub_thread: thread_id,
104-
debugger_nub_port: port_id,
105-
argc: i32,
106-
args: [::c_char; 64],
107-
uid: ::uid_t,
108-
gid: ::gid_t
99+
pub team: team_id,
100+
pub thread_count: i32,
101+
pub image_count: i32,
102+
pub area_count: i32,
103+
pub debugger_nub_thread: thread_id,
104+
pub debugger_nub_port: port_id,
105+
pub argc: i32,
106+
pub args: [::c_char; 64],
107+
pub uid: ::uid_t,
108+
pub gid: ::gid_t
109109
}
110110

111111
pub struct sem_info {
112-
sem: sem_id,
113-
team: team_id,
114-
name: [::c_char; B_OS_NAME_LENGTH],
115-
count: i32,
116-
latest_holder: thread_id
112+
pub sem: sem_id,
113+
pub team: team_id,
114+
pub name: [::c_char; B_OS_NAME_LENGTH],
115+
pub count: i32,
116+
pub latest_holder: thread_id
117117
}
118118

119119
pub struct team_usage_info {
120-
user_time: bigtime_t,
121-
kernel_time: bigtime_t
120+
pub user_time: bigtime_t,
121+
pub kernel_time: bigtime_t
122122
}
123123

124124
pub struct thread_info {
@@ -175,34 +175,34 @@ s! {
175175

176176
// kernel/fs_attr.h
177177
pub struct attr_info {
178-
type_: u32,
179-
size: ::off_t
178+
pub type_: u32,
179+
pub size: ::off_t
180180
}
181181

182182
// kernel/fs_index.h
183183
pub struct index_info {
184-
type_: u32,
185-
size: ::off_t,
186-
modification_time: ::time_t,
187-
creation_time: ::time_t,
188-
uid: ::uid_t,
189-
gid: ::gid_t
184+
pub type_: u32,
185+
pub size: ::off_t,
186+
pub modification_time: ::time_t,
187+
pub creation_time: ::time_t,
188+
pub uid: ::uid_t,
189+
pub gid: ::gid_t
190190
}
191191

192192
//kernel/fs_info.h
193193
pub struct fs_info {
194-
dev: ::dev_t,
195-
root: ::ino_t,
196-
flags: u32,
197-
block_size: ::off_t,
198-
io_size: ::off_t,
199-
total_blocks: ::off_t,
200-
free_blocks: ::off_t,
201-
total_nodes: ::off_t,
202-
free_nodes: ::off_t,
203-
device_name: [::c_char; 128],
204-
volume_name: [::c_char; B_FILE_NAME_LENGTH],
205-
fsh_name: [::c_char; B_OS_NAME_LENGTH]
194+
pub dev: ::dev_t,
195+
pub root: ::ino_t,
196+
pub flags: u32,
197+
pub block_size: ::off_t,
198+
pub io_size: ::off_t,
199+
pub total_blocks: ::off_t,
200+
pub free_blocks: ::off_t,
201+
pub total_nodes: ::off_t,
202+
pub free_nodes: ::off_t,
203+
pub device_name: [::c_char; 128],
204+
pub volume_name: [::c_char; B_FILE_NAME_LENGTH],
205+
pub fsh_name: [::c_char; B_OS_NAME_LENGTH]
206206
}
207207

208208
// kernel/image.h

0 commit comments

Comments
 (0)