Fix style

This commit is contained in:
Marco A L Barbosa 2017-10-18 20:32:44 -02:00
parent 1ff3817887
commit a5bd4b5668
3 changed files with 4 additions and 4 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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",