Misc fixes in goom, freetype and warning in last.fm

[vlc] / modules / misc / freetype.c

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 90edcdbcf0bab9d6d93fe9aba404ff77fb952c10..fbc9be845c629f94a9045a03dd5c44f6a0d26b4b 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -49,7 +49,9 @@
 #include FT_GLYPH_H
 #define FT_FLOOR(X)     ((X & -64) >> 6)
 #define FT_CEIL(X)      (((X + 63) & -64) >> 6)
-#define FT_MulFix(v, s) (((v)*(s))>>16)
+#ifndef FT_MulFix
+ #define FT_MulFix(v, s) (((v)*(s))>>16)
+#endif
 
 #ifdef __APPLE__
 #define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont"