cvs diff: Diffing .
Index: Xft.h
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/Xft.h,v
retrieving revision 1.5
diff -u -r1.5 Xft.h
--- Xft.h	3 Jul 2005 07:00:57 -0000	1.5
+++ Xft.h	8 Oct 2005 01:24:40 -0000
@@ -429,8 +429,6 @@
 	      XftFont	    *pub,
 	      FcChar32	    ucs4);
     
-/* xftgram.y */
-
 /* xftinit.c */
 FcBool
 XftInit (_Xconst char *config);
@@ -438,8 +436,6 @@
 int
 XftGetVersion (void);
 
-/* xftlex.l */
-
 /* xftlist.c */
 
 FcFontSet *
@@ -447,16 +443,10 @@
 	      int	screen,
 	      ...) _X_SENTINEL(0);
 
-/* xftmatch.c */
-
-/* xftmatrix.c */
-
 /* xftname.c */
 FcPattern 
 *XftNameParse (_Xconst char *name);
 
-/* xftpat.c */
-
 /* xftrender.c */
 void
 XftGlyphRender (Display		*dpy,
Index: xftcolor.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftcolor.c,v
retrieving revision 1.4
diff -u -r1.4 xftcolor.c
--- xftcolor.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftcolor.c	8 Oct 2005 01:24:40 -0000
@@ -24,7 +24,7 @@
 
 #include "xftint.h"
 
-Bool
+_X_EXPORT Bool
 XftColorAllocName (Display  *dpy,
 		   _Xconst Visual   *visual,
 		   Colormap cmap,
@@ -73,7 +73,7 @@
     return (short) (((y + (y >> 3)) & 030707070707) % 077);
 }
 
-Bool
+_X_EXPORT Bool
 XftColorAllocValue (Display	    *dpy,
 		    Visual	    *visual,
 		    Colormap	    cmap,
@@ -114,7 +114,7 @@
     return True;
 }
 
-void
+_X_EXPORT void 
 XftColorFree (Display	*dpy,
 	      Visual	*visual,
 	      Colormap	cmap,
Index: xftcore.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftcore.c,v
retrieving revision 1.4
diff -u -r1.4 xftcore.c
--- xftcore.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftcore.c	8 Oct 2005 01:24:40 -0000
@@ -24,7 +24,7 @@
 
 #include "xftint.h"
 
-void
+_X_HIDDEN void
 XftRectCore (XftDraw		*draw,
 	     _Xconst XftColor	*color,
 	     int		x, 
@@ -930,7 +930,7 @@
     return 0;
 }
 
-void
+_X_HIDDEN void
 XftGlyphCore (XftDraw		*draw,
 	      _Xconst XftColor	*color,
 	      XftFont		*public,
@@ -1066,7 +1066,7 @@
 
 #define NUM_LOCAL   1024
 
-void
+_X_HIDDEN void
 XftGlyphSpecCore (XftDraw		*draw,
 		  _Xconst XftColor	*color,
 		  XftFont		*public,
@@ -1215,7 +1215,7 @@
 	_XftFontManageMemory (dpy, public);
 }
 
-void
+_X_HIDDEN void
 XftGlyphFontSpecCore (XftDraw			*draw,
 		      _Xconst XftColor		*color,
 		      _Xconst XftGlyphFontSpec	*glyphs,
Index: xftdbg.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftdbg.c,v
retrieving revision 1.4
diff -u -r1.4 xftdbg.c
--- xftdbg.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftdbg.c	8 Oct 2005 01:24:40 -0000
@@ -24,7 +24,7 @@
 
 #include "xftint.h"
 
-int
+_X_HIDDEN int
 XftDebug (void)
 {
     static int  initialized;
Index: xftdpy.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftdpy.c,v
retrieving revision 1.4
diff -u -r1.4 xftdpy.c
--- xftdpy.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftdpy.c	8 Oct 2005 01:24:40 -0000
@@ -24,7 +24,7 @@
 
 #include "xftint.h"
 
-XftDisplayInfo	*_XftDisplayInfo;
+_X_HIDDEN XftDisplayInfo	*_XftDisplayInfo;
 
 static int
 _XftCloseDisplay (Display *dpy, XExtCodes *codes)
@@ -60,7 +60,7 @@
 }
 
 
-XftDisplayInfo *
+_X_HIDDEN XftDisplayInfo *
 _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
 {
     XftDisplayInfo	*info, **prev;
@@ -212,7 +212,7 @@
 		info->glyph_memory, glyph_memory);
 }
 
-void
+_X_HIDDEN void
 _XftDisplayManageMemory (Display *dpy)
 {
     XftDisplayInfo  *info = _XftDisplayInfoGet (dpy, False);
@@ -250,7 +250,7 @@
 	_XftDisplayValidateMemory (info);
 }
 
-Bool
+_X_EXPORT Bool
 XftDefaultHasRender (Display *dpy)
 {
     XftDisplayInfo  *info = _XftDisplayInfoGet (dpy, True);
@@ -260,7 +260,7 @@
     return info->hasRender;
 }
 
-Bool
+_X_EXPORT Bool
 XftDefaultSet (Display *dpy, FcPattern *defaults)
 {
     XftDisplayInfo  *info = _XftDisplayInfoGet (dpy, True);
@@ -283,7 +283,7 @@
     return True;
 }
 
-int
+_X_HIDDEN int
 XftDefaultParseBool (char *v)
 {
     char    c0, c1;
@@ -419,7 +419,7 @@
     return r;
 }
 
-Bool
+_X_HIDDEN Bool
 XftDefaultGetBool (Display *dpy, const char *object, int screen, Bool def)
 {
     FcResult	    r;
@@ -431,7 +431,7 @@
     return v.u.b;
 }
 
-int
+_X_HIDDEN int
 XftDefaultGetInteger (Display *dpy, const char *object, int screen, int def)
 {
     FcResult	    r;
@@ -443,7 +443,7 @@
     return v.u.i;
 }
 
-double
+_X_HIDDEN double
 XftDefaultGetDouble (Display *dpy, const char *object, int screen, double def)
 {
     FcResult	    r;
@@ -455,7 +455,7 @@
     return v.u.d;
 }
 
-void
+_X_EXPORT void
 XftDefaultSubstitute (Display *dpy, int screen, FcPattern *pattern)
 {
     FcValue	v;
Index: xftdraw.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftdraw.c,v
retrieving revision 1.4
diff -u -r1.4 xftdraw.c
--- xftdraw.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftdraw.c	8 Oct 2005 01:24:40 -0000
@@ -82,7 +82,7 @@
     return 0;
 }
 
-unsigned int
+_X_HIDDEN unsigned int
 XftDrawDepth (XftDraw *draw)
 {
     if (!draw->depth)
@@ -98,7 +98,7 @@
     return draw->depth;
 }
 
-unsigned int
+_X_HIDDEN unsigned int
 XftDrawBitsPerPixel (XftDraw	*draw)
 {
     if (!draw->bits_per_pixel)
@@ -126,7 +126,7 @@
     return draw->bits_per_pixel;
 }
 
-XftDraw *
+_X_EXPORT XftDraw *
 XftDrawCreate (Display   *dpy,
 	       Drawable  drawable,
 	       Visual    *visual,
@@ -154,7 +154,7 @@
     return draw;
 }
 
-XftDraw *
+_X_EXPORT XftDraw *
 XftDrawCreateBitmap (Display	*dpy,
 		     Pixmap	bitmap)
 {
@@ -179,7 +179,7 @@
     return draw;
 }
 
-XftDraw *
+_X_EXPORT XftDraw *
 XftDrawCreateAlpha (Display *dpy,
 		    Pixmap  pixmap,
 		    int	    depth)
@@ -233,7 +233,7 @@
 	return XRenderFindVisualFormat (draw->dpy, draw->visual);
 }
 
-void
+_X_EXPORT void
 XftDrawChange (XftDraw	*draw,
 	       Drawable	drawable)
 {
@@ -250,31 +250,31 @@
     }
 }
 
-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 @@
     free (draw);
 }
 
-Picture
+_X_EXPORT Picture
 XftDrawSrcPicture (XftDraw *draw, _Xconst XftColor *color)
 {
     Display	    *dpy = draw->dpy;
@@ -457,7 +457,7 @@
     return FcTrue;
 }
 			
-Picture
+_X_EXPORT Picture
 XftDrawPicture (XftDraw *draw)
 {
     if (!_XftDrawRenderPrepare (draw))
@@ -467,7 +467,7 @@
 
 #define NUM_LOCAL   1024
 
-void
+_X_EXPORT void
 XftDrawGlyphs (XftDraw		*draw,
 	       _Xconst XftColor	*color,
 	       XftFont		*pub,
@@ -495,7 +495,7 @@
     }
 }
 
-void
+_X_EXPORT void
 XftDrawString8 (XftDraw		    *draw,
 		_Xconst XftColor    *color,
 		XftFont		    *pub,
@@ -525,7 +525,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftDrawString16 (XftDraw	    *draw,
 		 _Xconst XftColor   *color,
 		 XftFont	    *pub,
@@ -553,7 +553,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftDrawString32 (XftDraw	    *draw,
 		 _Xconst XftColor   *color,
 		 XftFont	    *pub,
@@ -581,7 +581,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftDrawStringUtf8 (XftDraw	    *draw,
 		   _Xconst XftColor *color,
 		   XftFont	    *pub,
@@ -625,7 +625,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftDrawStringUtf16 (XftDraw		*draw,
 		    _Xconst XftColor	*color,
 		    XftFont		*pub,
@@ -670,7 +670,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftDrawGlyphSpec (XftDraw		*draw,
 		  _Xconst XftColor	*color,
 		  XftFont		*pub,
@@ -698,7 +698,7 @@
     }
 }
 
-void
+_X_EXPORT void
 XftDrawGlyphFontSpec (XftDraw			*draw,
 		      _Xconst XftColor		*color,
 		      _Xconst XftGlyphFontSpec	*glyphs,
@@ -734,7 +734,7 @@
     }
 }
 
-void
+_X_EXPORT void
 XftDrawCharSpec (XftDraw		*draw,
 		 _Xconst XftColor	*color,
 		 XftFont		*pub,
@@ -764,7 +764,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftDrawCharFontSpec (XftDraw			*draw,
 		     _Xconst XftColor		*color,
 		     _Xconst XftCharFontSpec	*chars,
@@ -794,7 +794,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftDrawRect (XftDraw		*draw,
 	     _Xconst XftColor	*color,
 	     int		x, 
@@ -813,7 +813,7 @@
     }
 }
 
-Bool
+_X_EXPORT Bool
 XftDrawSetClip (XftDraw	*draw,
 		Region	r)
 {
@@ -899,7 +899,7 @@
     return True;
 }
 
-Bool
+_X_EXPORT Bool
 XftDrawSetClipRectangles (XftDraw		*draw,
 			  int			xOrigin,
 			  int			yOrigin,
@@ -974,7 +974,7 @@
     return True;
 }
 
-void
+_X_EXPORT void
 XftDrawSetSubwindowMode (XftDraw *draw, int mode)
 {
     if (mode == draw->subwindow_mode)
Index: xftextent.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftextent.c,v
retrieving revision 1.4
diff -u -r1.4 xftextent.c
--- xftextent.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftextent.c	8 Oct 2005 01:24:40 -0000
@@ -24,7 +24,7 @@
 
 #include "xftint.h"
    
-void
+_X_EXPORT void
 XftGlyphExtents (Display	    *dpy,
 		 XftFont	    *pub,
 		 _Xconst FT_UInt    *glyphs,
@@ -115,7 +115,7 @@
 
 #define NUM_LOCAL   1024
 
-void
+_X_EXPORT void
 XftTextExtents8 (Display	    *dpy,
 		 XftFont	    *pub,
 		 _Xconst FcChar8    *string, 
@@ -143,7 +143,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextExtents16 (Display	    *dpy,
 		  XftFont	    *pub,
 		  _Xconst FcChar16  *string, 
@@ -171,7 +171,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextExtents32 (Display	    *dpy,
 		  XftFont	    *pub,
 		  _Xconst FcChar32  *string, 
@@ -199,7 +199,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextExtentsUtf8 (Display	    *dpy,
 		    XftFont	    *pub,
 		    _Xconst FcChar8 *string, 
@@ -242,7 +242,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextExtentsUtf16 (Display		*dpy,
 		     XftFont		*pub,
 		     _Xconst FcChar8	*string, 
Index: xftfont.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftfont.c,v
retrieving revision 1.4
diff -u -r1.4 xftfont.c
--- xftfont.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftfont.c	8 Oct 2005 01:24:40 -0000
@@ -24,7 +24,7 @@
 
 #include "xftint.h"
 
-FcPattern *
+_X_EXPORT FcPattern *
 XftFontMatch (Display		*dpy,
 	      int		screen,
 	      _Xconst FcPattern *pattern,
@@ -68,7 +68,7 @@
     return match;
 }
 
-XftFont *
+_X_EXPORT XftFont *
 XftFontOpen (Display *dpy, int screen, ...)
 {
     va_list	    va;
@@ -114,7 +114,7 @@
     return font;
 }
 
-XftFont *
+_X_EXPORT XftFont *
 XftFontOpenName (Display *dpy, int screen, const char *name)
 {
     FcPattern	    *pat;
@@ -160,7 +160,7 @@
     return font;
 }
 
-XftFont *
+_X_EXPORT XftFont *
 XftFontOpenXlfd (Display *dpy, int screen, const char *xlfd)
 {
     FcPattern	    *pat;
Index: xftfreetype.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftfreetype.c,v
retrieving revision 1.5
diff -u -r1.5 xftfreetype.c
--- xftfreetype.c	3 Jul 2005 07:00:57 -0000	1.5
+++ xftfreetype.c	8 Oct 2005 01:24:40 -0000
@@ -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 @@
  */
 
 static XftFtFile *_XftFtFiles;
-int XftMaxFreeTypeFiles = 5;
+_X_HIDDEN int XftMaxFreeTypeFiles = 5;
 
 static XftFtFile *
 _XftGetFile (const FcChar8 *file, int id)
@@ -186,7 +186,7 @@
 #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 @@
     return hash;
 }
 
-FT_Face
+_X_EXPORT FT_Face
 XftLockFace (XftFont *public)
 {
     XftFontInt	*font = (XftFontInt *) public;
@@ -364,7 +364,7 @@
     return face;
 }
 
-void
+_X_EXPORT void
 XftUnlockFace (XftFont *public)
 {
     XftFontInt	*font = (XftFontInt *) public;
@@ -728,7 +728,7 @@
     return fi;
 }
 
-void
+_X_EXPORT void
 XftFontInfoDestroy (Display *dpy, XftFontInfo *fi)
 {
     XftFontInfoEmpty (dpy, fi);
@@ -736,19 +736,19 @@
     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 @@
     return 0;
 }
 
-XftFont *
+_X_EXPORT XftFont *
 XftFontOpenPattern (Display *dpy, FcPattern *pattern)
 {
     XftFontInfo	    info;
@@ -1017,7 +1017,7 @@
     return font;
 }
 
-XftFont *
+_X_EXPORT XftFont *
 XftFontCopy (Display *dpy, XftFont *public)
 {
     XftFontInt	    *font = (XftFontInt *) public;
@@ -1079,7 +1079,7 @@
     return public;
 }
 
-void
+_X_HIDDEN void
 XftFontManageMemory (Display *dpy)
 {
     XftDisplayInfo  *info = _XftDisplayInfoGet (dpy, False);
@@ -1125,7 +1125,7 @@
     }
 }
 
-void
+_X_EXPORT void
 XftFontClose (Display *dpy, XftFont *public)
 {
     XftDisplayInfo  *info = _XftDisplayInfoGet (dpy, False);
@@ -1145,7 +1145,7 @@
     }
 }
 
-FcBool
+_X_EXPORT FcBool
 XftInitFtLibrary (void)
 {
     if (_XftFTlibrary)
Index: xftglyphs.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftglyphs.c,v
retrieving revision 1.4
diff -u -r1.4 xftglyphs.c
--- xftglyphs.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftglyphs.c	8 Oct 2005 01:24:40 -0000
@@ -67,7 +67,7 @@
 		font->glyph_memory, glyph_memory);
 }
 
-void
+_X_EXPORT void
 XftFontLoadGlyphs (Display	    *dpy,
 		   XftFont	    *pub,
 		   FcBool	    need_bitmaps,
@@ -608,7 +608,7 @@
     XftUnlockFace (&font->public);
 }
 
-void
+_X_EXPORT void
 XftFontUnloadGlyphs (Display		*dpy,
 		     XftFont		*pub,
 		     _Xconst FT_UInt	*glyphs,
@@ -659,7 +659,7 @@
 	XRenderFreeGlyphs (dpy, font->glyphset, glyphBuf, nused);
 }
 
-FcBool
+_X_EXPORT FcBool
 XftFontCheckGlyph (Display	*dpy,
 		   XftFont	*pub,
 		   FcBool	need_bitmaps,
@@ -700,7 +700,7 @@
 	return FcFalse;
 }
 
-FcBool
+_X_EXPORT FcBool
 XftCharExists (Display	    *dpy,
 	       XftFont	    *pub,
 	       FcChar32    ucs4)
@@ -712,7 +712,7 @@
 
 #define Missing	    ((FT_UInt) ~0)
 
-FT_UInt
+_X_EXPORT FT_UInt
 XftCharIndex (Display	    *dpy, 
 	      XftFont	    *pub,
 	      FcChar32	    ucs4)
@@ -756,7 +756,7 @@
 /*
  * 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 @@
 	_XftFontValidateMemory (dpy, pub);
 }
 
-void
+_X_HIDDEN void
 _XftFontManageMemory (Display *dpy, XftFont *pub)
 {
     XftFontInt	*font = (XftFontInt *) pub;
Index: xftinit.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftinit.c,v
retrieving revision 1.4
diff -u -r1.4 xftinit.c
--- xftinit.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftinit.c	8 Oct 2005 01:24:40 -0000
@@ -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 @@
     return True;
 }
 
-int
+_X_EXPORT int
 XftGetVersion (void)
 {
     return XftVersion;
@@ -64,7 +64,7 @@
 
 static int  XftAllocNotify, XftFreeNotify;
 
-void
+_X_HIDDEN void
 XftMemReport (void)
 {
     int	i;
@@ -84,7 +84,7 @@
     XftFreeNotify = 0;
 }
 
-void
+_X_HIDDEN void
 XftMemAlloc (int kind, int size)
 {
     if (XftDebug() & XFT_DBG_MEMORY)
@@ -99,7 +99,7 @@
     }
 }
 
-void
+_X_HIDDEN void
 XftMemFree (int kind, int size)
 {
     if (XftDebug() & XFT_DBG_MEMORY)
Index: xftint.h
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftint.h,v
retrieving revision 1.6
diff -u -r1.6 xftint.h
--- xftint.h	3 Jul 2005 07:00:57 -0000	1.6
+++ xftint.h	8 Oct 2005 01:24:40 -0000
@@ -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 ||			    \
Index: xftlist.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftlist.c,v
retrieving revision 1.4
diff -u -r1.4 xftlist.c
--- xftlist.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftlist.c	8 Oct 2005 01:24:40 -0000
@@ -24,7 +24,7 @@
 
 #include "xftint.h"
 
-FcFontSet *
+_X_HIDDEN FcFontSet *
 XftListFontsPatternObjects (Display	    *dpy,
 			    int		    screen,
 			    FcPattern	    *pattern,
@@ -33,7 +33,7 @@
     return FcFontList (0, pattern, os);
 }
 
-FcFontSet *
+_X_EXPORT FcFontSet *
 XftListFonts (Display	*dpy,
 	      int	screen,
 	      ...)
Index: xftname.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftname.c,v
retrieving revision 1.4
diff -u -r1.4 xftname.c
--- xftname.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftname.c	8 Oct 2005 01:24:40 -0000
@@ -32,9 +32,9 @@
 
 #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 @@
     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;
Index: xftrender.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftrender.c,v
retrieving revision 1.4
diff -u -r1.4 xftrender.c
--- xftrender.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftrender.c	8 Oct 2005 01:24:40 -0000
@@ -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 @@
 	_XftFontManageMemory (dpy, pub);
 }
 
-void
+_X_EXPORT void
 XftGlyphSpecRender (Display		    *dpy,
 		    int			    op,
 		    Picture		    src,
@@ -350,7 +350,7 @@
 	_XftFontManageMemory (dpy, pub);
 }
 
-void
+_X_EXPORT void
 XftCharSpecRender (Display		*dpy,
 		   int			op,
 		   Picture		src,
@@ -410,7 +410,7 @@
     return prefer;
 }
 
-void
+_X_EXPORT void
 XftGlyphFontSpecRender (Display			    *dpy,
 			int			    op,
 			Picture			    src,
@@ -641,7 +641,7 @@
 	    _XftFontManageMemory (dpy, glyphs[i].font);
 }
 
-void
+_X_EXPORT void
 XftCharFontSpecRender (Display			*dpy,
 		       int			op,
 		       Picture			src,
@@ -675,7 +675,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextRender8 (Display		*dpy,
 		int		op,
 		Picture		src,
@@ -707,7 +707,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextRender16 (Display	    *dpy,
 		 int		    op,
 		 Picture	    src,
@@ -739,7 +739,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextRender16BE (Display	    *dpy,
 		   int		    op,
 		   Picture	    src,
@@ -772,7 +772,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextRender16LE (Display	    *dpy,
 		   int		    op,
 		   Picture	    src,
@@ -805,7 +805,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextRender32 (Display	    *dpy,
 		 int		    op,
 		 Picture	    src,
@@ -837,7 +837,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextRender32BE (Display	    *dpy,
 		   int		    op,
 		   Picture	    src,
@@ -873,7 +873,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextRender32LE (Display	    *dpy,
 		   int		    op,
 		   Picture	    src,
@@ -909,7 +909,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextRenderUtf8 (Display	    *dpy,
 		   int		    op,
 		   Picture	    src,
@@ -958,7 +958,7 @@
 	free (glyphs);
 }
 
-void
+_X_EXPORT void
 XftTextRenderUtf16 (Display	    *dpy,
 		    int		    op,
 		    Picture	    src,
Index: xftstr.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftstr.c,v
retrieving revision 1.4
diff -u -r1.4 xftstr.c
--- xftstr.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftstr.c	8 Oct 2005 01:24:40 -0000
@@ -24,7 +24,7 @@
 
 #include "xftint.h"
 
-int
+_X_HIDDEN int
 _XftMatchSymbolic (XftSymbolic *s, int n, const char *name, int def)
 {
     while (n--)
Index: xftswap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftswap.c,v
retrieving revision 1.4
diff -u -r1.4 xftswap.c
--- xftswap.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftswap.c	8 Oct 2005 01:24:40 -0000
@@ -24,7 +24,7 @@
 
 #include "xftint.h"
 
-int
+_X_HIDDEN int
 XftNativeByteOrder (void)
 {
     int	    whichbyte = 1;
@@ -55,7 +55,7 @@
 		 ((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 @@
     }
 }
 
-void
+_X_HIDDEN void
 XftSwapCARD24 (CARD8 *data, int width, int height)
 {
     int	    units, u;
@@ -87,7 +87,7 @@
     }
 }
 
-void
+_X_HIDDEN void
 XftSwapCARD16 (CARD16 *data, int u)
 {
     char    n;
@@ -98,7 +98,7 @@
     }
 }
 
-void
+_X_HIDDEN void
 XftSwapImage (XImage *image)
 {
     switch (image->bits_per_pixel) {
Index: xftxlfd.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/xftxlfd.c,v
retrieving revision 1.4
diff -u -r1.4 xftxlfd.c
--- xftxlfd.c	3 Jul 2005 07:00:57 -0000	1.4
+++ xftxlfd.c	8 Oct 2005 01:24:40 -0000
@@ -82,7 +82,7 @@
     return (char *) 0;
 }
 
-FcPattern *
+_X_EXPORT FcPattern *
 XftXlfdParse (const char *xlfd_orig, FcBool ignore_scalable, FcBool complete)
 {
     FcPattern	*pat;