summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-01 20:28:58 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-01 20:28:58 +0000
commitd17f9943af8aeeca65b327ad22475b4df36a3b2d (patch)
tree2e92c593409a4e3222d2524460178cf133af8f86 /libvo
parent95c0b67d60690dfca422eab3d28bdac9a3e46921 (diff)
downloadmpv-d17f9943af8aeeca65b327ad22475b4df36a3b2d.tar.bz2
mpv-d17f9943af8aeeca65b327ad22475b4df36a3b2d.tar.xz
Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/font_load_ft.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index 34749d5232..63368f3f77 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -16,7 +16,7 @@
#include <math.h>
#include <string.h>
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
#include <iconv.h>
#endif
@@ -716,7 +716,7 @@ static int generate_tables(font_desc_t *desc, double thickness, double radius)
return 0;
}
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
/* decode from 'encoding' to unicode */
static FT_ULong decode_char(iconv_t *cd, char c) {
FT_ULong o;
@@ -1009,7 +1009,7 @@ font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_hei
}
desc->face_cnt++;
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
if (unicode) {
charset_size = prepare_charset_unicode(face, my_charset, my_charcodes);
} else {