Build failure in ftfont.c

[Vin Shelton]

Greetings -

As of approximately 2008-06-09, I started seeing the following error
when running 'make bootstrap' on the latest CVS sources:

gcc -c -I/usr/local/include -Demacs -DHAVE_CONFIG_H  -I.
-I/usr/local/src/emacs-2008-06-09/src -D_BSD_SOURCE
-I/usr/X11R6/include -I/usr/X11R6/include -I/usr/include/freetype2
-I/usr/include/freetype2/config    -g -O2 -Wno-pointer-sign
/usr/local/src/emacs-2008-06-09/src/ftfont.c
/usr/local/src/emacs-2008-06-09/src/ftfont.c: In function 'ftfont_font_format':
/usr/local/src/emacs-2008-06-09/src/ftfont.c:1753: error: 'len'
undeclared (first use in this function)
/usr/local/src/emacs-2008-06-09/src/ftfont.c:1753: error: (Each
undeclared identifier is reported only once
/usr/local/src/emacs-2008-06-09/src/ftfont.c:1753: error: for each
function it appears in.)
make[2]: *** [ftfont.o] Error 1
make[2]: Leaving directory `/usr/local/build/emacs-2008-06-09/src'
make[1]: *** [bootstrap-build] Error 2
make[1]: Leaving directory `/usr/local/build/emacs-2008-06-09'
make: *** [bootstrap] Error 2

The following patch addresses this:

Index: src/ftfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/ftfont.c,v
retrieving revision 1.20
diff -a -u -r1.20 ftfont.c
--- src/ftfont.c        10 Jun 2008 02:07:53 -0000      1.20
+++ src/ftfont.c        10 Jun 2008 13:40:16 -0000
@@ -1748,6 +1748,7 @@
   if (strcmp ((char *) str, "BDF") == 0)
     return intern ("bdf");
 #else  /* not FC_FONTFORMAT */
+  size_t len;
   if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch)
     return Qnil;
   len = strlen ((char *) str);


Regards,
  Vin Shelton