Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/libc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2e500eb2d6077a70a7868bdd9c98045c01f77958
Choose a base ref
..
head repository: rust-lang/libc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 40706961edc0f243ab23bf9af45645f4fde823df
Choose a head ref
Showing with 7 additions and 2 deletions.
  1. +7 −2 src/unix/linux_like/linux/mod.rs
9 changes: 7 additions & 2 deletions src/unix/linux_like/linux/mod.rs
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,13 @@ pub type Elf64_Relr = Elf32_Xword;
pub type Elf32_Rel = __c_anonymous_elf32_rel;
pub type Elf64_Rel = __c_anonymous_elf64_rel;

cfg_if! {
if #[cfg(not(target_arch = "sparc64"))] {
pub type Elf32_Rela = __c_anonymous_elf32_rela;
pub type Elf64_Rela = __c_anonymous_elf64_rela;
}
}

// linux/can.h
pub type canid_t = u32;

@@ -1015,8 +1022,6 @@ s! {

cfg_if! {
if #[cfg(not(target_arch = "sparc64"))] {
pub type Elf32_Rela = __c_anonymous_elf32_rela;
pub type Elf64_Rela = __c_anonymous_elf64_rela;
s!{
pub struct iw_thrspy {
pub addr: ::sockaddr,