mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 09:45:41 +00:00
servo: Merge #25 - Fix build errors: use extern keyword (from tuncer:extern)
Source-Repo: https://github.com/servo/servo Source-Revision: 18506978ca7083a7290b7f0c6204ec33f201fc46
This commit is contained in:
parent
3bf95a5dec
commit
7022217dae
@ -77,9 +77,9 @@ fn do_draw(sender: chan<AzDrawTargetRef>,
|
||||
|
||||
listen(|data_ch: chan<[u8]>| {
|
||||
|
||||
crust fn write_fn(closure: *c_void,
|
||||
data: *c_uchar,
|
||||
len: c_uint)
|
||||
extern fn write_fn(closure: *c_void,
|
||||
data: *c_uchar,
|
||||
len: c_uint)
|
||||
|
||||
-> cairo_status_t unsafe {
|
||||
|
||||
|
@ -271,7 +271,7 @@ mod platform {
|
||||
}
|
||||
|
||||
mod MainObj {
|
||||
crust fn applicationDidFinishLaunching(this: id, _sel: SEL) {
|
||||
extern fn applicationDidFinishLaunching(this: id, _sel: SEL) {
|
||||
#debug("applicationDidFinishLaunching");
|
||||
|
||||
let fptr: *fn() = ptr::null();
|
||||
|
@ -101,7 +101,7 @@ fn shape_text(font: &Font, text: str) -> [Glyph] unsafe {
|
||||
ret glyphs;
|
||||
}
|
||||
|
||||
crust fn glyph_func(_font: *hb_font_t,
|
||||
extern fn glyph_func(_font: *hb_font_t,
|
||||
font_data: *c_void,
|
||||
unicode: hb_codepoint_t,
|
||||
_variant_selector: hb_codepoint_t,
|
||||
@ -122,10 +122,10 @@ crust fn glyph_func(_font: *hb_font_t,
|
||||
} as hb_bool_t;
|
||||
}
|
||||
|
||||
crust fn glyph_h_advance_func(_font: *hb_font_t,
|
||||
font_data: *c_void,
|
||||
glyph: hb_codepoint_t,
|
||||
_user_data: *c_void) -> hb_position_t unsafe {
|
||||
extern fn glyph_h_advance_func(_font: *hb_font_t,
|
||||
font_data: *c_void,
|
||||
glyph: hb_codepoint_t,
|
||||
_user_data: *c_void) -> hb_position_t unsafe {
|
||||
let font: *Font = reinterpret_cast(font_data);
|
||||
assert font.is_not_null();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user