Skip to content
Permalink
Browse files

empty enum replaces c_void

fix incorrect type aliasing logic

remove trailing semicolons

remove trailing semicolons

embedding: empty enum replaces c_void
  • Loading branch information...
ajnirp committed Nov 14, 2014
1 parent 10cd772 commit ab6a2308391075541ef90ee8b112edc64dd63c06
Showing with 32 additions and 22 deletions.
  1. +32 −22 ports/cef/types.rs
@@ -5,30 +5,40 @@
use libc::{c_uint, c_ushort, c_int, c_double, size_t, c_void, c_longlong};
use libc::types::os::arch::c95::wchar_t;

pub type cef_string_map_t = c_void;
pub type cef_string_list_t = c_void;
pub type cef_text_input_context_t = c_void;
pub type cef_event_handle_t = c_void;
pub enum cef_string_map_t {}
pub enum cef_string_list_t {}
pub enum cef_text_input_context_t {}
pub enum cef_event_handle_t {}

//these all need to be done...
pub type cef_binary_value = *mut c_void;
pub type cef_dictionary_value = *mut c_void;
pub type cef_client_t = c_void;
pub type cef_request_t = c_void;
pub type cef_response_t = c_void;
pub type cef_urlrequest_client_t = c_void;
pub type cef_frame = *mut c_void;
pub type cef_domnode = *mut c_void;
pub type cef_load_handler = *mut c_void;
pub type cef_request = *mut c_void;
pub type cef_navigation_type = *mut c_void;
pub type cef_request_context_t = c_void;
pub type cef_window_info_t = c_void;
pub type cef_browser_settings_t = c_void;
pub type cef_v8context = *mut c_void;
pub type cef_v8exception = *mut c_void;
pub type cef_v8stack_trace = *mut c_void;
pub type cef_window_handle_t = c_void; //FIXME: wtf is this
pub enum cef_binary_value_val {}
pub type cef_binary_value = *mut cef_binary_value_val;
pub enum cef_dictionary_value_val {}
pub type cef_dictionary_value = *mut cef_dictionary_value_val;
pub enum cef_client_t {}
pub enum cef_request_t {}
pub enum cef_response_t {}
pub enum cef_urlrequest_client_t {}
pub enum cef_frame_val {}
pub type cef_frame = *mut cef_frame_val;
pub enum cef_domnode_val {}
pub type cef_domnode = *mut cef_domnode_val;
pub enum cef_load_handler_val {}
pub type cef_load_handler = *mut cef_load_handler_val;
pub enum cef_request_val {}
pub type cef_request = *mut cef_request_val;
pub enum cef_navigation_type_val {}
pub type cef_navigation_type = *mut cef_navigation_type_val;
pub enum cef_request_context_t {}
pub enum cef_window_info_t {}
pub enum cef_browser_settings_t {}
pub enum cef_v8context_val {}
pub type cef_v8context = *mut cef_v8context_val;
pub enum cef_v8exception_val {}
pub type cef_v8exception = *mut cef_v8exception_val;
pub enum cef_v8stack_trace_val {}
pub type cef_v8stack_trace = *mut cef_v8stack_trace_val;
pub enum cef_window_handle_t {} //FIXME: wtf is this

pub type cef_string_t = cef_string_utf8; //FIXME: this is #defined...
pub type cef_string_userfree_t = cef_string_t; //FIXME: this is #defined...

14 comments on commit ab6a230

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 14, 2014

saw approval from jdm
at ajnirp@ab6a230

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 14, 2014

merging wenderen/servo/cef-empty-enums = ab6a230 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 14, 2014

wenderen/servo/cef-empty-enums = ab6a230 merged ok, testing candidate = f9bcd46

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 14, 2014

@Manishearth

This comment has been minimized.

Copy link
Member

Manishearth replied Nov 14, 2014

@bors: retry

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 14, 2014

saw approval from jdm
at ajnirp@ab6a230

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 14, 2014

merging wenderen/servo/cef-empty-enums = ab6a230 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 14, 2014

wenderen/servo/cef-empty-enums = ab6a230 merged ok, testing candidate = 34093aa

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 14, 2014

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 15, 2014

saw approval from jdm
at ajnirp@ab6a230

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 15, 2014

merging wenderen/servo/cef-empty-enums = ab6a230 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 15, 2014

wenderen/servo/cef-empty-enums = ab6a230 merged ok, testing candidate = 0ab70dd

@bors-servo

This comment has been minimized.

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 15, 2014

fast-forwarding master to auto = 0ab70dd

Please sign in to comment.
You can’t perform that action at this time.