Stop using int in ANativeWindow.

This commit is contained in:
Ms2ger 2015-03-29 14:36:38 +02:00
parent d926b8342b
commit 98c5da7e2e

View file

@ -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,