--- old/src/java.desktop/share/native/libfontmanager/HBShaper.c	2016-09-02 11:40:29.000000000 -0700
+++ new/src/java.desktop/share/native/libfontmanager/HBShaper.c	2016-09-02 11:40:29.000000000 -0700
@@ -80,7 +80,7 @@
     int i, needToGrow;
     float x=0, y=0;
     float startX, startY, advX, advY;
-    float scale = 1.0f / FloatToFixedScale / devScale;
+    float scale = 1.0f / HBFloatToFixedScale / devScale;
     unsigned int* glyphs;
     float* positions;
     int initialCount, glyphArrayLen, posArrayLen, maxGlyphs, storeadv, maxStore;