From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Mattias_Engdeg=C3=A5rd?= Newsgroups: gmane.emacs.devel Subject: Re: Unbreak build on macOS Date: Tue, 9 Jul 2019 16:46:30 +0200 Message-ID: <0C3B72C3-B0BF-4B41-A877-18B72BBD1549@acm.org> References: <55EE5431-8EC2-4562-8F75-33151A0F086E@acm.org> Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_BDFA26AF-E1FB-44BF-9765-6E90A70CE5B8" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="232029"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Paul Eggert , Emacs developers To: Richard Copley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jul 09 17:11:40 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hkrmO-000yG5-8F for ged-emacs-devel@m.gmane.org; Tue, 09 Jul 2019 17:11:40 +0200 Original-Received: from localhost ([::1]:50848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkrmN-0002TO-6y for ged-emacs-devel@m.gmane.org; Tue, 09 Jul 2019 11:11:39 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40267) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkrlT-0001Ax-Mz for emacs-devel@gnu.org; Tue, 09 Jul 2019 11:10:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkrlS-0008Sn-7R for emacs-devel@gnu.org; Tue, 09 Jul 2019 11:10:43 -0400 Original-Received: from mail1431c50.megamailservers.eu ([91.136.14.31]:60980 helo=mail118c50.megamailservers.eu) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkrlL-0007sw-LM for emacs-devel@gnu.org; Tue, 09 Jul 2019 11:10:38 -0400 X-Authenticated-User: mattiase@bredband.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1562683593; bh=J/A41pGK/3L+MoXg81Be+weCbaDRDpedhry9OPQE+OE=; h=From:Subject:Date:In-Reply-To:Cc:To:References:From; b=ltshEdXbFpvd6c7mp9JEAu0VQtGGGxVMgKmz6b/wPSubplnAADB131neNKHkP/La7 1k4Elk8Ysv1nQEX8p85D2YCTUHVzLL7vtp/CaqYxbpqLYty1alMO2DsCk9mDk5C4Qq gNNbn+HesUzV5Iyq9UyHFFy4K2A6kVRvyJh2sy2A= Feedback-ID: mattiase@acm.or Original-Received: from [192.168.0.4] ([188.150.171.71]) (authenticated bits=0) by mail118c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id x69EkU5l029416; Tue, 9 Jul 2019 14:46:32 +0000 In-Reply-To: X-Mailer: Apple Mail (2.3445.104.11) X-CTCH-RefID: str=0001.0A0B020D.5D24A8C9.000C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=JLcVTfCb c=1 sm=1 tr=0 a=SF+I6pRkHZhrawxbOkkvaA==:117 a=SF+I6pRkHZhrawxbOkkvaA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=pGLkceISAAAA:8 a=SchXaWwW5r7a8yqilmcA:9 a=CjuIK1q_8ugA:10 a=tYLUWoNeVQ84yPNRDEIA:9 a=B2y7HmGcmWMA:10 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 91.136.14.31 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:238448 Archived-At: --Apple-Mail=_BDFA26AF-E1FB-44BF-9765-6E90A70CE5B8 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii 9 juli 2019 kl. 15.51 skrev Richard Copley : >=20 > The build is currently (as of Mattias' fdea0e602b) broken on MS = Windows. I didn't > check which recent revision introduced the breakage; possibly also = f8ab90839f. Sorry to hear that --- apparently font.h is being preprocessed with = '#define open #rpl_open' on Windows. Would you try this smelly hack instead? --Apple-Mail=_BDFA26AF-E1FB-44BF-9765-6E90A70CE5B8 Content-Disposition: attachment; filename=0001-Fix-Windows-build-by-renaming-open-open_.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="0001-Fix-Windows-build-by-renaming-open-open_.patch" Content-Transfer-Encoding: quoted-printable =46rom=208fddeef12f517379f2fe8c80f4c3bd08ebb4a13c=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20=3D?UTF-8?q?Mattias=3D20Engdeg=3DC3=3DA5rd?=3D=20= =0ADate:=20Tue,=209=20Jul=202019=2016:44:24=20+0200=0A= Subject:=20[PATCH]=20Fix=20Windows=20build=20by=20renaming=20open=20->=20= open_=0A=0A*=20src/xftfont.c=20(xftfont_driver)=0A*=20src/xfont.c=20= (xfont_driver)=0A*=20src/nsfont.m=20(nsfont_driver)=0A*=20src/macfont.m=20= (macfont_driver)=0A*=20src/ftxfont.c=20(ftxfont_driver)=0A*=20= src/ftfont.c=20(ftfont_driver)=0A*=20src/ftcrfont.c=20(ftcrfont_driver)=0A= *=20src/font.h=20(struct=20font_driver)=0A*=20src/font.c=20= (font_open_entity):=0ARename=20`open'=20member=20to=20`open_',=20to=20= avoid=20clash=20with=20preprocessor=20define=0Aof=20`open'=20in=20= lib/fcntl.h.=20=20Remove=20earlier=20#undef=20hack.=0A---=0A=20= src/font.c=20=20=20=20=20|=20=206=20+-----=0A=20src/font.h=20=20=20=20=20= |=2010=20+++++-----=0A=20src/ftcrfont.c=20|=20=202=20+-=0A=20= src/ftfont.c=20=20=20|=20=202=20+-=0A=20src/ftxfont.c=20=20|=20=202=20+-=0A= =20src/macfont.m=20=20|=20=202=20+-=0A=20src/nsfont.m=20=20=20|=20=202=20= +-=0A=20src/xfont.c=20=20=20=20|=20=202=20+-=0A=20src/xftfont.c=20=20|=20= =202=20+-=0A=209=20files=20changed,=2013=20insertions(+),=2017=20= deletions(-)=0A=0Adiff=20--git=20a/src/font.c=20b/src/font.c=0Aindex=20= 457f3f9958..dd77b18cc1=20100644=0A---=20a/src/font.c=0A+++=20= b/src/font.c=0A@@=20-44,10=20+44,6=20@@=20along=20with=20GNU=20Emacs.=20=20= If=20not,=20see=20.=20=20*/=0A=20#include=20= TERM_HEADER=0A=20#endif=20/*=20HAVE_WINDOW_SYSTEM=20*/=0A=20=0A-/*=20= Avoid=20macro=20definition=20of=20`open'=20in=20generated=20lib/fcntl.h=20= to=20mess=20up=0A-=20=20=20use=20of=20it=20as=20a=20struct=20member.=20=20= */=0A-#undef=20open=0A-=0A=20#define=20DEFAULT_ENCODING=20Qiso8859_1=0A=20= =0A=20/*=20Vector=20of=20Vfont_weight_table,=20Vfont_slant_table,=20and=20= Vfont_width_table.=20*/=0A@@=20-2906,7=20+2902,7=20@@=20font_open_entity=20= (struct=20frame=20*f,=20Lisp_Object=20entity,=20int=20pixel_size)=0A=20=20= =20=20=20=20width=20and=20height.=20=20*/=0A=20=20=20for=20(psize=20=3D=20= pixel_size;=20;=20psize++)=0A=20=20=20=20=20{=0A-=20=20=20=20=20=20= font_object=20=3D=20driver_list->driver->open=20(f,=20entity,=20psize);=0A= +=20=20=20=20=20=20font_object=20=3D=20driver_list->driver->open_=20(f,=20= entity,=20psize);=0A=20=20=20=20=20=20=20if=20(NILP=20(font_object))=0A=20= =09return=20Qnil;=0A=20=20=20=20=20=20=20font=20=3D=20XFONT_OBJECT=20= (font_object);=0Adiff=20--git=20a/src/font.h=20b/src/font.h=0Aindex=20= 3387878ad3..35cc865b28=20100644=0A---=20a/src/font.h=0A+++=20= b/src/font.h=0A@@=20-58,7=20+58,7=20@@=20INLINE_HEADER_BEGIN=0A=20=09= Lisp=20object=20encapsulating=20"struct=20font".=20=20This=20corresponds=20= to=0A=20=09an=20opened=20font.=0A=20=0A-=09Note:=20Only=20the=20method=20= `open'=20of=20a=20font-driver=20can=20create=20this=0A+=09Note:=20Only=20= the=20method=20`open_'=20of=20a=20font-driver=20can=20create=20this=0A=20= =09object,=20and=20it=20should=20never=20be=20modified=20by=20Lisp.=20=20= */=0A=20=0A=20=0A@@=20-594,9=20+594,9=20@@=20struct=20font_driver=0A=20=20= =20=20=20=20:weight,=20:slant,=20:width,=20:size,=20:dpi,=20:spacing,=20= :avgwidth.=20=20If=0A=20=20=20=20=20=20the=20font=20is=20scalable,=20= :size=20and=20:avgwidth=20must=20be=200.=0A=20=0A-=20=20=20=20=20The=20= `open'=20method=20of=20the=20same=20font-backend=20is=20called=20with=20= one=20of=0A+=20=20=20=20=20The=20`open_'=20method=20of=20the=20same=20= font-backend=20is=20called=20with=20one=20of=0A=20=20=20=20=20=20the=20= returned=20font-entities.=20=20If=20the=20backend=20needs=20additional=0A= -=20=20=20=20=20information=20to=20be=20used=20in=20`open'=20method,=20= this=20method=20can=20add=20any=0A+=20=20=20=20=20information=20to=20be=20= used=20in=20`open_'=20method,=20this=20method=20can=20add=20any=0A=20=20=20= =20=20=20Lispy=20value=20using=20the=20property=20:font-entity=20to=20= the=20entities.=0A=20=0A=20=20=20=20=20=20This=20and=20the=20following=20= `match'=20are=20the=20only=20APIs=20that=20allocate=0A@@=20-623,8=20= +623,8=20@@=20struct=20font_driver=0A=20=0A=20=20=20/*=20Open=20a=20font=20= specified=20by=20FONT_ENTITY=20on=20frame=20F.=20=20If=20the=20font=20is=0A= =20=20=20=20=20=20scalable,=20open=20it=20with=20PIXEL_SIZE.=20=20*/=0A-=20= =20Lisp_Object=20(*open)=20(struct=20frame=20*f,=20Lisp_Object=20= font_entity,=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20int=20pixel_size);=0A+=20=20Lisp_Object=20(*open_)=20(struct=20= frame=20*f,=20Lisp_Object=20font_entity,=0A+=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20int=20pixel_size);=0A=20=0A=20=20= =20/*=20Close=20FONT.=20=20NOTE:=20this=20can=20be=20called=20by=20GC.=20= =20*/=0A=20=20=20void=20(*close)=20(struct=20font=20*font);=0Adiff=20= --git=20a/src/ftcrfont.c=20b/src/ftcrfont.c=0Aindex=20= 9378621216..ef8af1f6b3=20100644=0A---=20a/src/ftcrfont.c=0A+++=20= b/src/ftcrfont.c=0A@@=20-576,7=20+576,7=20@@=20struct=20font_driver=20= const=20ftcrfont_driver=20=3D=0A=20=20=20.list=20=3D=20ftcrfont_list,=0A=20= =20=20.match=20=3D=20ftcrfont_match,=0A=20=20=20.list_family=20=3D=20= ftfont_list_family,=0A-=20=20.open=20=3D=20ftcrfont_open,=0A+=20=20= .open_=20=3D=20ftcrfont_open,=0A=20=20=20.close=20=3D=20ftcrfont_close,=0A= =20=20=20.has_char=20=3D=20ftcrfont_has_char,=0A=20=20=20.encode_char=20= =3D=20ftcrfont_encode_char,=0Adiff=20--git=20a/src/ftfont.c=20= b/src/ftfont.c=0Aindex=20a80e2fb5c4..8c619acace=20100644=0A---=20= a/src/ftfont.c=0A+++=20b/src/ftfont.c=0A@@=20-3039,7=20+3039,7=20@@=20= static=20struct=20font_driver=20const=20ftfont_driver=20=3D=0A=20=20=20= .list=20=3D=20ftfont_list,=0A=20=20=20.match=20=3D=20ftfont_match,=0A=20=20= =20.list_family=20=3D=20ftfont_list_family,=0A-=20=20.open=20=3D=20= ftfont_open,=0A+=20=20.open_=20=3D=20ftfont_open,=0A=20=20=20.close=20=3D=20= ftfont_close,=0A=20=20=20.has_char=20=3D=20ftfont_has_char,=0A=20=20=20= .encode_char=20=3D=20ftfont_encode_char,=0Adiff=20--git=20= a/src/ftxfont.c=20b/src/ftxfont.c=0Aindex=20ae7d1a5a9b..a4818801d9=20= 100644=0A---=20a/src/ftxfont.c=0A+++=20b/src/ftxfont.c=0A@@=20-335,7=20= +335,7=20@@=20struct=20font_driver=20const=20ftxfont_driver=20=3D=0A=20=20= =20.list=20=3D=20ftxfont_list,=0A=20=20=20.match=20=3D=20ftxfont_match,=0A= =20=20=20.list_family=20=3D=20ftfont_list_family,=0A-=20=20.open=20=3D=20= ftxfont_open,=0A+=20=20.open_=20=3D=20ftxfont_open,=0A=20=20=20.close=20= =3D=20ftxfont_close,=0A=20=20=20.has_char=20=3D=20ftfont_has_char,=0A=20=20= =20.encode_char=20=3D=20ftfont_encode_char,=0Adiff=20--git=20= a/src/macfont.m=20b/src/macfont.m=0Aindex=202b7f963fd6..51d503b8f4=20= 100644=0A---=20a/src/macfont.m=0A+++=20b/src/macfont.m=0A@@=20-1663,7=20= +1663,7=20@@=20static=20int=20macfont_variation_glyphs=20(struct=20font=20= *,=20int=20c,=0A=20=20=20.match=20=3D=20macfont_match,=0A=20=20=20= .list_family=20=3D=20macfont_list_family,=0A=20=20=20.free_entity=20=3D=20= macfont_free_entity,=0A-=20=20.open=20=3D=20macfont_open,=0A+=20=20= .open_=20=3D=20macfont_open,=0A=20=20=20.close=20=3D=20macfont_close,=0A=20= =20=20.has_char=20=3D=20macfont_has_char,=0A=20=20=20.encode_char=20=3D=20= macfont_encode_char,=0Adiff=20--git=20a/src/nsfont.m=20b/src/nsfont.m=0A= index=20e22a954e63..a4d2415f7a=20100644=0A---=20a/src/nsfont.m=0A+++=20= b/src/nsfont.m=0A@@=20-1491,7=20+1491,7=20@@=20-=20= (void)setIntAttribute:=20(NSInteger)attributeTag=20value:=20= (NSInteger)val=0A=20=20=20.list=20=3D=20nsfont_list,=0A=20=20=20.match=20= =3D=20nsfont_match,=0A=20=20=20.list_family=20=3D=20nsfont_list_family,=0A= -=20=20.open=20=3D=20nsfont_open,=0A+=20=20.open_=20=3D=20nsfont_open,=0A= =20=20=20.close=20=3D=20nsfont_close,=0A=20=20=20.has_char=20=3D=20= nsfont_has_char,=0A=20=20=20.encode_char=20=3D=20nsfont_encode_char,=0A= diff=20--git=20a/src/xfont.c=20b/src/xfont.c=0Aindex=20= 9a8417b12d..c4770d19e4=20100644=0A---=20a/src/xfont.c=0A+++=20= b/src/xfont.c=0A@@=20-1106,7=20+1106,7=20@@=20struct=20font_driver=20= const=20xfont_driver=20=3D=0A=20=20=20.list=20=3D=20xfont_list,=0A=20=20=20= .match=20=3D=20xfont_match,=0A=20=20=20.list_family=20=3D=20= xfont_list_family,=0A-=20=20.open=20=3D=20xfont_open,=0A+=20=20.open_=20= =3D=20xfont_open,=0A=20=20=20.close=20=3D=20xfont_close,=0A=20=20=20= .prepare_face=20=3D=20xfont_prepare_face,=0A=20=20=20.has_char=20=3D=20= xfont_has_char,=0Adiff=20--git=20a/src/xftfont.c=20b/src/xftfont.c=0A= index=2074add58007..e917859a49=20100644=0A---=20a/src/xftfont.c=0A+++=20= b/src/xftfont.c=0A@@=20-643,7=20+643,7=20@@=20struct=20font_driver=20= const=20xftfont_driver=20=3D=0A=20=20=20.list=20=3D=20xftfont_list,=0A=20= =20=20.match=20=3D=20xftfont_match,=0A=20=20=20.list_family=20=3D=20= ftfont_list_family,=0A-=20=20.open=20=3D=20xftfont_open,=0A+=20=20.open_=20= =3D=20xftfont_open,=0A=20=20=20.close=20=3D=20xftfont_close,=0A=20=20=20= .prepare_face=20=3D=20xftfont_prepare_face,=0A=20=20=20.done_face=20=3D=20= xftfont_done_face,=0A--=20=0A2.20.1=20(Apple=20Git-117)=0A=0A= --Apple-Mail=_BDFA26AF-E1FB-44BF-9765-6E90A70CE5B8--