diff options
author | Cedric BAIL <cedric@efl.so> | 2013-11-17 04:47:58 +0100 |
---|---|---|
committer | Cedric BAIL <cedric@efl.so> | 2013-11-17 04:48:43 +0100 |
commit | 239c326b96bef137bf9ace35cbc8c9ce4ba7efac (patch) | |
tree | f2caa8319174a4a39f3aec4adc198d335e0f35f9 | |
parent | 753c359e61994833f3900ebe74acdfba283dad08 (diff) |
evas: fix build without FontConfig.
Note that we still support building without FontConfig, so please
guard access to it.
-rw-r--r-- | src/lib/evas/canvas/evas_font_dir.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c index c990a548fd..383082ea58 100644 --- a/src/lib/evas/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c | |||
@@ -1220,8 +1220,10 @@ _canvas_font_path_clear(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list EINA_UNUS | |||
1220 | evas->font_path = eina_list_remove(evas->font_path, evas->font_path->data); | 1220 | evas->font_path = eina_list_remove(evas->font_path, evas->font_path->data); |
1221 | } | 1221 | } |
1222 | 1222 | ||
1223 | #ifdef HAVE_FONTCONFIG | ||
1223 | if (fc_config) | 1224 | if (fc_config) |
1224 | FcConfigAppFontClear(fc_config); | 1225 | FcConfigAppFontClear(fc_config); |
1226 | #endif | ||
1225 | } | 1227 | } |
1226 | 1228 | ||
1227 | EAPI void | 1229 | EAPI void |
@@ -1242,8 +1244,10 @@ _canvas_font_path_append(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list) | |||
1242 | e->font_path = eina_list_append(e->font_path, eina_stringshare_add(path)); | 1244 | e->font_path = eina_list_append(e->font_path, eina_stringshare_add(path)); |
1243 | 1245 | ||
1244 | evas_font_init(); | 1246 | evas_font_init(); |
1247 | #ifdef HAVE_FONTCONFIG | ||
1245 | if (fc_config) | 1248 | if (fc_config) |
1246 | FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path); | 1249 | FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path); |
1250 | #endif | ||
1247 | } | 1251 | } |
1248 | 1252 | ||
1249 | EAPI void | 1253 | EAPI void |
@@ -1264,8 +1268,10 @@ _canvas_font_path_prepend(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list) | |||
1264 | e->font_path = eina_list_prepend(e->font_path, eina_stringshare_add(path)); | 1268 | e->font_path = eina_list_prepend(e->font_path, eina_stringshare_add(path)); |
1265 | 1269 | ||
1266 | evas_font_init(); | 1270 | evas_font_init(); |
1271 | #ifdef HAVE_FONTCONFIG | ||
1267 | if (fc_config) | 1272 | if (fc_config) |
1268 | FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path); | 1273 | FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path); |
1274 | #endif | ||
1269 | } | 1275 | } |
1270 | 1276 | ||
1271 | EAPI const Eina_List * | 1277 | EAPI const Eina_List * |