[xine-cvs] CVS: xine-ui/src/xitk/xine-toolkit font.c,1.25,1.26

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk/xine-toolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14759/src/xitk/xine-toolkit

Modified Files:
	font.c 
Log Message:
disable some functions which are not used when building WITH_XFT


Index: font.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/font.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- font.c	29 Jan 2004 22:19:52 -0000	1.25
+++ font.c	12 Feb 2004 19:24:38 -0000	1.26
@@ -75,6 +75,7 @@
 static xitk_font_cache_t cache;
 
 #ifdef WITH_XMB
+# ifndef WITH_XFT
 /*
  * Guess if error occured, release missing charsets list.
  * There is a problem with rendering when "ISO10646-1" charset is missing.
@@ -100,6 +101,7 @@
 
   return 0;
 }
+# endif
 
 /* convert a -*-* .. style font description into something Xft can digest */
 char * xitk_font_core_string_to_xft( char * old_name) {
@@ -132,6 +134,7 @@
   return old_name;
 }
 
+# ifndef WITH_XFT
 /*
  * XCreateFontSet requires font name starting with '-'
  */
@@ -150,6 +153,7 @@
 
   return strdup(right_name);
 }
+# endif
 #endif
 
 /*
@@ -158,7 +162,7 @@
 static int xitk_font_load_one(Display *display, char *font, xitk_font_t *xtfs) {
   int    ok;
 #ifdef WITH_XFT
-# else
+#else
 # ifdef WITH_XMB
   char **missing;
   char  *def;