diff options
| author | Marco A L Barbosa <malbarbo@gmail.com> | 2017-10-18 20:32:44 -0200 |
|---|---|---|
| committer | Marco A L Barbosa <malbarbo@gmail.com> | 2017-10-18 21:20:18 -0200 |
| commit | a5bd4b5668587d829669d13173adda1d2a889e93 (patch) | |
| tree | 6a39449a8beedb3e9072279f9befa8f72baf8ef9 | |
| parent | 1ff381788748c472bef01452b19c9f128570f219 (diff) | |
| download | rust-libc-a5bd4b5668587d829669d13173adda1d2a889e93.tar.gz | |
Fix style
| -rw-r--r-- | src/unix/notbsd/linux/other/b64/aarch64.rs | 1 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/other/b64/powerpc64.rs | 1 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/other/mod.rs | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/unix/notbsd/linux/other/b64/aarch64.rs b/src/unix/notbsd/linux/other/b64/aarch64.rs index 0496600a59..c213f13c5c 100644 --- a/src/unix/notbsd/linux/other/b64/aarch64.rs +++ b/src/unix/notbsd/linux/other/b64/aarch64.rs @@ -487,7 +487,6 @@ pub const TIOCSWINSZ: ::c_ulong = 0x5414; pub const FIONREAD: ::c_ulong = 0x541B; // Syscall table -<<<<<<< HEAD pub const SYS_io_setup: ::c_ulong = 0; pub const SYS_io_destroy: ::c_ulong = 1; pub const SYS_io_submit: ::c_ulong = 2; diff --git a/src/unix/notbsd/linux/other/b64/powerpc64.rs b/src/unix/notbsd/linux/other/b64/powerpc64.rs index c1c8695b82..14e5cdfa9c 100644 --- a/src/unix/notbsd/linux/other/b64/powerpc64.rs +++ b/src/unix/notbsd/linux/other/b64/powerpc64.rs @@ -484,7 +484,6 @@ pub const TIOCSWINSZ: ::c_ulong = 0x80087467; pub const FIONREAD: ::c_ulong = 0x4004667f; // Syscall table -<<<<<<< HEAD pub const SYS_restart_syscall: ::c_ulong = 0; pub const SYS_exit: ::c_ulong = 1; pub const SYS_fork: ::c_ulong = 2; diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs index 99353b146b..2013e60be1 100644 --- a/src/unix/notbsd/linux/other/mod.rs +++ b/src/unix/notbsd/linux/other/mod.rs @@ -44,7 +44,8 @@ s! { #[cfg(any(target_arch = "aarch64", target_arch = "sparc64", - all(target_pointer_width = "32", not(target_arch = "x86_64"))))] + all(target_pointer_width = "32", + not(target_arch = "x86_64"))))] pub ut_session: ::c_long, #[cfg(any(target_arch = "aarch64", target_arch = "sparc64", @@ -53,7 +54,8 @@ s! { #[cfg(not(any(target_arch = "aarch64", target_arch = "sparc64", - all(target_pointer_width = "32", not(target_arch = "x86_64")))))] + all(target_pointer_width = "32", + not(target_arch = "x86_64")))))] pub ut_session: ::int32_t, #[cfg(not(any(target_arch = "aarch64", target_arch = "sparc64", |