Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Port cef-sys to stable #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port cef-sys to stable #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cef-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ license = "MIT"
links = "cef"
build = "build.rs"

exclude = [ "*~", "*.racertmp" ]
exclude = [ "*~", "*.racertmp" ]

[dependencies]
libc = "0.2.4"
7 changes: 1 addition & 6 deletions cef-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
#![feature(result_expect, path_ext)]

//use std::os;
//use std::old_io::fs::PathExtensions;

enum Platform {
Windows,
Mac,
Expand All @@ -20,8 +15,8 @@ fn get_platform() -> Platform {

fn main() {
use std::path::Path;
use std::fs::PathExt;
use std::env::consts;

let dll_name = match get_platform() {
Platform::Mac => return, // CEF_PATH is not necessarily needed for Mac
Platform::Windows => "libcef",
Expand Down
3 changes: 1 addition & 2 deletions cef-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![feature(libc, negate_unsigned)]
#![allow(non_camel_case_types, non_snake_case, raw_pointer_derive, missing_copy_implementations, improper_ctypes)]
#![allow(non_camel_case_types, non_snake_case, missing_copy_implementations, improper_ctypes)]
extern crate libc;

#[cfg(target_os="linux")]
Expand Down
9 changes: 5 additions & 4 deletions cef-sys/src/mac.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use libc::size_t;
use libc::wchar_t;
use libc::time_t;
use std::u32;

/* automatically generated by rust-bindgen */

Expand Down Expand Up @@ -306,7 +307,7 @@ pub const DRAG_OPERATION_GENERIC: ::libc::c_uint = 4;
pub const DRAG_OPERATION_PRIVATE: ::libc::c_uint = 8;
pub const DRAG_OPERATION_MOVE: ::libc::c_uint = 16;
pub const DRAG_OPERATION_DELETE: ::libc::c_uint = 32;
pub const DRAG_OPERATION_EVERY: ::libc::c_uint = -1;
pub const DRAG_OPERATION_EVERY: ::libc::c_uint = u32::MAX;
pub type cef_drag_operations_mask_t = Enum_Unnamed7;
pub type Enum_Unnamed8 = ::libc::c_uint;
pub const V8_ACCESS_CONTROL_DEFAULT: ::libc::c_uint = 0;
Expand Down Expand Up @@ -356,9 +357,9 @@ pub const TT_FORWARD_BACK_FLAG: ::libc::c_uint = 16777216;
pub const TT_CHAIN_START_FLAG: ::libc::c_uint = 268435456;
pub const TT_CHAIN_END_FLAG: ::libc::c_uint = 536870912;
pub const TT_CLIENT_REDIRECT_FLAG: ::libc::c_uint = 1073741824;
pub const TT_SERVER_REDIRECT_FLAG: ::libc::c_uint = -2147483648;
pub const TT_IS_REDIRECT_MASK: ::libc::c_uint = -1073741824;
pub const TT_QUALIFIER_MASK: ::libc::c_uint = -256;
pub const TT_SERVER_REDIRECT_FLAG: ::libc::c_uint = 0x80000000;
pub const TT_IS_REDIRECT_MASK: ::libc::c_uint = 0xC0000000;
pub const TT_QUALIFIER_MASK: ::libc::c_uint = 0xFFFFFF00;
pub type cef_transition_type_t = Enum_Unnamed12;
pub type Enum_Unnamed13 = ::libc::c_uint;
pub const UR_FLAG_NONE: ::libc::c_uint = 0;
Expand Down