Skip to content

Commit 0b02c40

Browse files
committed
Auto merge of #1398 - josephlr:fuchsia, r=gnzlbg
Remove Linux constants from Fushia PR #849 just moved all of the Linux structures into `src/fuchsia`. While this is good for the most part, we really don't want the `SYS_*` constants exported on Fushia, as these are not Fuchsia's syscalls. This also removes Linux-specific `GRND_*` constants.
2 parents e0ff1e6 + 3b27cb3 commit 0b02c40

File tree

3 files changed

+0
-602
lines changed

3 files changed

+0
-602
lines changed

src/fuchsia/aarch64.rs

Lines changed: 0 additions & 265 deletions
Original file line numberDiff line numberDiff line change
@@ -80,268 +80,3 @@ pub const PF_MAX: ::c_int = 43;
8080
)]
8181
#[allow(deprecated)]
8282
pub const AF_MAX: ::c_int = PF_MAX;
83-
84-
pub const SYS_io_setup: ::c_long = 0;
85-
pub const SYS_io_destroy: ::c_long = 1;
86-
pub const SYS_io_submit: ::c_long = 2;
87-
pub const SYS_io_cancel: ::c_long = 3;
88-
pub const SYS_io_getevents: ::c_long = 4;
89-
pub const SYS_setxattr: ::c_long = 5;
90-
pub const SYS_lsetxattr: ::c_long = 6;
91-
pub const SYS_fsetxattr: ::c_long = 7;
92-
pub const SYS_getxattr: ::c_long = 8;
93-
pub const SYS_lgetxattr: ::c_long = 9;
94-
pub const SYS_fgetxattr: ::c_long = 10;
95-
pub const SYS_listxattr: ::c_long = 11;
96-
pub const SYS_llistxattr: ::c_long = 12;
97-
pub const SYS_flistxattr: ::c_long = 13;
98-
pub const SYS_removexattr: ::c_long = 14;
99-
pub const SYS_lremovexattr: ::c_long = 15;
100-
pub const SYS_fremovexattr: ::c_long = 16;
101-
pub const SYS_getcwd: ::c_long = 17;
102-
pub const SYS_lookup_dcookie: ::c_long = 18;
103-
pub const SYS_eventfd2: ::c_long = 19;
104-
pub const SYS_epoll_create1: ::c_long = 20;
105-
pub const SYS_epoll_ctl: ::c_long = 21;
106-
pub const SYS_epoll_pwait: ::c_long = 22;
107-
pub const SYS_dup: ::c_long = 23;
108-
pub const SYS_dup3: ::c_long = 24;
109-
pub const SYS_inotify_init1: ::c_long = 26;
110-
pub const SYS_inotify_add_watch: ::c_long = 27;
111-
pub const SYS_inotify_rm_watch: ::c_long = 28;
112-
pub const SYS_ioctl: ::c_long = 29;
113-
pub const SYS_ioprio_set: ::c_long = 30;
114-
pub const SYS_ioprio_get: ::c_long = 31;
115-
pub const SYS_flock: ::c_long = 32;
116-
pub const SYS_mknodat: ::c_long = 33;
117-
pub const SYS_mkdirat: ::c_long = 34;
118-
pub const SYS_unlinkat: ::c_long = 35;
119-
pub const SYS_symlinkat: ::c_long = 36;
120-
pub const SYS_linkat: ::c_long = 37;
121-
pub const SYS_renameat: ::c_long = 38;
122-
pub const SYS_umount2: ::c_long = 39;
123-
pub const SYS_mount: ::c_long = 40;
124-
pub const SYS_pivot_root: ::c_long = 41;
125-
pub const SYS_nfsservctl: ::c_long = 42;
126-
pub const SYS_fallocate: ::c_long = 47;
127-
pub const SYS_faccessat: ::c_long = 48;
128-
pub const SYS_chdir: ::c_long = 49;
129-
pub const SYS_fchdir: ::c_long = 50;
130-
pub const SYS_chroot: ::c_long = 51;
131-
pub const SYS_fchmod: ::c_long = 52;
132-
pub const SYS_fchmodat: ::c_long = 53;
133-
pub const SYS_fchownat: ::c_long = 54;
134-
pub const SYS_fchown: ::c_long = 55;
135-
pub const SYS_openat: ::c_long = 56;
136-
pub const SYS_close: ::c_long = 57;
137-
pub const SYS_vhangup: ::c_long = 58;
138-
pub const SYS_pipe2: ::c_long = 59;
139-
pub const SYS_quotactl: ::c_long = 60;
140-
pub const SYS_getdents64: ::c_long = 61;
141-
pub const SYS_read: ::c_long = 63;
142-
pub const SYS_write: ::c_long = 64;
143-
pub const SYS_readv: ::c_long = 65;
144-
pub const SYS_writev: ::c_long = 66;
145-
pub const SYS_pread64: ::c_long = 67;
146-
pub const SYS_pwrite64: ::c_long = 68;
147-
pub const SYS_preadv: ::c_long = 69;
148-
pub const SYS_pwritev: ::c_long = 70;
149-
pub const SYS_pselect6: ::c_long = 72;
150-
pub const SYS_ppoll: ::c_long = 73;
151-
pub const SYS_signalfd4: ::c_long = 74;
152-
pub const SYS_vmsplice: ::c_long = 75;
153-
pub const SYS_splice: ::c_long = 76;
154-
pub const SYS_tee: ::c_long = 77;
155-
pub const SYS_readlinkat: ::c_long = 78;
156-
pub const SYS_sync: ::c_long = 81;
157-
pub const SYS_fsync: ::c_long = 82;
158-
pub const SYS_fdatasync: ::c_long = 83;
159-
pub const SYS_sync_file_range: ::c_long = 84;
160-
pub const SYS_timerfd_create: ::c_long = 85;
161-
pub const SYS_timerfd_settime: ::c_long = 86;
162-
pub const SYS_timerfd_gettime: ::c_long = 87;
163-
pub const SYS_utimensat: ::c_long = 88;
164-
pub const SYS_acct: ::c_long = 89;
165-
pub const SYS_capget: ::c_long = 90;
166-
pub const SYS_capset: ::c_long = 91;
167-
pub const SYS_personality: ::c_long = 92;
168-
pub const SYS_exit: ::c_long = 93;
169-
pub const SYS_exit_group: ::c_long = 94;
170-
pub const SYS_waitid: ::c_long = 95;
171-
pub const SYS_set_tid_address: ::c_long = 96;
172-
pub const SYS_unshare: ::c_long = 97;
173-
pub const SYS_futex: ::c_long = 98;
174-
pub const SYS_set_robust_list: ::c_long = 99;
175-
pub const SYS_get_robust_list: ::c_long = 100;
176-
pub const SYS_nanosleep: ::c_long = 101;
177-
pub const SYS_getitimer: ::c_long = 102;
178-
pub const SYS_setitimer: ::c_long = 103;
179-
pub const SYS_kexec_load: ::c_long = 104;
180-
pub const SYS_init_module: ::c_long = 105;
181-
pub const SYS_delete_module: ::c_long = 106;
182-
pub const SYS_timer_create: ::c_long = 107;
183-
pub const SYS_timer_gettime: ::c_long = 108;
184-
pub const SYS_timer_getoverrun: ::c_long = 109;
185-
pub const SYS_timer_settime: ::c_long = 110;
186-
pub const SYS_timer_delete: ::c_long = 111;
187-
pub const SYS_clock_settime: ::c_long = 112;
188-
pub const SYS_clock_gettime: ::c_long = 113;
189-
pub const SYS_clock_getres: ::c_long = 114;
190-
pub const SYS_clock_nanosleep: ::c_long = 115;
191-
pub const SYS_syslog: ::c_long = 116;
192-
pub const SYS_ptrace: ::c_long = 117;
193-
pub const SYS_sched_setparam: ::c_long = 118;
194-
pub const SYS_sched_setscheduler: ::c_long = 119;
195-
pub const SYS_sched_getscheduler: ::c_long = 120;
196-
pub const SYS_sched_getparam: ::c_long = 121;
197-
pub const SYS_sched_setaffinity: ::c_long = 122;
198-
pub const SYS_sched_getaffinity: ::c_long = 123;
199-
pub const SYS_sched_yield: ::c_long = 124;
200-
pub const SYS_sched_get_priority_max: ::c_long = 125;
201-
pub const SYS_sched_get_priority_min: ::c_long = 126;
202-
pub const SYS_sched_rr_get_interval: ::c_long = 127;
203-
pub const SYS_restart_syscall: ::c_long = 128;
204-
pub const SYS_kill: ::c_long = 129;
205-
pub const SYS_tkill: ::c_long = 130;
206-
pub const SYS_tgkill: ::c_long = 131;
207-
pub const SYS_sigaltstack: ::c_long = 132;
208-
pub const SYS_rt_sigsuspend: ::c_long = 133;
209-
pub const SYS_rt_sigaction: ::c_long = 134;
210-
pub const SYS_rt_sigprocmask: ::c_long = 135;
211-
pub const SYS_rt_sigpending: ::c_long = 136;
212-
pub const SYS_rt_sigtimedwait: ::c_long = 137;
213-
pub const SYS_rt_sigqueueinfo: ::c_long = 138;
214-
pub const SYS_rt_sigreturn: ::c_long = 139;
215-
pub const SYS_setpriority: ::c_long = 140;
216-
pub const SYS_getpriority: ::c_long = 141;
217-
pub const SYS_reboot: ::c_long = 142;
218-
pub const SYS_setregid: ::c_long = 143;
219-
pub const SYS_setgid: ::c_long = 144;
220-
pub const SYS_setreuid: ::c_long = 145;
221-
pub const SYS_setuid: ::c_long = 146;
222-
pub const SYS_setresuid: ::c_long = 147;
223-
pub const SYS_getresuid: ::c_long = 148;
224-
pub const SYS_setresgid: ::c_long = 149;
225-
pub const SYS_getresgid: ::c_long = 150;
226-
pub const SYS_setfsuid: ::c_long = 151;
227-
pub const SYS_setfsgid: ::c_long = 152;
228-
pub const SYS_times: ::c_long = 153;
229-
pub const SYS_setpgid: ::c_long = 154;
230-
pub const SYS_getpgid: ::c_long = 155;
231-
pub const SYS_getsid: ::c_long = 156;
232-
pub const SYS_setsid: ::c_long = 157;
233-
pub const SYS_getgroups: ::c_long = 158;
234-
pub const SYS_setgroups: ::c_long = 159;
235-
pub const SYS_uname: ::c_long = 160;
236-
pub const SYS_sethostname: ::c_long = 161;
237-
pub const SYS_setdomainname: ::c_long = 162;
238-
pub const SYS_getrlimit: ::c_long = 163;
239-
pub const SYS_setrlimit: ::c_long = 164;
240-
pub const SYS_getrusage: ::c_long = 165;
241-
pub const SYS_umask: ::c_long = 166;
242-
pub const SYS_prctl: ::c_long = 167;
243-
pub const SYS_getcpu: ::c_long = 168;
244-
pub const SYS_gettimeofday: ::c_long = 169;
245-
pub const SYS_settimeofday: ::c_long = 170;
246-
pub const SYS_adjtimex: ::c_long = 171;
247-
pub const SYS_getpid: ::c_long = 172;
248-
pub const SYS_getppid: ::c_long = 173;
249-
pub const SYS_getuid: ::c_long = 174;
250-
pub const SYS_geteuid: ::c_long = 175;
251-
pub const SYS_getgid: ::c_long = 176;
252-
pub const SYS_getegid: ::c_long = 177;
253-
pub const SYS_gettid: ::c_long = 178;
254-
pub const SYS_sysinfo: ::c_long = 179;
255-
pub const SYS_mq_open: ::c_long = 180;
256-
pub const SYS_mq_unlink: ::c_long = 181;
257-
pub const SYS_mq_timedsend: ::c_long = 182;
258-
pub const SYS_mq_timedreceive: ::c_long = 183;
259-
pub const SYS_mq_notify: ::c_long = 184;
260-
pub const SYS_mq_getsetattr: ::c_long = 185;
261-
pub const SYS_msgget: ::c_long = 186;
262-
pub const SYS_msgctl: ::c_long = 187;
263-
pub const SYS_msgrcv: ::c_long = 188;
264-
pub const SYS_msgsnd: ::c_long = 189;
265-
pub const SYS_semget: ::c_long = 190;
266-
pub const SYS_semctl: ::c_long = 191;
267-
pub const SYS_semtimedop: ::c_long = 192;
268-
pub const SYS_semop: ::c_long = 193;
269-
pub const SYS_shmget: ::c_long = 194;
270-
pub const SYS_shmctl: ::c_long = 195;
271-
pub const SYS_shmat: ::c_long = 196;
272-
pub const SYS_shmdt: ::c_long = 197;
273-
pub const SYS_socket: ::c_long = 198;
274-
pub const SYS_socketpair: ::c_long = 199;
275-
pub const SYS_bind: ::c_long = 200;
276-
pub const SYS_listen: ::c_long = 201;
277-
pub const SYS_accept: ::c_long = 202;
278-
pub const SYS_connect: ::c_long = 203;
279-
pub const SYS_getsockname: ::c_long = 204;
280-
pub const SYS_getpeername: ::c_long = 205;
281-
pub const SYS_sendto: ::c_long = 206;
282-
pub const SYS_recvfrom: ::c_long = 207;
283-
pub const SYS_setsockopt: ::c_long = 208;
284-
pub const SYS_getsockopt: ::c_long = 209;
285-
pub const SYS_shutdown: ::c_long = 210;
286-
pub const SYS_sendmsg: ::c_long = 211;
287-
pub const SYS_recvmsg: ::c_long = 212;
288-
pub const SYS_readahead: ::c_long = 213;
289-
pub const SYS_brk: ::c_long = 214;
290-
pub const SYS_munmap: ::c_long = 215;
291-
pub const SYS_mremap: ::c_long = 216;
292-
pub const SYS_add_key: ::c_long = 217;
293-
pub const SYS_request_key: ::c_long = 218;
294-
pub const SYS_keyctl: ::c_long = 219;
295-
pub const SYS_clone: ::c_long = 220;
296-
pub const SYS_execve: ::c_long = 221;
297-
pub const SYS_swapon: ::c_long = 224;
298-
pub const SYS_swapoff: ::c_long = 225;
299-
pub const SYS_mprotect: ::c_long = 226;
300-
pub const SYS_msync: ::c_long = 227;
301-
pub const SYS_mlock: ::c_long = 228;
302-
pub const SYS_munlock: ::c_long = 229;
303-
pub const SYS_mlockall: ::c_long = 230;
304-
pub const SYS_munlockall: ::c_long = 231;
305-
pub const SYS_mincore: ::c_long = 232;
306-
pub const SYS_madvise: ::c_long = 233;
307-
pub const SYS_remap_file_pages: ::c_long = 234;
308-
pub const SYS_mbind: ::c_long = 235;
309-
pub const SYS_get_mempolicy: ::c_long = 236;
310-
pub const SYS_set_mempolicy: ::c_long = 237;
311-
pub const SYS_migrate_pages: ::c_long = 238;
312-
pub const SYS_move_pages: ::c_long = 239;
313-
pub const SYS_rt_tgsigqueueinfo: ::c_long = 240;
314-
pub const SYS_perf_event_open: ::c_long = 241;
315-
pub const SYS_accept4: ::c_long = 242;
316-
pub const SYS_recvmmsg: ::c_long = 243;
317-
pub const SYS_wait4: ::c_long = 260;
318-
pub const SYS_prlimit64: ::c_long = 261;
319-
pub const SYS_fanotify_init: ::c_long = 262;
320-
pub const SYS_fanotify_mark: ::c_long = 263;
321-
pub const SYS_name_to_handle_at: ::c_long = 264;
322-
pub const SYS_open_by_handle_at: ::c_long = 265;
323-
pub const SYS_clock_adjtime: ::c_long = 266;
324-
pub const SYS_syncfs: ::c_long = 267;
325-
pub const SYS_setns: ::c_long = 268;
326-
pub const SYS_sendmmsg: ::c_long = 269;
327-
pub const SYS_process_vm_readv: ::c_long = 270;
328-
pub const SYS_process_vm_writev: ::c_long = 271;
329-
pub const SYS_kcmp: ::c_long = 272;
330-
pub const SYS_finit_module: ::c_long = 273;
331-
pub const SYS_sched_setattr: ::c_long = 274;
332-
pub const SYS_sched_getattr: ::c_long = 275;
333-
pub const SYS_renameat2: ::c_long = 276;
334-
pub const SYS_seccomp: ::c_long = 277;
335-
pub const SYS_getrandom: ::c_long = 278;
336-
pub const SYS_memfd_create: ::c_long = 279;
337-
pub const SYS_bpf: ::c_long = 280;
338-
pub const SYS_execveat: ::c_long = 281;
339-
pub const SYS_userfaultfd: ::c_long = 282;
340-
pub const SYS_membarrier: ::c_long = 283;
341-
pub const SYS_mlock2: ::c_long = 284;
342-
pub const SYS_copy_file_range: ::c_long = 285;
343-
pub const SYS_preadv2: ::c_long = 286;
344-
pub const SYS_pwritev2: ::c_long = 287;
345-
pub const SYS_pkey_mprotect: ::c_long = 288;
346-
pub const SYS_pkey_alloc: ::c_long = 289;
347-
pub const SYS_pkey_free: ::c_long = 290;

src/fuchsia/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2596,9 +2596,6 @@ pub const PR_CAP_AMBIENT_RAISE: ::c_int = 2;
25962596
pub const PR_CAP_AMBIENT_LOWER: ::c_int = 3;
25972597
pub const PR_CAP_AMBIENT_CLEAR_ALL: ::c_int = 4;
25982598

2599-
pub const GRND_NONBLOCK: ::c_uint = 0x0001;
2600-
pub const GRND_RANDOM: ::c_uint = 0x0002;
2601-
26022599
pub const ITIMER_REAL: ::c_int = 0;
26032600
pub const ITIMER_VIRTUAL: ::c_int = 1;
26042601
pub const ITIMER_PROF: ::c_int = 2;

0 commit comments

Comments
 (0)