diff options
author | Matthias Clasen <mclasen@redhat.com> | 2022-06-25 19:10:06 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-07-04 11:17:28 -0400 |
commit | 29057df96c1373938d73fb43c82251698993082f (patch) | |
tree | ef5caad34ed7b7639b35ca40e26105869fc0b86d | |
parent | 41108f686becf61802a9dfef2100bf74773ade37 (diff) | |
download | pango-29057df96c1373938d73fb43c82251698993082f.tar.gz |
Remove the mixed dependency check
With separate namespaces, this is no longer necessary.
-rw-r--r-- | pango2/pango-context.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/pango2/pango-context.c b/pango2/pango-context.c index 58f2719a..fcffe922 100644 --- a/pango2/pango-context.c +++ b/pango2/pango-context.c @@ -98,23 +98,6 @@ pango2_context_init (Pango2Context *context) pango2_font_description_set_size (context->font_desc, 12 * PANGO2_SCALE); } -static gboolean -pango2_has_mixed_deps (void) -{ - GModule *module; - gpointer func; - gboolean result = FALSE; - - module = g_module_open (NULL, 0); - - if (g_module_symbol (module, "pango2_ot_info_find_script", &func)) - result = TRUE; - - g_module_close (module); - - return result; -} - static void pango2_context_set_property (GObject *object, guint property_id, @@ -214,11 +197,6 @@ pango2_context_class_init (Pango2ContextClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - /* Put the check for mixed linkage here, for lack of a better place */ - if (pango2_has_mixed_deps ()) - g_error ("Pango2 1.x symbols detected.\n" - "Using Pango2 1.x and 2 in the same process is not supported."); - object_class->finalize = pango2_context_finalize; object_class->set_property = pango2_context_set_property; object_class->get_property = pango2_context_get_property; |