From df6db6a0397b7f219499596117970cf7d3a1880b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 Jun 2022 13:18:03 -0400 Subject: Revert "Add a check for mixed linkage" This reverts commit e5b62c8c27599699fa583a18e5346138799d9f50. No longer needed. We've renamed everything to avoid conflicts, instead. --- pango/pango-context.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'pango/pango-context.c') diff --git a/pango/pango-context.c b/pango/pango-context.c index a7444865..d5e73cfe 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -23,8 +23,6 @@ #include #include -#include - #include "pango-context.h" #include "pango-context-private.h" #include "pango-impl-utils.h" @@ -82,33 +80,11 @@ pango_context_init (PangoContext *context) pango_font_description_set_size (context->font_desc, 12 * PANGO_SCALE); } -static gboolean -pango_has_mixed_deps (void) -{ - GModule *module; - gpointer func; - gboolean result = FALSE; - - module = g_module_open (NULL, 0); - - if (g_module_symbol (module, "pango_hb_font_new", &func)) - result = TRUE; - - g_module_close (module); - - return result; -} - static void pango_context_class_init (PangoContextClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - /* Put the check for mixed linkage here, for lack of a better place */ - if (pango_has_mixed_deps ()) - g_error ("Pango 2 symbols detected.\n" - "Using Pango 1.x and 2 in the same process is not supported."); - object_class->finalize = pango_context_finalize; } -- cgit v1.2.1