[vlc-commits] Freetype: rename HAVE_STYLES
Jean-Baptiste Kempf
git at videolan.org
Sun Dec 15 17:41:33 CET 2013
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Dec 15 17:40:51 2013 +0100| [f3f09df31f7e25189c24fe6dadc2fd21992dc5ca] | committer: Jean-Baptiste Kempf
Freetype: rename HAVE_STYLES
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f3f09df31f7e25189c24fe6dadc2fd21992dc5ca
---
modules/text_renderer/freetype.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index 5007810..9769258 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -65,18 +65,18 @@
#ifdef __APPLE__
# include <TargetConditionals.h>
# undef HAVE_FONTCONFIG
-# define HAVE_STYLES
+# define HAVE_GET_FONT_BY_FAMILY_NAME
#endif
/* Win32 */
#ifdef _WIN32
# undef HAVE_FONTCONFIG
-# define HAVE_STYLES
+# define HAVE_GET_FONT_BY_FAMILY_NAME
#endif
/* FontConfig */
#ifdef HAVE_FONTCONFIG
-# define HAVE_STYLES
+# define HAVE_GET_FONT_BY_FAMILY_NAME
#endif
#include <assert.h>
@@ -159,7 +159,7 @@ vlc_module_begin ()
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC )
-#ifdef HAVE_STYLES
+#ifdef HAVE_GET_FONT_BY_FAMILY_NAME
add_font( "freetype-font", DEFAULT_FAMILY, FONT_TEXT, FAMILY_LONGTEXT, false )
add_font( "freetype-monofont", DEFAULT_MONOSPACE_FAMILY, MONOSPACE_FONT_TEXT, FAMILY_LONGTEXT, false )
#else
@@ -1919,7 +1919,7 @@ static int Create( vlc_object_t *p_this )
if( !psz_fontname || !*psz_fontname )
{
free( psz_fontname );
-#ifdef HAVE_STYLES
+#ifdef HAVE_GET_FONT_BY_FAMILY_NAME
psz_fontname = strdup( DEFAULT_FAMILY );
#else
psz_fontname = File_Select( DEFAULT_FONT_FILE );
More information about the vlc-commits
mailing list