This patch avoids 79 gcc-3.4.3 warnings
		'xxx' declared `static' but never defined
	mostly due to including "ftfuncs.h" with the declaration
	of static functions defined in "ftfuncs.c".

diff -ur -N XOrg-6.8.2.orig/xc/extras/ttf2pt1/ft.c XOrg-6.8.2/xc/extras/ttf2pt1/ft.c
--- XOrg-6.8.2.orig/xc/extras/ttf2pt1/ft.c	2005-03-23 17:52:21.000000000 +0100
+++ XOrg-6.8.2/xc/extras/ttf2pt1/ft.c	2005-04-04 18:51:26.000000000 +0200
@@ -43,6 +43,7 @@
 #include "fontutil.h"
 #include "fontenc.h"
 #include "ft.h"
+#define NOT_IN_FTFUNCS
 #include "ftfuncs.h"
 #endif /* XP_PSTEXT */
 
diff -ur -N XOrg-6.8.2.orig/xc/extras/ttf2pt1/pt1.c XOrg-6.8.2/xc/extras/ttf2pt1/pt1.c
--- XOrg-6.8.2.orig/xc/extras/ttf2pt1/pt1.c	2005-03-23 18:23:25.000000000 +0100
+++ XOrg-6.8.2/xc/extras/ttf2pt1/pt1.c	2005-04-04 18:11:55.000000000 +0200
@@ -143,7 +143,9 @@
 static void fdelsmall( GLYPH *g, double minlen);
 static void alloc_gex_con( GENTRY *ge);
 static double fjointsin2( GENTRY *ge1, GENTRY *ge2);
+#if 0
 static double fcvarea( GENTRY *ge);
+#endif
 static double fcvval( GENTRY *ge, int axis, double t);
 static void fsampledots( GENTRY *ge, double dots[][2], int ndots);
 static void fnormalizege( GENTRY *ge);
diff -ur -N XOrg-6.8.2.orig/xc/extras/ttf2pt1/ttf2pt1.c XOrg-6.8.2/xc/extras/ttf2pt1/ttf2pt1.c
--- XOrg-6.8.2.orig/xc/extras/ttf2pt1/ttf2pt1.c	2005-03-22 19:30:09.000000000 +0100
+++ XOrg-6.8.2/xc/extras/ttf2pt1/ttf2pt1.c	2005-04-04 18:51:27.000000000 +0200
@@ -111,6 +111,7 @@
 #include "fontutil.h"
 #include "fontenc.h"
 #include "ft.h"
+#define NOT_IN_FTFUNCS
 #include "ftfuncs.h"
 #endif /* XP_PSTEXT */
 
diff -ur -N XOrg-6.8.2.orig/xc/lib/font/FreeType/ftfuncs.h XOrg-6.8.2/xc/lib/font/FreeType/ftfuncs.h
--- XOrg-6.8.2.orig/xc/lib/font/FreeType/ftfuncs.h	2004-05-04 20:47:31.000000000 +0200
+++ XOrg-6.8.2/xc/lib/font/FreeType/ftfuncs.h	2005-04-04 18:49:35.000000000 +0200
@@ -152,6 +152,8 @@
     fsRange *ranges;
 } FTFontRec, *FTFontPtr;
 
+#ifndef NOT_IN_FTFUNCS
+
 /* Prototypes for some local functions */
 
 static int FreeTypeOpenFace(FTFacePtr *facep, char *FTFileName, char *realFileName, int faceNumber);
@@ -183,3 +185,5 @@
                  FontBitmapFormatPtr bmfmt, FT_Int32 load_flags, 
 		 struct TTCapInfo *tmp_ttcap, char *dynStrTTCapCodeRange,
 		 int ttcap_spacing );
+
+#endif /* NOT_IN_FTFUNCS */
diff -ur -N XOrg-6.8.2.orig/xc/programs/Xserver/Xprint/ps/PsFTFonts.c XOrg-6.8.2/xc/programs/Xserver/Xprint/ps/PsFTFonts.c
--- XOrg-6.8.2.orig/xc/programs/Xserver/Xprint/ps/PsFTFonts.c	2004-04-23 20:57:56.000000000 +0200
+++ XOrg-6.8.2/xc/programs/Xserver/Xprint/ps/PsFTFonts.c	2005-04-04 18:51:31.000000000 +0200
@@ -39,6 +39,7 @@
 #include FT_FREETYPE_H
 
 #include "ft.h"
+#define NOT_IN_FTFUNCS
 #include "ftfuncs.h"
 
 char *
diff -ur -N XOrg-6.8.2.orig/xc/programs/Xserver/Xprint/ps/psout_ft.c XOrg-6.8.2/xc/programs/Xserver/Xprint/ps/psout_ft.c
--- XOrg-6.8.2.orig/xc/programs/Xserver/Xprint/ps/psout_ft.c	2004-04-23 20:57:56.000000000 +0200
+++ XOrg-6.8.2/xc/programs/Xserver/Xprint/ps/psout_ft.c	2005-04-04 18:51:30.000000000 +0200
@@ -38,6 +38,7 @@
 #include "fontutil.h"
 #include "fontenc.h"
 #include "ft.h"
+#define NOT_IN_FTFUNCS
 #include "ftfuncs.h"
 #include "servermd.h" /* needed for endian test (IMAGE_BYTE_ORDER) */
 
diff -ur -N XOrg-6.8.2.orig/xc/programs/Xserver/Xprint/ps/psout_ftpstype1.c XOrg-6.8.2/xc/programs/Xserver/Xprint/ps/psout_ftpstype1.c
--- XOrg-6.8.2.orig/xc/programs/Xserver/Xprint/ps/psout_ftpstype1.c	2004-04-23 20:57:56.000000000 +0200
+++ XOrg-6.8.2/xc/programs/Xserver/Xprint/ps/psout_ftpstype1.c	2005-04-04 18:51:28.000000000 +0200
@@ -41,6 +41,7 @@
 #include "fontutil.h"
 #include "fontenc.h"
 #include "ft.h"
+#define NOT_IN_FTFUNCS
 #include "ftfuncs.h"
 
 int do_debug_ft2pt1             = FALSE;
diff -ur -N XOrg-6.8.2.orig/xc/programs/Xserver/Xprint/ps/psout_ftpstype3.c XOrg-6.8.2/xc/programs/Xserver/Xprint/ps/psout_ftpstype3.c
--- XOrg-6.8.2.orig/xc/programs/Xserver/Xprint/ps/psout_ftpstype3.c	2004-04-23 20:57:56.000000000 +0200
+++ XOrg-6.8.2/xc/programs/Xserver/Xprint/ps/psout_ftpstype3.c	2005-04-04 18:51:28.000000000 +0200
@@ -65,6 +65,7 @@
 #include "fontutil.h"
 #include "fontenc.h"
 #include "ft.h"
+#define NOT_IN_FTFUNCS
 #include "ftfuncs.h"
 
 struct ft2info