Skip to content
Permalink
Browse files

Use 'alloc' gate only for platforms which use freetype in gfx

  • Loading branch information
tetsuharuohzeki committed Feb 6, 2017
1 parent fb4f421 commit 550d726ad2f9996f3750b90e19e440b3e8fc9fe4
Showing with 5 additions and 4 deletions.
  1. +4 −1 components/gfx/lib.rs
  2. +1 −3 components/gfx/platform/freetype/font_context.rs
@@ -6,7 +6,7 @@
#![feature(cfg_target_feature)]
#![cfg_attr(any(target_os = "linux", target_os = "android"), feature(heap_api))]

#![feature(alloc)]
#![cfg_attr(any(target_os = "linux", target_os = "android"), feature(alloc))]
#![feature(box_syntax)]
#![feature(plugin)]
#![feature(range_contains)]
@@ -16,6 +16,9 @@

#![deny(unsafe_code)]

#[cfg(any(target_os = "linux", target_os = "android"))]
extern crate alloc;

extern crate app_units;
#[macro_use]
extern crate bitflags;
@@ -2,16 +2,14 @@
* 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/. */

extern crate alloc;

use alloc::heap;
use freetype::freetype::FT_Add_Default_Modules;
use freetype::freetype::FT_Done_Library;
use freetype::freetype::FT_Library;
use freetype::freetype::FT_Memory;
use freetype::freetype::FT_MemoryRec_;
use freetype::freetype::FT_New_Library;
use heapsize::{HeapSizeOf, heap_size_of};
use self::alloc::heap;
use std::os::raw::{c_long, c_void};
use std::ptr;
use std::rc::Rc;

0 comments on commit 550d726

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