--- a/jdk/src/java.desktop/share/native/libfontmanager/hb-jdk.h	Tue Sep 06 13:03:00 2016 +0300
+++ b/jdk/src/java.desktop/share/native/libfontmanager/hb-jdk.h	Tue Sep 06 08:32:50 2016 -0700
@@ -49,8 +49,8 @@
 
 
 // Use 16.16 for better precision than 26.6
-#define FloatToFixedScale ((float)(1 << 16))
-#define FloatToFixed(f) ((unsigned int)((f) * FloatToFixedScale))
+#define HBFloatToFixedScale ((float)(1 << 16))
+#define HBFloatToFixed(f) ((unsigned int)((f) * HBFloatToFixedScale))
 
 /*
  * Note: