diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-01-10 14:46:38 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-01-11 09:18:56 -0800 |
| commit | 2d0593028bc711583ada5ed9a31e51e687f63bd8 (patch) | |
| tree | b0e1f59efba3d9a6e471008c72da420e291fe09d | |
| parent | 0422dbaabdf250e3b04a35a4e70472c71c1126b7 (diff) | |
| parent | 0b102fdf472537ea96e5fc8b042e78562cd0d08e (diff) | |
| download | rust-libc-2d0593028bc711583ada5ed9a31e51e687f63bd8.tar.gz | |
Merge branch 'android-posix-memalign' of https://github.com/tamird/libc into merge
| -rw-r--r-- | src/unix/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 6a05d82d26..ee3a974576 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -294,6 +294,9 @@ extern { link_name = "pause$UNIX2003")] pub fn pause() -> ::c_int; pub fn pipe(fds: *mut ::c_int) -> ::c_int; + pub fn posix_memalign(memptr: *mut *mut ::c_void, + align: ::size_t, + size: ::size_t) -> ::c_int; #[cfg_attr(all(target_os = "macos", target_arch = "x86"), link_name = "read$UNIX2003")] pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t) @@ -624,9 +627,6 @@ extern { buf: *mut ::c_char, buflen: ::size_t, result: *mut *mut passwd) -> ::c_int; - pub fn posix_memalign(memptr: *mut *mut ::c_void, - align: ::size_t, - size: ::size_t) -> ::c_int; #[cfg_attr(target_os = "netbsd", link_name = "__sigemptyset14")] pub fn sigemptyset(set: *mut sigset_t) -> ::c_int; #[cfg_attr(target_os = "netbsd", link_name = "__sigaddset14")] |