From e4362dad737beeba8b962a603d25adf2652b8cb3 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Tue, 25 Nov 2014 17:30:46 -0700
Subject: [PATCH] Fixes for Linux.

---
 ports/cef/browser.rs | 1 +
 ports/cef/macros.rs  | 1 +
 ports/cef/types.rs   | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/cef/browser.rs b/ports/cef/browser.rs
index fa018079e2b..ee7652ded98 100644
--- a/ports/cef/browser.rs
+++ b/ports/cef/browser.rs
@@ -87,6 +87,7 @@ cef_static_method_impls! {
         browser_host_create(client, false);
         1i32
     }
+
     fn cef_browser_host_create_browser_sync(_window_info: *const cef_window_info_t,
                                             client: *mut cef_client_t,
                                             _url: *const cef_string_t,
diff --git a/ports/cef/macros.rs b/ports/cef/macros.rs
index fa72b72f48a..4debc353555 100644
--- a/ports/cef/macros.rs
+++ b/ports/cef/macros.rs
@@ -92,6 +92,7 @@ macro_rules! cef_static_method_impls(
         )*
     ) => (
         $(
+            #[no_mangle]
             pub extern "C" fn $method_name($($method_arg_name: $method_arg_type),*)
                                            -> $method_return_type {
                 $(
diff --git a/ports/cef/types.rs b/ports/cef/types.rs
index c29be3bac9a..66809dc0223 100644
--- a/ports/cef/types.rs
+++ b/ports/cef/types.rs
@@ -2,7 +2,11 @@
  * 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 libc::{c_uint, c_ushort, c_int, c_double, size_t, c_void};
+use libc::{c_uint, c_ushort, c_int, c_double, size_t};
+#[cfg(target_os="linux")]
+use libc::c_ulong;
+#[cfg(target_os="macos")]
+use libc::c_void;
 use libc::types::os::arch::c95::wchar_t;
 
 pub use self::cef_rect as cef_rect_t;