From c316c86e7c5996e0b0965682f4260d20191e5b6d Mon Sep 17 00:00:00 2001 From: Tomaka17 Date: Fri, 10 Oct 2014 17:39:11 +0200 Subject: Update for rustc f9fc49c06 2014-10-10 00:07:08 +0000 --- src/android/ffi.rs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/android') diff --git a/src/android/ffi.rs b/src/android/ffi.rs index 583109f..a7482e3 100644 --- a/src/android/ffi.rs +++ b/src/android/ffi.rs @@ -1,6 +1,7 @@ #![allow(dead_code)] #![allow(non_snake_case)] #![allow(non_camel_case_types)] +#![allow(non_uppercase_statics)] use libc; @@ -113,17 +114,17 @@ extern { pub fn ALooper_removeFd(looper: *const ALooper, fd: libc::c_int) -> libc::c_int; } -pub static ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: libc::c_int = 1 << 0; +pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: libc::c_int = 1 << 0; -pub static ALOOPER_POLL_WAKE: libc::c_int = -1; -pub static ALOOPER_POLL_CALLBACK: libc::c_int = -2; -pub static ALOOPER_POLL_TIMEOUT: libc::c_int = -3; -pub static ALOOPER_POLL_ERROR: libc::c_int = -4; +pub const ALOOPER_POLL_WAKE: libc::c_int = -1; +pub const ALOOPER_POLL_CALLBACK: libc::c_int = -2; +pub const ALOOPER_POLL_TIMEOUT: libc::c_int = -3; +pub const ALOOPER_POLL_ERROR: libc::c_int = -4; -pub static ALOOPER_EVENT_INPUT: libc::c_int = 1 << 0; -pub static ALOOPER_EVENT_OUTPUT: libc::c_int = 1 << 1; -pub static ALOOPER_EVENT_ERROR: libc::c_int = 1 << 2; -pub static ALOOPER_EVENT_HANGUP: libc::c_int = 1 << 3; -pub static ALOOPER_EVENT_INVALID: libc::c_int = 1 << 4; +pub const ALOOPER_EVENT_INPUT: libc::c_int = 1 << 0; +pub const ALOOPER_EVENT_OUTPUT: libc::c_int = 1 << 1; +pub const ALOOPER_EVENT_ERROR: libc::c_int = 1 << 2; +pub const ALOOPER_EVENT_HANGUP: libc::c_int = 1 << 3; +pub const ALOOPER_EVENT_INVALID: libc::c_int = 1 << 4; pub type ALooper_callbackFunc = extern fn(libc::c_int, libc::c_int, *mut libc::c_void) -> libc::c_int; -- cgit v1.2.3