Skip to content

Commit

Permalink
Auto merge of #3016 - cppcoffee:master, r=JohnTitor
Browse files Browse the repository at this point in the history
mips32: fix missing __s64 type definition

The compilation error message:

```shell
$ cargo build hello --target mipsel-unknown-linux-uclibc
...
error[E0412]: cannot find type `__s64` in the crate root
   --> /root/.cargo/registry/src/github.com-1ecc6299db9ec823/libc-0.2.137/src/unix/linux_like/linux/mod.rs:601:23
    |
601 |         pub src_fd: ::__s64,
    |                       ^^^^^ help: a type alias with a similar name exists: `__u64`
    |
   ::: /root/.cargo/registry/src/github.com-1ecc6299db9ec823/libc-0.2.137/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs:15:1
    |
15  | pub type __u64 = ::c_ulonglong;
    | ------------------------------- similarly named type alias `__u64` defined here

For more information about this error, try `rustc --explain E0412`.
```

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
  • Loading branch information
bors committed Nov 27, 2022
2 parents 605f6c3 + 2d8ed5c commit 1294fec
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs
Expand Up @@ -13,6 +13,7 @@ pub type nlink_t = u32;
pub type fsblkcnt_t = ::c_ulong;
pub type fsfilcnt_t = ::c_ulong;
pub type __u64 = ::c_ulonglong;
pub type __s64 = ::c_longlong;
pub type fsblkcnt64_t = u64;
pub type fsfilcnt64_t = u64;

Expand Down

0 comments on commit 1294fec

Please sign in to comment.