From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andy Moreton Newsgroups: gmane.emacs.devel Subject: Re: master 3de31e7: Fix compilation of image.c on MS-Windows Date: Mon, 09 Nov 2020 23:44:22 +0000 Message-ID: <86r1p214fd.fsf@gmail.com> References: <20201109153652.21064.52372@vcs0.savannah.gnu.org> <20201109153654.3EADA20A27@vcs0.savannah.gnu.org> <87pn4mjz3m.fsf@gnus.org> <83k0uu4i4q.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20323"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.50 (windows-nt) To: emacs-devel@gnu.org Cancel-Lock: sha1:SEMcsAxixsd2V/rM/i/NdKSnHIE= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Nov 10 00:45:51 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kcGr8-0005BS-JH for ged-emacs-devel@m.gmane-mx.org; Tue, 10 Nov 2020 00:45:50 +0100 Original-Received: from localhost ([::1]:47900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcGr7-000705-2p for ged-emacs-devel@m.gmane-mx.org; Mon, 09 Nov 2020 18:45:49 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcGpu-0006X9-I5 for emacs-devel@gnu.org; Mon, 09 Nov 2020 18:44:34 -0500 Original-Received: from static.214.254.202.116.clients.your-server.de ([116.202.254.214]:60188 helo=ciao.gmane.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcGpt-0005lt-4M for emacs-devel@gnu.org; Mon, 09 Nov 2020 18:44:34 -0500 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1kcGpo-0003YS-Rf for emacs-devel@gnu.org; Tue, 10 Nov 2020 00:44:28 +0100 X-Injected-Via-Gmane: http://gmane.org/ Received-SPF: pass client-ip=116.202.254.214; envelope-from=ged-emacs-devel@m.gmane-mx.org; helo=ciao.gmane.io X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/09 18:44:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:258960 Archived-At: On Mon 09 Nov 2020, Eli Zaretskii wrote: >> From: Lars Ingebrigtsen >> Cc: Eli Zaretskii >> Date: Mon, 09 Nov 2020 17:04:29 +0100 >> >> eliz@gnu.org (Eli Zaretskii) writes: >> >> > Fix compilation of image.c on MS-Windows >> > >> > This is a followup to last change in image.c. >> > * src/image.c (rsvg_handle_get_intrinsic_dimensions): Define to >> > call fn_rsvg_handle_get_intrinsic_dimensions. >> > (svg_css_length_to_pixels): Compile only for librsvg >= 2.46.0, as >> > RsvgLength type was not defined before. >> >> This leads to the following warnings on Debian bullseye, apparently: >> >> image.c: In function ‘svg_css_length_to_pixels’: >> image.c:9769:13: warning: this statement may fall through [-Wimplicit-fallthrough=] > > Surely, not my change led to this: I only made that code be > conditionally compiled. True, but your change does not compile on Windows. In image.c: # if LIBRSVG_CHECK_VERSION (2, 46, 0) DEF_DLL_FN (void, rsvg_handle_get_intrinsic_dimensions, RsvgHandle *, gboolean *, RsvgLength *, gboolean *, RsvgLength *, gboolean *, RsvgRectangle *)); The 3rd argument should start with a left paren. AndyM