From 402f2625c2c779df20470ed0f758999db494e4dc Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 14 Apr 2003 23:48:34 +0000 Subject: Switch over the way that module entry points work, taking advantage of the Mon Apr 14 06:02:34 2003 Owen Taylor * modules/thai/{thai-fc.c,thai-shaper.c,thai-x.c}: * modules/*/*-{xft,x,win32.c} pango/pango-engine.h modules/*/Makefile.am: Switch over the way that module entry points work, taking advantage of the new automake capability for per-target CFLAGS for shared sources. * pango/pangofc-font.[ch] pango/pangoxft-font.c pango/pangoft2.c: Add a base class for PangoXft and PangoFT2 font classes so code can be shared between FT2 and Xft backends. * configure.in modules/*/Makefile.am modules/{arabic,basic,hangul,hebrew,indic,thai}: Move *-xft.c to *-fc.c and share between Xft and FT2 backends; adds FT2 backend capabilities for hangul/indic/thai. * pango/pangoxft.h pango/pangoft2.h: Deprecate APIs that moved into PangoFcFont * modules/basic/basic-fc.c (set_glyph): Add kerning handling from FT2 backend. --- modules/arabic/arabic-x.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'modules/arabic/arabic-x.c') diff --git a/modules/arabic/arabic-x.c b/modules/arabic/arabic-x.c index ccd84a91..3c3b9689 100644 --- a/modules/arabic/arabic-x.c +++ b/modules/arabic/arabic-x.c @@ -331,24 +331,16 @@ arabic_engine_x_new () -/* The following three functions provide the public module API for - * Pango - */ -#ifdef X_MODULE_PREFIX -#define MODULE_ENTRY(func) _pango_arabic_x_##func -#else -#define MODULE_ENTRY(func) func -#endif - void -MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, int *n_engines) +PANGO_MODULE_ENTRY(list) (PangoEngineInfo **engines, + int *n_engines) { *engines = script_engines; *n_engines = n_script_engines; } PangoEngine * -MODULE_ENTRY(script_engine_load) (const char *id) +PANGO_MODULE_ENTRY(load) (const char *id) { if (!strcmp (id, SCRIPT_ENGINE_NAME)) return arabic_engine_x_new (); @@ -357,6 +349,6 @@ MODULE_ENTRY(script_engine_load) (const char *id) } void -MODULE_ENTRY(script_engine_unload) (PangoEngine *engine) +PANGO_MODULE_ENTRY(unload) (PangoEngine *engine) { } -- cgit v1.2.1