From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sebastian Rose Newsgroups: gmane.emacs.devel Subject: Re: undefined reference to ftfont_variation_glyphs Date: Fri, 27 Mar 2009 22:39:29 +0100 Message-ID: <874oxey7am.fsf@kassiopeya.MSHEIMNETZ> References: <873acy3n9m.fsf@kassiopeya.MSHEIMNETZ> <87vdpu28a1.fsf@kassiopeya.MSHEIMNETZ> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1238189797 8304 80.91.229.12 (27 Mar 2009 21:36:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Mar 2009 21:36:37 +0000 (UTC) Cc: emacs-devel Mailinglist To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 27 22:37:55 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LnJkP-0005pR-BC for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2009 22:37:54 +0100 Original-Received: from localhost ([127.0.0.1]:50453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LnJj1-0002ds-Ui for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2009 17:36:27 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LnJiw-0002df-Q1 for emacs-devel@gnu.org; Fri, 27 Mar 2009 17:36:22 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LnJir-0002dE-Pl for emacs-devel@gnu.org; Fri, 27 Mar 2009 17:36:22 -0400 Original-Received: from [199.232.76.173] (port=55400 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LnJir-0002dB-Jn for emacs-devel@gnu.org; Fri, 27 Mar 2009 17:36:17 -0400 Original-Received: from mail.gmx.net ([213.165.64.20]:57422) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1LnJir-0003v7-0D for emacs-devel@gnu.org; Fri, 27 Mar 2009 17:36:17 -0400 Original-Received: (qmail invoked by alias); 27 Mar 2009 21:36:15 -0000 Original-Received: from p5B0420CA.dip0.t-ipconnect.de (EHLO kassiopeya.MSHEIMNETZ.gmx.de) [91.4.32.202] by mail.gmx.net (mp070) with SMTP; 27 Mar 2009 22:36:15 +0100 X-Authenticated: #8529601 X-Provags-ID: V01U2FsdGVkX186kEoxOjw6qJ0+wID9F6QyZHs8/8bKHDrs4cwzr3 lrKxDl2Zs/sxe7 In-Reply-To: (Stefan Monnier's message of "Fri, 27 Mar 2009 15:35:34 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.91 (gnu/linux) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.74 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:109884 Archived-At: --=-=-= Stefan Monnier writes: >> This is the fix I used (and that works fine): > > Could you resend it in "unified diff" (or "context diff") format, please? Unified: cvs diff -u src/ftfont.c --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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; -- 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 --=-=-=--