Re: undefined reference to ftfont_variation_glyphs

[Sebastian Rose <sebastian_rose@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:
>> This is the fix I used (and that works fine):
>
> Could you resend it in "unified diff" (or "context diff") format, please?

Unified:

<sh:/.../emacs-CVS/emacs> cvs diff -u src/ftfont.c

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1308 bytes --]

Index: src/ftfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/ftfont.c,v
retrieving revision 1.45
diff -u -r1.45 ftfont.c
--- src/ftfont.c	11 Feb 2009 09:45:14 -0000	1.45
+++ src/ftfont.c	27 Mar 2009 21:34:17 -0000
@@ -381,8 +381,15 @@
 				    int *, int *));
 static Lisp_Object ftfont_otf_capability P_ ((struct font *));
 static Lisp_Object ftfont_shape P_ ((Lisp_Object));
+
+#ifdef HAVE_LIBOTF
+#ifdef HAVE_M17N_FLT
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
 static int ftfont_variation_glyphs P_ ((struct font *, int c,
 					unsigned variations[256]));
+#endif	/* HAVE_OTF_GET_VARIATION_GLYPHS */
+#endif	/* HAVE_M17N_FLT */
+#endif	/* HAVE_LIBOTF */
 
 struct font_driver ftfont_driver =
   {
@@ -422,11 +429,15 @@
     NULL,
 #endif	/* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
     NULL,			/* check */
+#ifdef HAVE_LIBOTF
+#ifdef HAVE_M17N_FLT
 #ifdef HAVE_OTF_GET_VARIATION_GLYPHS
     ftfont_variation_glyphs
 #else
     NULL
 #endif
+#endif
+#endif
   };
 
 extern Lisp_Object QCname;
</#part>

-- 
Sebastian Rose, EMMA STIL - mediendesign, Niemeyerstr.6, 30449 Hannover
Tel.:  +49 (0)511 - 36 58 472
Fax:   +49 (0)1805 - 233633 - 11044
mobil: +49 (0)173 - 83 93 417
Email: s.rose@emma-stil.de, sebastian_rose@gmx.de
Http:  www.emma-stil.de