ass_fontselect: uninline ass_map_font()

Also fixes the build on OSX under some circumstances (weird and
inconsistent rules for the inline keyword in C).

diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c
index bf4376b99d7d3e7778a5e7ca07fd2897e9a8c72b..2a00c376bdd562ec7cbd3e4839ebc26865fda0ff 100644 (file)
--- a/libass/ass_fontselect.c
+++ b/libass/ass_fontselect.c
@@ -1045,3 +1045,16 @@ void ass_fontselect_free(ASS_FontSelector *priv)
 
     free(priv);
 }
+
+void ass_map_font(const ASS_FontMapping *map, int len, const char *name,
+                  ASS_FontProviderMetaData *meta)
+{
+    for (int i = 0; i < len; i++) {
+        if (strcasecmp(map[i].from, name) == 0) {
+            meta->n_fullname = 1;
+            meta->fullnames = calloc(1, sizeof(char *));
+            meta->fullnames[0] = strdup(map[i].to);
+            return;
+        }
+    }
+}

diff --git a/libass/ass_fontselect.h b/libass/ass_fontselect.h
index 1e0959e5a3d932d2c8f39502a255ba1caa80e032..32b9905cae3fe9a4710cde17a4271fe2073e8612 100644 (file)
--- a/libass/ass_fontselect.h
+++ b/libass/ass_fontselect.h
@@ -195,18 +195,8 @@ struct ass_font_mapping {
  * \param name font name to map from
  * \param meta metadata struct, mapped fonts will be stored into this
  */
-inline void ass_map_font(const ASS_FontMapping *map, int len, const char *name,
-                         ASS_FontProviderMetaData *meta)
-{
-    for (int i = 0; i < len; i++) {
-        if (strcasecmp(map[i].from, name) == 0) {
-            meta->n_fullname = 1;
-            meta->fullnames = calloc(1, sizeof(char *));
-            meta->fullnames[0] = strdup(map[i].to);
-            return;
-        }
-    }
-}
+void ass_map_font(const ASS_FontMapping *map, int len, const char *name,
+                  ASS_FontProviderMetaData *meta);
 
 ASS_FontSelector *
 ass_fontselect_init(ASS_Library *library,