Mercurial > mplayer.hg

changeset 20469:54babf7ca302

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If HAVE_FONTCONFIG is not defined, font_fontconfig might be declared both extern and static, causing compilation to fail
author reimar
date Sat, 28 Oct 2006 10:21:30 +0000
parents 7fdcfb0dbc1d
children 054516eecb9b
files libass/ass_mp.c
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_mp.c	Sat Oct 28 10:06:11 2006 +0000
+++ b/libass/ass_mp.c	Sat Oct 28 10:21:30 2006 +0000
@@ -41,7 +41,11 @@
 char* ass_border_color = NULL;
 char* ass_styles_file = NULL;
 
+#ifdef HAVE_FONTCONFIG
 extern int font_fontconfig;
+#else
+static int font_fontconfig = 0;
+#endif
 extern char* font_name;
 extern float text_font_scale_factor;
 extern int subtitle_autoscale;
@@ -200,11 +204,6 @@
 char *get_path(char *);
 
 extern char *font_name;
-#ifdef HAVE_FONTCONFIG
-extern int font_fontconfig;
-#else
-static int font_fontconfig = 0;
-#endif
 
 void ass_configure(ass_instance_t* priv, int w, int h) {
 	char *dir, *path, *family;