Bug 1520188. Use uppercase for func name. r=lsalzman
authorJeff Muizelaar <jrmuizel@gmail.com>
Tue, 15 Jan 2019 17:40:34 +0000
changeset 453954 3965ba4c93b0abad99169221725928084d7f759e
parent 453953 53c350ccfd5b5b39fdef94f4ecf37f29c70aed60
child 453955 a51d26029042fb10cca386c3150fc2c912a442a2
push id35380
push userdluca@mozilla.com
push dateTue, 15 Jan 2019 22:13:12 +0000
treeherdermozilla-central@a51d26029042 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsalzman
bugs1520188
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1520188. Use uppercase for func name. r=lsalzman Differential Revision: https://phabricator.services.mozilla.com/D16567
gfx/wr/webrender/src/platform/unix/font.rs
--- a/gfx/wr/webrender/src/platform/unix/font.rs
+++ b/gfx/wr/webrender/src/platform/unix/font.rs
@@ -81,25 +81,25 @@ pub fn unimplemented(error: FT_Error) ->
 macro_rules! ft_dyn_fn {
     ($func_name:ident($($arg_name:ident:$arg_type:ty),*) -> FT_Error) => {
         #[allow(non_snake_case)]
         unsafe fn $func_name($($arg_name:$arg_type),*) -> FT_Error {
             extern "C" fn unimpl_func($(_:$arg_type),*) -> FT_Error {
                 FT_Err_Unimplemented_Feature as FT_Error
             }
             lazy_static! {
-                static ref func: unsafe extern "C" fn($($arg_type),*) -> FT_Error = {
+                static ref FUNC: unsafe extern "C" fn($($arg_type),*) -> FT_Error = {
                     unsafe {
                         let cname = CString::new(stringify!($func_name)).unwrap();
                         let ptr = dlsym(RTLD_DEFAULT, cname.as_ptr());
                         if !ptr.is_null() { mem::transmute(ptr) } else { unimpl_func }
                     }
                 };
             }
-            (*func)($($arg_name),*)
+            (*FUNC)($($arg_name),*)
         }
     }
 }
 
 // On Android, just statically link in the symbols...
 #[cfg(all(target_os = "android", not(feature = "no_static_freetype")))]
 macro_rules! ft_dyn_fn {
     ($($proto:tt)+) => { extern "C" { fn $($proto)+; } }