From d926b8342b492cfa442a72b4d4da01e7e23d9cba Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 29 Mar 2015 14:36:11 +0200
Subject: [PATCH 1/2] Update gonk's build.rs.

---
 ports/gonk/build.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/gonk/build.rs b/ports/gonk/build.rs
index 1e3d07fa18c..e2017fdeff0 100644
--- a/ports/gonk/build.rs
+++ b/ports/gonk/build.rs
@@ -2,18 +2,15 @@
  * 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/. */
 
-use std::old_io::process::{Command, ProcessExit, StdioContainer};
-use std::os;
-
+use std::env;
+use std::process::{Command, Stdio};
 
 fn main() {
-    let out_dir = os::getenv("OUT_DIR").unwrap();
+    let out_dir = env::var("OUT_DIR").unwrap();
     let result = Command::new("make")
         .args(&["-f", "makefile.cargo"])
-        .stdout(StdioContainer::InheritFd(1))
-        .stderr(StdioContainer::InheritFd(2))
         .status()
         .unwrap();
-    assert_eq!(result, ProcessExit::ExitStatus(0));
+    assert!(result.success());
     println!("cargo:rustc-flags=-L native={}", out_dir);
 }

From 98c5da7e2e7fe070fc442c2b4a959eece34eb5a0 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 29 Mar 2015 14:36:38 +0200
Subject: [PATCH 2/2] Stop using int in ANativeWindow.

---
 ports/gonk/src/window.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/gonk/src/window.rs b/ports/gonk/src/window.rs
index 982a11aa7fe..7a4f325f8cf 100644
--- a/ports/gonk/src/window.rs
+++ b/ports/gonk/src/window.rs
@@ -91,13 +91,13 @@ pub struct ANativeWindow {
     //dequeueBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut *mut ANativeWindowBuffer) -> c_int,
     //lockBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer) -> c_int,
     //queueBuffer_DEPRECATED: extern fn(*mut ANativeWindow, *mut ANativeWindowBuffer) -> c_int,
-    dequeueBuffer_DEPRECATED: int,
-    lockBuffer_DEPRECATED: int,
-    queueBuffer_DEPRECATED: int,
+    dequeueBuffer_DEPRECATED: *const c_void,
+    lockBuffer_DEPRECATED: *const c_void,
+    queueBuffer_DEPRECATED: *const c_void,
     query: extern fn(*const ANativeWindow, c_int, *mut 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: int,
+    cancelBuffer_DEPRECATED: *const c_void,
     dequeueBuffer: extern fn(*mut ANativeWindow, *mut *mut ANativeWindowBuffer, *mut 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,
@@ -469,12 +469,12 @@ impl GonkNativeWindow {
                 ydpi: 0f32,
                 oem: unsafe { zeroed() },
                 setSwapInterval: setSwapInterval,
-                dequeueBuffer_DEPRECATED: 0,
-                lockBuffer_DEPRECATED: 0,
-                queueBuffer_DEPRECATED: 0,
+                dequeueBuffer_DEPRECATED: ptr::null(),
+                lockBuffer_DEPRECATED: ptr::null(),
+                queueBuffer_DEPRECATED: ptr::null(),
                 query: query,
                 perform: unsafe { transmute(gnw_perform) },
-                cancelBuffer_DEPRECATED: 0,
+                cancelBuffer_DEPRECATED: ptr::null(),
                 dequeueBuffer: dequeueBuffer,
                 queueBuffer: queueBuffer,
                 cancelBuffer: cancelBuffer,