Commit 824f87ba authored by Daniel Stone's avatar Daniel Stone

Bug #4711: Don't export unnecessary symbols. (Alan Coopersmith). Bump to

    2.1.9.
parent 250b95f8
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:
......
......@@ -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])
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -24,7 +24,7 @@
#include "xftint.h"
int
_X_HIDDEN int
XftDebug (void)
{
static int initialized;
......
......@@ -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;
......
......@@ -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)
......
......@@ -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,
......
......@@ -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;
......
......@@ -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)
......
......@@ -67,7 +67,7 @@ _XftFontValidateMemory (Display *dpy, XftFont *public)
font->glyph_memory, glyph_memory);
}
void
_X_EXPORT void