svn merge file:///D:/svnrepos/vcxsrv/branches/released .

Gives currently link errors. xorg-server needs to be upgraded to.

1 files changed, 3 insertions, 10 deletions

diff --git a/libXfont/src/bitmap/bitmapfunc.c b/libXfont/src/bitmap/bitmapfunc.c
index 670c0a900..a171d8436 100644
--- a/libXfont/src/bitmap/bitmapfunc.c
+++ b/libXfont/src/bitmap/bitmapfunc.c
@@ -67,6 +67,7 @@ typedef struct _BitmapFileFunctions {
 			       FontFilePtr /* file */ );
 }           BitmapFileFunctionsRec, *BitmapFileFunctionsPtr;
 
+static int BitmapGetRenderIndex(FontRendererPtr renderer);
 
 /*
  * the readers[] and renderers[] arrays must be in the same order,
@@ -104,9 +105,6 @@ static BitmapFileFunctionsRec readers[] = {
     { bdfReadFont, bdfReadFontInfo} ,
 # endif
 #endif
-#if XFONT_PCFFORMAT
-    { pmfReadFont, pcfReadFontInfo} ,
-#endif
     { NULL, NULL }
 };
 
@@ -151,7 +149,7 @@ BitmapOpenBitmap (FontPathElementPtr fpe, FontPtr *ppFont, int flags,
 
     FontFileClose (file);
     if (ret != Successful) {
-	xfree(pFont);
+	free(pFont);
     } else {
 	*ppFont = pFont;
     }
@@ -236,11 +234,6 @@ static FontRendererRec	renderers[] = {
 	CAPABILITIES },
 # endif
 #endif
-#if XFONT_PCFFORMAT
-    { ".pmf", 4, BitmapOpenBitmap, BitmapOpenScalable,
-	BitmapGetInfoBitmap, BitmapGetInfoScalable, 0,
-	CAPABILITIES },
-#endif
     { NULL, 0, NULL, 0, NULL, NULL, 0, 0 }
 };
 
@@ -260,7 +253,7 @@ BitmapRegisterFontFileFunctions (void)
  * the font info reader, and the bitmap scaling routine.  All users
  * of this routine must be kept in step with the renderer array.
  */
-int
+static int
 BitmapGetRenderIndex(FontRendererPtr renderer)
 {
     return renderer - renderers;