diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/X11/Xft/Xft.h | 12 | ||||
-rw-r--r-- | src/xftcolor.c | 6 | ||||
-rw-r--r-- | src/xftcore.c | 8 | ||||
-rw-r--r-- | src/xftdbg.c | 2 | ||||
-rw-r--r-- | src/xftdpy.c | 20 | ||||
-rw-r--r-- | src/xftdraw.c | 54 | ||||
-rw-r--r-- | src/xftextent.c | 12 | ||||
-rw-r--r-- | src/xftfont.c | 8 | ||||
-rw-r--r-- | src/xftfreetype.c | 28 | ||||
-rw-r--r-- | src/xftglyphs.c | 14 | ||||
-rw-r--r-- | src/xftinit.c | 12 | ||||
-rw-r--r-- | src/xftint.h | 8 | ||||
-rw-r--r-- | src/xftlist.c | 4 | ||||
-rw-r--r-- | src/xftname.c | 8 | ||||
-rw-r--r-- | src/xftrender.c | 28 | ||||
-rw-r--r-- | src/xftstr.c | 2 | ||||
-rw-r--r-- | src/xftswap.c | 10 | ||||
-rw-r--r-- | src/xftxlfd.c | 2 |
20 files changed, 129 insertions, 121 deletions
@@ -1,3 +1,13 @@ +2006-06-03 Daniel Stone <daniel@freedesktop.org> + + * configure.ac: + * include/X11/Xft/Xft.h: + Bump to 2.1.9. + + * src/*.c: + * include/X11/Xft/Xft.h: + Bug #4711: Don't export unnecessary symbols. (Alan Coopersmith) + 2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index a196726..1d22e7a 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's dnl not possible to extract the version number here from Xft.h dnl Please bump the minor library number at each release as well. dnl -AC_INIT(libXft, 2.1.8.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft) +AC_INIT(libXft, 2.1.9, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h index 526db8f..e968e99 100644 --- a/include/X11/Xft/Xft.h +++ b/include/X11/Xft/Xft.h @@ -33,7 +33,7 @@ #define XFT_MAJOR 2 #define XFT_MINOR 1 -#define XFT_REVISION 8 +#define XFT_REVISION 9 #define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION)) #define XftVersion XFT_VERSION @@ -429,8 +429,6 @@ XftCharIndex (Display *dpy, XftFont *pub, FcChar32 ucs4); -/* xftgram.y */ - /* xftinit.c */ FcBool XftInit (_Xconst char *config); @@ -438,8 +436,6 @@ XftInit (_Xconst char *config); int XftGetVersion (void); -/* xftlex.l */ - /* xftlist.c */ FcFontSet * @@ -447,16 +443,10 @@ XftListFonts (Display *dpy, int screen, ...) _X_SENTINEL(0); -/* xftmatch.c */ - -/* xftmatrix.c */ - /* xftname.c */ FcPattern *XftNameParse (_Xconst char *name); -/* xftpat.c */ - /* xftrender.c */ void XftGlyphRender (Display *dpy, diff --git a/src/xftcolor.c b/src/xftcolor.c index 511f52e..5644c80 100644 --- a/src/xftcolor.c +++ b/src/xftcolor.c @@ -24,7 +24,7 @@ #include "xftint.h" -Bool +_X_EXPORT Bool XftColorAllocName (Display *dpy, _Xconst Visual *visual, Colormap cmap, @@ -73,7 +73,7 @@ masklen (unsigned long m) return (short) (((y + (y >> 3)) & 030707070707) % 077); } -Bool +_X_EXPORT Bool XftColorAllocValue (Display *dpy, Visual *visual, Colormap cmap, @@ -114,7 +114,7 @@ XftColorAllocValue (Display *dpy, return True; } -void +_X_EXPORT void XftColorFree (Display *dpy, Visual *visual, Colormap cmap, diff --git a/src/xftcore.c b/src/xftcore.c index 11cdd5e..92e4e25 100644 --- a/src/xftcore.c +++ b/src/xftcore.c @@ -24,7 +24,7 @@ #include "xftint.h" -void +_X_HIDDEN void XftRectCore (XftDraw *draw, _Xconst XftColor *color, int x, @@ -930,7 +930,7 @@ static int XftGetImageErrorHandler (Display *dpy, XErrorEvent *error_event) return 0; } -void +_X_HIDDEN void XftGlyphCore (XftDraw *draw, _Xconst XftColor *color, XftFont *public, @@ -1066,7 +1066,7 @@ bail1: #define NUM_LOCAL 1024 -void +_X_HIDDEN void XftGlyphSpecCore (XftDraw *draw, _Xconst XftColor *color, XftFont *public, @@ -1215,7 +1215,7 @@ bail1: _XftFontManageMemory (dpy, public); } -void +_X_HIDDEN void XftGlyphFontSpecCore (XftDraw *draw, _Xconst XftColor *color, _Xconst XftGlyphFontSpec *glyphs, diff --git a/src/xftdbg.c b/src/xftdbg.c index 5ed497a..5e8a745 100644 --- a/src/xftdbg.c +++ b/src/xftdbg.c @@ -24,7 +24,7 @@ #include "xftint.h" -int +_X_HIDDEN int XftDebug (void) { static int initialized; diff --git a/src/xftdpy.c b/src/xftdpy.c index 0970843..6ae7b04 100644 --- a/src/xftdpy.c +++ b/src/xftdpy.c @@ -24,7 +24,7 @@ #include "xftint.h" -XftDisplayInfo *_XftDisplayInfo; +_X_HIDDEN XftDisplayInfo *_XftDisplayInfo; static int _XftCloseDisplay (Display *dpy, XExtCodes *codes) @@ -60,7 +60,7 @@ _XftCloseDisplay (Display *dpy, XExtCodes *codes) } -XftDisplayInfo * +_X_HIDDEN XftDisplayInfo * _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary) { XftDisplayInfo *info, **prev; @@ -212,7 +212,7 @@ _XftDisplayValidateMemory (XftDisplayInfo *info) info->glyph_memory, glyph_memory); } -void +_X_HIDDEN void _XftDisplayManageMemory (Display *dpy) { XftDisplayInfo *info = _XftDisplayInfoGet (dpy, False); @@ -250,7 +250,7 @@ _XftDisplayManageMemory (Display *dpy) _XftDisplayValidateMemory (info); } -Bool +_X_EXPORT Bool XftDefaultHasRender (Display *dpy) { XftDisplayInfo *info = _XftDisplayInfoGet (dpy, True); @@ -260,7 +260,7 @@ XftDefaultHasRender (Display *dpy) return info->hasRender; } -Bool +_X_EXPORT Bool XftDefaultSet (Display *dpy, FcPattern *defaults) { XftDisplayInfo *info = _XftDisplayInfoGet (dpy, True); @@ -283,7 +283,7 @@ XftDefaultSet (Display *dpy, FcPattern *defaults) return True; } -int +_X_HIDDEN int XftDefaultParseBool (char *v) { char c0, c1; @@ -419,7 +419,7 @@ _XftDefaultGet (Display *dpy, const char *object, int screen, FcValue *v) return r; } -Bool +_X_HIDDEN Bool XftDefaultGetBool (Display *dpy, const char *object, int screen, Bool def) { FcResult r; @@ -431,7 +431,7 @@ XftDefaultGetBool (Display *dpy, const char *object, int screen, Bool def) return v.u.b; } -int +_X_HIDDEN int XftDefaultGetInteger (Display *dpy, const char *object, int screen, int def) { FcResult r; @@ -443,7 +443,7 @@ XftDefaultGetInteger (Display *dpy, const char *object, int screen, int def) return v.u.i; } -double +_X_HIDDEN double XftDefaultGetDouble (Display *dpy, const char *object, int screen, double def) { FcResult r; @@ -455,7 +455,7 @@ XftDefaultGetDouble (Display *dpy, const char *object, int screen, double def) return v.u.d; } -void +_X_EXPORT void XftDefaultSubstitute (Display *dpy, int screen, FcPattern *pattern) { FcValue v; diff --git a/src/xftdraw.c b/src/xftdraw.c index 23b9bca..1a1db52 100644 --- a/src/xftdraw.c +++ b/src/xftdraw.c @@ -82,7 +82,7 @@ _XftDrawScreen (Display *dpy, Drawable drawable, Visual *visual) return 0; } -unsigned int +_X_HIDDEN unsigned int XftDrawDepth (XftDraw *draw) { if (!draw->depth) @@ -98,7 +98,7 @@ XftDrawDepth (XftDraw *draw) return draw->depth; } -unsigned int +_X_HIDDEN unsigned int XftDrawBitsPerPixel (XftDraw *draw) { if (!draw->bits_per_pixel) @@ -126,7 +126,7 @@ XftDrawBitsPerPixel (XftDraw *draw) return draw->bits_per_pixel; } -XftDraw * +_X_EXPORT XftDraw * XftDrawCreate (Display *dpy, Drawable drawable, Visual *visual, @@ -154,7 +154,7 @@ XftDrawCreate (Display *dpy, return draw; } -XftDraw * +_X_EXPORT XftDraw * XftDrawCreateBitmap (Display *dpy, Pixmap bitmap) { @@ -179,7 +179,7 @@ XftDrawCreateBitmap (Display *dpy, return draw; } -XftDraw * +_X_EXPORT XftDraw * XftDrawCreateAlpha (Display *dpy, Pixmap pixmap, int depth) @@ -233,7 +233,7 @@ _XftDrawFormat (XftDraw *draw) return XRenderFindVisualFormat (draw->dpy, draw->visual); } -void +_X_EXPORT void XftDrawChange (XftDraw *draw, Drawable drawable) { @@ -250,31 +250,31 @@ XftDrawChange (XftDraw *draw, } } -Display * +_X_EXPORT Display * XftDrawDisplay (XftDraw *draw) { return draw->dpy; } -Drawable +_X_EXPORT Drawable XftDrawDrawable (XftDraw *draw) { return draw->drawable; } -Colormap +_X_EXPORT Colormap XftDrawColormap (XftDraw *draw) { return draw->colormap; } -Visual * +_X_EXPORT Visual * XftDrawVisual (XftDraw *draw) { return draw->visual; } -void +_X_EXPORT void XftDrawDestroy (XftDraw *draw) { if (draw->render.pict) @@ -295,7 +295,7 @@ XftDrawDestroy (XftDraw *draw) free (draw); } -Picture +_X_EXPORT Picture XftDrawSrcPicture (XftDraw *draw, _Xconst XftColor *color) { Display *dpy = draw->dpy; @@ -457,7 +457,7 @@ _XftDrawCorePrepare (XftDraw *draw, _Xconst XftColor *color) return FcTrue; } -Picture +_X_EXPORT Picture XftDrawPicture (XftDraw *draw) { if (!_XftDrawRenderPrepare (draw)) @@ -467,7 +467,7 @@ XftDrawPicture (XftDraw *draw) #define NUM_LOCAL 1024 -void +_X_EXPORT void XftDrawGlyphs (XftDraw *draw, _Xconst XftColor *color, XftFont *pub, @@ -495,7 +495,7 @@ XftDrawGlyphs (XftDraw *draw, } } -void +_X_EXPORT void XftDrawString8 (XftDraw *draw, _Xconst XftColor *color, XftFont *pub, @@ -525,7 +525,7 @@ XftDrawString8 (XftDraw *draw, free (glyphs); } -void +_X_EXPORT void XftDrawString16 (XftDraw *draw, _Xconst XftColor *color, XftFont *pub, @@ -553,7 +553,7 @@ XftDrawString16 (XftDraw *draw, free (glyphs); } -void +_X_EXPORT void XftDrawString32 (XftDraw *draw, _Xconst XftColor *color, XftFont *pub, @@ -581,7 +581,7 @@ XftDrawString32 (XftDraw *draw, free (glyphs); } -void +_X_EXPORT void XftDrawStringUtf8 (XftDraw *draw, _Xconst XftColor *color, XftFont *pub, @@ -625,7 +625,7 @@ XftDrawStringUtf8 (XftDraw *draw, free (glyphs); } -void +_X_EXPORT void XftDrawStringUtf16 (XftDraw *draw, _Xconst XftColor *color, XftFont *pub, @@ -670,7 +670,7 @@ XftDrawStringUtf16 (XftDraw *draw, free (glyphs); } -void +_X_EXPORT void XftDrawGlyphSpec (XftDraw *draw, _Xconst XftColor *color, XftFont *pub, @@ -698,7 +698,7 @@ XftDrawGlyphSpec (XftDraw *draw, } } -void +_X_EXPORT void XftDrawGlyphFontSpec (XftDraw *draw, _Xconst XftColor *color, _Xconst XftGlyphFontSpec *glyphs, @@ -734,7 +734,7 @@ XftDrawGlyphFontSpec (XftDraw *draw, } } -void +_X_EXPORT void XftDrawCharSpec (XftDraw *draw, _Xconst XftColor *color, XftFont *pub, @@ -764,7 +764,7 @@ XftDrawCharSpec (XftDraw *draw, free (glyphs); } -void +_X_EXPORT void XftDrawCharFontSpec (XftDraw *draw, _Xconst XftColor *color, _Xconst XftCharFontSpec *chars, @@ -794,7 +794,7 @@ XftDrawCharFontSpec (XftDraw *draw, free (glyphs); } -void +_X_EXPORT void XftDrawRect (XftDraw *draw, _Xconst XftColor *color, int x, @@ -813,7 +813,7 @@ XftDrawRect (XftDraw *draw, } } -Bool +_X_EXPORT Bool XftDrawSetClip (XftDraw *draw, Region r) { @@ -899,7 +899,7 @@ XftDrawSetClip (XftDraw *draw, return True; } -Bool +_X_EXPORT Bool XftDrawSetClipRectangles (XftDraw *draw, int xOrigin, int yOrigin, @@ -974,7 +974,7 @@ XftDrawSetClipRectangles (XftDraw *draw, return True; } -void +_X_EXPORT void XftDrawSetSubwindowMode (XftDraw *draw, int mode) { if (mode == draw->subwindow_mode) diff --git a/src/xftextent.c b/src/xftextent.c index 49db898..138745d 100644 --- a/src/xftextent.c +++ b/src/xftextent.c @@ -24,7 +24,7 @@ #include "xftint.h" -void +_X_EXPORT void XftGlyphExtents (Display *dpy, XftFont *pub, _Xconst FT_UInt *glyphs, @@ -115,7 +115,7 @@ XftGlyphExtents (Display *dpy, #define NUM_LOCAL 1024 -void +_X_EXPORT void XftTextExtents8 (Display *dpy, XftFont *pub, _Xconst FcChar8 *string, @@ -143,7 +143,7 @@ XftTextExtents8 (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextExtents16 (Display *dpy, XftFont *pub, _Xconst FcChar16 *string, @@ -171,7 +171,7 @@ XftTextExtents16 (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextExtents32 (Display *dpy, XftFont *pub, _Xconst FcChar32 *string, @@ -199,7 +199,7 @@ XftTextExtents32 (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextExtentsUtf8 (Display *dpy, XftFont *pub, _Xconst FcChar8 *string, @@ -242,7 +242,7 @@ XftTextExtentsUtf8 (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextExtentsUtf16 (Display *dpy, XftFont *pub, _Xconst FcChar8 *string, diff --git a/src/xftfont.c b/src/xftfont.c index ab29fbc..8c8c71c 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -24,7 +24,7 @@ #include "xftint.h" -FcPattern * +_X_EXPORT FcPattern * XftFontMatch (Display *dpy, int screen, _Xconst FcPattern *pattern, @@ -68,7 +68,7 @@ XftFontMatch (Display *dpy, return match; } -XftFont * +_X_EXPORT XftFont * XftFontOpen (Display *dpy, int screen, ...) { va_list va; @@ -114,7 +114,7 @@ XftFontOpen (Display *dpy, int screen, ...) return font; } -XftFont * +_X_EXPORT XftFont * XftFontOpenName (Display *dpy, int screen, const char *name) { FcPattern *pat; @@ -160,7 +160,7 @@ XftFontOpenName (Display *dpy, int screen, const char *name) return font; } -XftFont * +_X_EXPORT XftFont * XftFontOpenXlfd (Display *dpy, int screen, const char *xlfd) { FcPattern *pat; diff --git a/src/xftfreetype.c b/src/xftfreetype.c index 64e90f2..fc6e74a 100644 --- a/src/xftfreetype.c +++ b/src/xftfreetype.c @@ -24,7 +24,7 @@ #include "xftint.h" -FT_Library _XftFTlibrary; +_X_HIDDEN FT_Library _XftFTlibrary; #define FT_Matrix_Equal(a,b) ((a)->xx == (b)->xx && \ (a)->yy == (b)->yy && \ @@ -35,7 +35,7 @@ FT_Library _XftFTlibrary; */ static XftFtFile *_XftFtFiles; -int XftMaxFreeTypeFiles = 5; +_X_HIDDEN int XftMaxFreeTypeFiles = 5; static XftFtFile * _XftGetFile (const FcChar8 *file, int id) @@ -186,7 +186,7 @@ _XftUnlockFile (XftFtFile *f) #define Y_SIZE(face,i) ((face)->available_sizes[i].height << 6) #endif -FcBool +_X_HIDDEN FcBool _XftSetFace (XftFtFile *f, FT_F26Dot6 xsize, FT_F26Dot6 ysize, FT_Matrix *matrix) { FT_Face face = f->face; @@ -345,7 +345,7 @@ _XftHashSize (FcChar32 num_unicode) return hash; } -FT_Face +_X_EXPORT FT_Face XftLockFace (XftFont *public) { XftFontInt *font = (XftFontInt *) public; @@ -364,7 +364,7 @@ XftLockFace (XftFont *public) return face; } -void +_X_EXPORT void XftUnlockFace (XftFont *public) { XftFontInt *font = (XftFontInt *) public; @@ -728,7 +728,7 @@ XftFontInfoCreate (Display *dpy, _Xconst FcPattern *pattern) return fi; } -void +_X_EXPORT void XftFontInfoDestroy (Display *dpy, XftFontInfo *fi) { XftFontInfoEmpty (dpy, fi); @@ -736,19 +736,19 @@ XftFontInfoDestroy (Display *dpy, XftFontInfo *fi) free (fi); } -FcChar32 +_X_EXPORT FcChar32 XftFontInfoHash (_Xconst XftFontInfo *fi) { return fi->hash; } -FcBool +_X_EXPORT FcBool XftFontInfoEqual (_Xconst XftFontInfo *a, _Xconst XftFontInfo *b) { return memcmp ((void *) a, (void *) b, sizeof (XftFontInfo)) == 0; } -XftFont * +_X_EXPORT XftFont * XftFontOpenInfo (Display *dpy, FcPattern *pattern, XftFontInfo *fi) @@ -1003,7 +1003,7 @@ bail0: return 0; } -XftFont * +_X_EXPORT XftFont * XftFontOpenPattern (Display *dpy, FcPattern *pattern) { XftFontInfo info; @@ -1017,7 +1017,7 @@ XftFontOpenPattern (Display *dpy, FcPattern *pattern) return font; } -XftFont * +_X_EXPORT XftFont * XftFontCopy (Display *dpy, XftFont *public) { XftFontInt *font = (XftFontInt *) public; @@ -1079,7 +1079,7 @@ XftFontFindNthUnref (XftDisplayInfo *info, int n) return public; } -void +_X_HIDDEN void XftFontManageMemory (Display *dpy) { XftDisplayInfo *info = _XftDisplayInfoGet (dpy, False); @@ -1125,7 +1125,7 @@ XftFontManageMemory (Display *dpy) } } -void +_X_EXPORT void XftFontClose (Display *dpy, XftFont *public) { XftDisplayInfo *info = _XftDisplayInfoGet (dpy, False); @@ -1145,7 +1145,7 @@ XftFontClose (Display *dpy, XftFont *public) } } -FcBool +_X_EXPORT FcBool XftInitFtLibrary (void) { if (_XftFTlibrary) diff --git a/src/xftglyphs.c b/src/xftglyphs.c index 9b27d01..7164b72 100644 --- a/src/xftglyphs.c +++ b/src/xftglyphs.c @@ -67,7 +67,7 @@ _XftFontValidateMemory (Display *dpy, XftFont *public) font->glyph_memory, glyph_memory); } -void +_X_EXPORT void XftFontLoadGlyphs (Display *dpy, XftFont *pub, FcBool need_bitmaps, @@ -608,7 +608,7 @@ XftFontLoadGlyphs (Display *dpy, XftUnlockFace (&font->public); } -void +_X_EXPORT void XftFontUnloadGlyphs (Display *dpy, XftFont *pub, _Xconst FT_UInt *glyphs, @@ -659,7 +659,7 @@ XftFontUnloadGlyphs (Display *dpy, XRenderFreeGlyphs (dpy, font->glyphset, glyphBuf, nused); } -FcBool +_X_EXPORT FcBool XftFontCheckGlyph (Display *dpy, XftFont *pub, FcBool need_bitmaps, @@ -700,7 +700,7 @@ XftFontCheckGlyph (Display *dpy, return FcFalse; } -FcBool +_X_EXPORT FcBool XftCharExists (Display *dpy, XftFont *pub, FcChar32 ucs4) @@ -712,7 +712,7 @@ XftCharExists (Display *dpy, #define Missing ((FT_UInt) ~0) -FT_UInt +_X_EXPORT FT_UInt XftCharIndex (Display *dpy, XftFont *pub, FcChar32 ucs4) @@ -756,7 +756,7 @@ XftCharIndex (Display *dpy, /* * Pick a random glyph from the font and remove it from the cache */ -void +_X_HIDDEN void _XftFontUncacheGlyph (Display *dpy, XftFont *pub) { XftFontInt *font = (XftFontInt *) pub; @@ -804,7 +804,7 @@ _XftFontUncacheGlyph (Display *dpy, XftFont *pub) _XftFontValidateMemory (dpy, pub); } -void +_X_HIDDEN void _XftFontManageMemory (Display *dpy, XftFont *pub) { XftFontInt *font = (XftFontInt *) pub; diff --git a/src/xftinit.c b/src/xftinit.c index b210706..8245377 100644 --- a/src/xftinit.c +++ b/src/xftinit.c @@ -24,9 +24,9 @@ #include "xftint.h" -Bool _XftConfigInitialized; +_X_HIDDEN Bool _XftConfigInitialized; -Bool +_X_EXPORT Bool XftInit (_Xconst char *config) { if (_XftConfigInitialized) @@ -38,7 +38,7 @@ XftInit (_Xconst char *config) return True; } -int +_X_EXPORT int XftGetVersion (void) { return XftVersion; @@ -64,7 +64,7 @@ static int XftMemNotice = 1*1024*1024; static int XftAllocNotify, XftFreeNotify; -void +_X_HIDDEN void XftMemReport (void) { int i; @@ -84,7 +84,7 @@ XftMemReport (void) XftFreeNotify = 0; } -void +_X_HIDDEN void XftMemAlloc (int kind, int size) { if (XftDebug() & XFT_DBG_MEMORY) @@ -99,7 +99,7 @@ XftMemAlloc (int kind, int size) } } -void +_X_HIDDEN void XftMemFree (int kind, int size) { if (XftDebug() & XFT_DBG_MEMORY) diff --git a/src/xftint.h b/src/xftint.h index 4149a9d..8668ec4 100644 --- a/src/xftint.h +++ b/src/xftint.h @@ -62,6 +62,14 @@ #include <fontconfig/fcprivate.h> #include <fontconfig/fcfreetype.h> +/* Added to <X11/Xfuncproto.h> in X11R6.9 and later */ +#ifndef _X_HIDDEN +# define _X_HIDDEN /**/ +#endif +#ifndef _X_EXPORT +# define _X_EXPORT /**/ +#endif + #ifndef HAVE_CONFIG_H # if (FREETYPE_MAJOR > 2 || \ (FREETYPE_MAJOR == 2 && (FREETYPE_MINOR > 1 || \ diff --git a/src/xftlist.c b/src/xftlist.c index c92607d..7fb5a2f 100644 --- a/src/xftlist.c +++ b/src/xftlist.c @@ -24,7 +24,7 @@ #include "xftint.h" -FcFontSet * +_X_HIDDEN FcFontSet * XftListFontsPatternObjects (Display *dpy, int screen, FcPattern *pattern, @@ -33,7 +33,7 @@ XftListFontsPatternObjects (Display *dpy, return FcFontList (0, pattern, os); } -FcFontSet * +_X_EXPORT FcFontSet * XftListFonts (Display *dpy, int screen, ...) diff --git a/src/xftname.c b/src/xftname.c index f5ce0c0..2bdee5d 100644 --- a/src/xftname.c +++ b/src/xftname.c @@ -32,9 +32,9 @@ static const FcObjectType _XftObjectTypes[] = { #define NUM_OBJECT_TYPES (sizeof _XftObjectTypes / sizeof _XftObjectTypes[0]) -FcBool _XftNameInitialized; +_X_HIDDEN FcBool _XftNameInitialized; -void +_X_HIDDEN void _XftNameInit (void) { if (_XftNameInitialized) @@ -43,14 +43,14 @@ _XftNameInit (void) FcNameRegisterObjectTypes (_XftObjectTypes, NUM_OBJECT_TYPES); } -FcPattern +_X_EXPORT FcPattern *XftNameParse (const char *name) { _XftNameInit (); return FcNameParse ((FcChar8 *) name); } -FcBool +_X_HIDDEN FcBool XftNameUnparse (FcPattern *pat, char *dest, int len) { FcChar8 *name; diff --git a/src/xftrender.c b/src/xftrender.c index 4a6f343..9e8c1eb 100644 --- a/src/xftrender.c +++ b/src/xftrender.c @@ -31,7 +31,7 @@ * Use the Render extension to draw the glyphs */ -void +_X_EXPORT void XftGlyphRender (Display *dpy, int op, Picture src, @@ -141,7 +141,7 @@ bail1: _XftFontManageMemory (dpy, pub); } -void +_X_EXPORT void XftGlyphSpecRender (Display *dpy, int op, Picture src, @@ -350,7 +350,7 @@ bail1: _XftFontManageMemory (dpy, pub); } -void +_X_EXPORT void XftCharSpecRender (Display *dpy, int op, Picture src, @@ -410,7 +410,7 @@ XftPreferFormat (Display *dpy, XRenderPictFormat *a, XRenderPictFormat *b) return prefer; } -void +_X_EXPORT void XftGlyphFontSpecRender (Display *dpy, int op, Picture src, @@ -641,7 +641,7 @@ bail1: _XftFontManageMemory (dpy, glyphs[i].font); } -void +_X_EXPORT void XftCharFontSpecRender (Display *dpy, int op, Picture src, @@ -675,7 +675,7 @@ XftCharFontSpecRender (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextRender8 (Display *dpy, int op, Picture src, @@ -707,7 +707,7 @@ XftTextRender8 (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextRender16 (Display *dpy, int op, Picture src, @@ -739,7 +739,7 @@ XftTextRender16 (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextRender16BE (Display *dpy, int op, Picture src, @@ -772,7 +772,7 @@ XftTextRender16BE (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextRender16LE (Display *dpy, int op, Picture src, @@ -805,7 +805,7 @@ XftTextRender16LE (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextRender32 (Display *dpy, int op, Picture src, @@ -837,7 +837,7 @@ XftTextRender32 (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextRender32BE (Display *dpy, int op, Picture src, @@ -873,7 +873,7 @@ XftTextRender32BE (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextRender32LE (Display *dpy, int op, Picture src, @@ -909,7 +909,7 @@ XftTextRender32LE (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextRenderUtf8 (Display *dpy, int op, Picture src, @@ -958,7 +958,7 @@ XftTextRenderUtf8 (Display *dpy, free (glyphs); } -void +_X_EXPORT void XftTextRenderUtf16 (Display *dpy, int op, Picture src, diff --git a/src/xftstr.c b/src/xftstr.c index 914faa3..7d0cce6 100644 --- a/src/xftstr.c +++ b/src/xftstr.c @@ -24,7 +24,7 @@ #include "xftint.h" -int +_X_HIDDEN int _XftMatchSymbolic (XftSymbolic *s, int n, const char *name, int def) { while (n--) diff --git a/src/xftswap.c b/src/xftswap.c index dc7bcf9..070bb11 100644 --- a/src/xftswap.c +++ b/src/xftswap.c @@ -24,7 +24,7 @@ #include "xftint.h" -int +_X_HIDDEN int XftNativeByteOrder (void) { int whichbyte = 1; @@ -55,7 +55,7 @@ XftNativeByteOrder (void) ((char *) (x))[0] = ((char *) (x))[2];\ ((char *) (x))[2] = n; } -void +_X_HIDDEN void XftSwapCARD32 (CARD32 *data, int u) { char n; @@ -66,7 +66,7 @@ XftSwapCARD32 (CARD32 *data, int u) } } -void +_X_HIDDEN void XftSwapCARD24 (CARD8 *data, int width, int height) { int units, u; @@ -87,7 +87,7 @@ XftSwapCARD24 (CARD8 *data, int width, int height) } } -void +_X_HIDDEN void XftSwapCARD16 (CARD16 *data, int u) { char n; @@ -98,7 +98,7 @@ XftSwapCARD16 (CARD16 *data, int u) } } -void +_X_HIDDEN void XftSwapImage (XImage *image) { switch (image->bits_per_pixel) { diff --git a/src/xftxlfd.c b/src/xftxlfd.c index 84ebe57..df48694 100644 --- a/src/xftxlfd.c +++ b/src/xftxlfd.c @@ -82,7 +82,7 @@ XftGetInt(const char *ptr, int *val) return (char *) 0; } -FcPattern * +_X_EXPORT FcPattern * XftXlfdParse (const char *xlfd_orig, FcBool ignore_scalable, FcBool complete) { FcPattern *pat; |