fix major font problem when using the Mac OS X 10.5 SDK. Patch by John Daggett. b=397454 r=roc/vlad sr=roc a=pav

gfx/cairo/cairo/src/cairo-atsui-font.c

@@ -40,6 +40,12 @@
 #include "cairo-atsui.h"
 #include "cairo-quartz-private.h"
 
+/* 10.5 SDK includes a funky new definition of FloatToFixed, so reset to old-style definition */
+#ifdef FloatToFixed
+#undef FloatToFixed
+#define FloatToFixed(a)     ((Fixed)((float)(a) * fixed1))
+#endif
+
 /*
  * FixedToFloat/FloatToFixed are 10.3+ SDK items - include definitions
  * here so we can use older SDKs.

gfx/thebes/src/gfxAtsuiFonts.cpp

@@ -67,6 +67,12 @@
 
 #define ROUND(x) (floor((x) + 0.5))
 
+/* 10.5 SDK includes a funky new definition of FloatToFixed, so reset to old-style definition */
+#ifdef FloatToFixed
+#undef FloatToFixed
+#define FloatToFixed(a)     ((Fixed)((float)(a) * fixed1))
+#endif
+
 /* We might still need this for fast-pathing, but we'll see */
 #if 0
 OSStatus ATSUGetStyleGroup(ATSUStyle style, void **styleGroup);