Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #5444 : servo/servo/gonk-warnings, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-03-29 17:54:59 -06:00
commit acf98dcccd
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ports/gonk/build.rs
View file

@ -2,18 +2,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use std::old_io::process::{Command, ProcessExit, StdioContainer}; use std::env;
use std::os; use std::process::{Command, Stdio};
fn main() { fn main() {
let out_dir = os::getenv("OUT_DIR").unwrap(); let out_dir = env::var("OUT_DIR").unwrap();
let result = Command::new("make") let result = Command::new("make")
.args(&["-f", "makefile.cargo"]) .args(&["-f", "makefile.cargo"])
.stdout(StdioContainer::InheritFd(1))
.stderr(StdioContainer::InheritFd(2))
.status() .status()
.unwrap(); .unwrap();
assert_eq!(result, ProcessExit::ExitStatus(0)); assert!(result.success());
println!("cargo:rustc-flags=-L native={}", out_dir); println!("cargo:rustc-flags=-L native={}", out_dir);
} }

16
ports/gonk/src/window.rs
View file

@ -91,13 +91,13 @@ pub struct ANativeWindow {
//dequeueBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut *mut ANativeWindowBuffer) -> c_int, //dequeueBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut *mut ANativeWindowBuffer) -> c_int,
//lockBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer) -> c_int, //lockBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer) -> c_int,
//queueBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer) -> c_int, //queueBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer) -> c_int,
dequeueBuffer_DEPRECATED: int, dequeueBuffer_DEPRECATED: *const c_void,
lockBuffer_DEPRECATED: int, lockBuffer_DEPRECATED: *const c_void,
queueBuffer_DEPRECATED: int, queueBuffer_DEPRECATED: *const c_void,
query: extern fn(*const ANativeWindow, c_int, *mut c_int) -> c_int, query: extern fn(*const ANativeWindow, c_int, *mut c_int) -> c_int,
perform: extern fn(*mut ANativeWindow, c_int, ...) -> c_int, perform: extern fn(*mut ANativeWindow, c_int, ...) -> c_int,
//cancelBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer) -> c_int, //cancelBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer) -> c_int,
cancelBuffer_DEPRECATED: int, cancelBuffer_DEPRECATED: *const c_void,
dequeueBuffer: extern fn(*mut ANativeWindow, *mut *mut ANativeWindowBuffer, *mut c_int) -> c_int, dequeueBuffer: extern fn(*mut ANativeWindow, *mut *mut ANativeWindowBuffer, *mut c_int) -> c_int,
queueBuffer: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer, c_int) -> c_int, queueBuffer: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer, c_int) -> c_int,
cancelBuffer: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer, c_int) -> c_int, cancelBuffer: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer, c_int) -> c_int,
@ -469,12 +469,12 @@ impl GonkNativeWindow {
ydpi: 0f32, ydpi: 0f32,
oem: unsafe { zeroed() }, oem: unsafe { zeroed() },
setSwapInterval: setSwapInterval, setSwapInterval: setSwapInterval,
dequeueBuffer_DEPRECATED: 0, dequeueBuffer_DEPRECATED: ptr::null(),
lockBuffer_DEPRECATED: 0, lockBuffer_DEPRECATED: ptr::null(),
queueBuffer_DEPRECATED: 0, queueBuffer_DEPRECATED: ptr::null(),
query: query, query: query,
perform: unsafe { transmute(gnw_perform) }, perform: unsafe { transmute(gnw_perform) },
cancelBuffer_DEPRECATED: 0, cancelBuffer_DEPRECATED: ptr::null(),
dequeueBuffer: dequeueBuffer, dequeueBuffer: dequeueBuffer,
queueBuffer: queueBuffer, queueBuffer: queueBuffer,
cancelBuffer: cancelBuffer, cancelBuffer: cancelBuffer,