From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: John Ralls Newsgroups: gmane.lisp.guile.bugs Subject: bug#35405: Patch for 35405 Date: Tue, 23 Apr 2019 15:12:51 -0700 Message-ID: References: <74A3FAC1-5988-4FA5-9E89-DAE0A6D7B0B0@ceridwen.us> Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_E1A5BCD7-28E6-4A3D-A3E4-157733F75AD5" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="84288"; mail-complaints-to="usenet@blaine.gmane.org" To: 35405@debbugs.gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Wed Apr 24 00:14:18 2019 Return-path: Envelope-to: guile-bugs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hJ3g8-000LmV-OZ for guile-bugs@m.gmane.org; Wed, 24 Apr 2019 00:14:16 +0200 Original-Received: from localhost ([127.0.0.1]:60221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ3g7-0006DZ-PD for guile-bugs@m.gmane.org; Tue, 23 Apr 2019 18:14:15 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:55855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ3g1-0006Cg-1j for bug-guile@gnu.org; Tue, 23 Apr 2019 18:14:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ3fy-0006zy-UV for bug-guile@gnu.org; Tue, 23 Apr 2019 18:14:08 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:40994) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJ3fv-0006xu-Ig for bug-guile@gnu.org; Tue, 23 Apr 2019 18:14:06 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hJ3fu-0007cF-9C for bug-guile@gnu.org; Tue, 23 Apr 2019 18:14:03 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <74A3FAC1-5988-4FA5-9E89-DAE0A6D7B0B0@ceridwen.us> Resent-From: John Ralls Original-Sender: "Debbugs-submit" Resent-CC: bug-guile@gnu.org Resent-Date: Tue, 23 Apr 2019 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35405 X-GNU-PR-Package: guile Original-Received: via spool by 35405-submit@debbugs.gnu.org id=B35405.155605758329191 (code B ref 35405); Tue, 23 Apr 2019 22:14:02 +0000 Original-Received: (at 35405) by debbugs.gnu.org; 23 Apr 2019 22:13:03 +0000 Original-Received: from localhost ([127.0.0.1]:54536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hJ3ex-0007al-7v for submit@debbugs.gnu.org; Tue, 23 Apr 2019 18:13:03 -0400 Original-Received: from resqmta-ch2-06v.sys.comcast.net ([69.252.207.38]:48106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hJ3eu-0007aE-T4 for 35405@debbugs.gnu.org; Tue, 23 Apr 2019 18:13:01 -0400 Original-Received: from resomta-ch2-06v.sys.comcast.net ([69.252.207.102]) by resqmta-ch2-06v.sys.comcast.net with ESMTP id J3aAhu8A4AFowJ3eohgvzC; Tue, 23 Apr 2019 22:12:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcastmailservice.net; s=20180828_2048; t=1556057574; bh=W9LEphIZSySk9QtOKYkNBsv1I5uoPL1Pyzc0L9xFrxo=; h=Received:Received:Received:Received:Received:From:Content-Type: Mime-Version:Subject:Message-Id:Date:To; b=JPpVCpxRqbBWGjgIg+WOgsv/xa9LEBBJoMT0Gnsiy/rcoGe3IS+12Pl0ph0gQltVU F7P6Ycd7ddF5iELhqNrS5ao9szz8KlR6Gz5RfJiz3b+ylgxyaj+DLsScoqyHEXuBD2 n5T+OMhh+lSFvQOzNYwHwFjdx7W9PVWZ+1+08qOcGAsveVkYY02kA30bDzlZKQi4RN BUDYTwKPRqqWLcJF5P7eh1AsFIt3dk90ewziauw+yz7pCw8b10boADlQWnrFrySEMs oOmuG2kvNVUBuRT/27L2CpQlog1HIF5JxbAz0wqNXg5P0B7GyYUrI3imP9Vy3Z3xCg /j+ipJLnMc7SA== Original-Received: from jeeves.ceridwen.fremont.ca.us ([24.6.45.99]) by resomta-ch2-06v.sys.comcast.net with ESMTPA id J3enhpsASJyHTJ3eohq7lK; Tue, 23 Apr 2019 22:12:54 +0000 X-Xfinity-VAAS: gggruggvucftvghtrhhoucdtuddrgeduuddrgeelgddtiecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucevohhmtggrshhtqdftvghsihdpqfgfvfdppffquffrtefokffrnecuuegrihhlohhuthemuceftddtnecunecujfgurhephfgtggfukfffvffosehmtdhmrehhtddtnecuhfhrohhmpeflohhhnhcutfgrlhhlshcuoehjrhgrlhhlshestggvrhhiugifvghnrdhusheqnecukfhppedvgedriedrgeehrdelleenucfrrghrrghmpehhvghlohepjhgvvghvvghsrdgtvghrihgufigvnhdrfhhrvghmohhnthdrtggrrdhushdpihhnvghtpedvgedriedrgeehrdelledpmhgrihhlfhhrohhmpehjrhgrlhhlshestggvrhhiugifvghnrdhushdprhgtphhtthhopeefheegtdehseguvggssghughhsrdhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd X-Xfinity-VMeta: sc=0;st=legit Original-Received: from localhost (localhost [127.0.0.1]) by jeeves.ceridwen.fremont.ca.us (Postfix) with ESMTP id 3ABB21A00374 for <35405@debbugs.gnu.org>; Tue, 23 Apr 2019 15:12:53 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at jeeves.ceridwen.fremont.ca.us Original-Received: from jeeves.ceridwen.fremont.ca.us ([127.0.0.1]) by localhost (jeeves.ceridwen.fremont.ca.us [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z4G9rm9POB_E for <35405@debbugs.gnu.org>; Tue, 23 Apr 2019 15:12:52 -0700 (PDT) Original-Received: from [192.168.1.42] (unknown [192.168.1.42]) by jeeves.ceridwen.fremont.ca.us (Postfix) with ESMTP id 4DBA91A00367 for <35405@debbugs.gnu.org>; Tue, 23 Apr 2019 15:12:52 -0700 (PDT) X-Mailer: Apple Mail (2.3445.102.3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Original-Sender: "bug-guile" Xref: news.gmane.org gmane.lisp.guile.bugs:9320 Archived-At: --Apple-Mail=_E1A5BCD7-28E6-4A3D-A3E4-157733F75AD5 Content-Disposition: attachment; filename=0001-Fix-build-on-MinGW-w64.patch Content-Type: application/octet-stream; x-unix-mode=0755; name="0001-Fix-build-on-MinGW-w64.patch" Content-Transfer-Encoding: quoted-printable =46rom=20f2de9d206b33bc2e27acde1e751df9ba8faf60a9=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20John=20Ralls=20=0ADate:=20= Tue,=2023=20Apr=202019=2015:06:48=20-0700=0ASubject:=20[PATCH]=20Fix=20= build=20on=20MinGW-w64=0A=0AFixes=20bug=2035405=0A=0A=20=20=20=20=20=20=20= *=20lib/poll.h:=20MinGW=20provides=20struct=20pollfd=20in=20winsock2.h=20= and=0A=20=20=20=20=20=20=20=20=20lib/threads.h=20includes=20it=20so=20= disable=20declaring=20it=20in=20poll.h=20and=0A=20=20=20=20=20=20=20=20=20= get=20the=20declaration=20from=20winsock2.h.=20Otherwise=20gcc=20= complains=20that=0A=20=20=20=20=20=20=20=20=20poll()=20has=20a=20= different=20signature=20between=20the=20declaration=20and=0A=20=20=20=20=20= =20=20=20=20definition.=0A=20=20=20=20=20=20=20*=20libguile/socket.c:=20= TCP=20declarations=20are=20in=20winsock.h=20on=20Windows.=0A=20=20=20=20=20= =20=20*=20libguile/timegm.c:=20MinGW=20doesn't=20include=20mktime=20so=20= include=20mktime.c=20to=0A=20=20=20=20=20=20=20=20=20provide=20it.=0A---=0A= =20lib/poll.in.h=20=20=20=20=20|=205=20+++++=0A=20lib/timegm.c=20=20=20=20= =20=20|=202=20++=0A=20libguile/socket.c=20|=206=20+++++-=0A=203=20files=20= changed,=2012=20insertions(+),=201=20deletion(-)=0A=0Adiff=20--git=20= a/lib/poll.in.h=20b/lib/poll.in.h=0Aindex=20e9b141d8f..3b0a99165=20= 100644=0A---=20a/lib/poll.in.h=0A+++=20b/lib/poll.in.h=0A@@=20-40,6=20= +40,9=20@@=0A=20=0A=20=0A=20#if=20!@HAVE_POLL_H@=0A+#=20ifdef=20= __MINGW32__=0A+#=20=20include=20=0A+#=20endif=0A=20=0A=20/*=20= fake=20a=20poll(2)=20environment=20*/=0A=20#=20define=20POLLIN=20=20=20=20= =20=200x0001=20=20=20=20=20=20/*=20any=20readable=20data=20available=20=20= =20*/=0A@@=20-55,12=20+58,14=20@@=0A=20=0A=20#=20if=20= !GNULIB_defined_poll_types=0A=20=0A+#=20=20ifndef=20__MINGW32__=0A=20= struct=20pollfd=0A=20{=0A=20=20=20int=20fd;=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20/*=20which=20file=20descriptor=20= to=20poll=20*/=0A=20=20=20short=20events;=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20/*=20events=20we=20are=20interested=20in=20=20=20*/=0A=20= =20=20short=20revents;=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20/*=20= events=20found=20on=20return=20=20=20=20=20=20=20=20*/=0A=20};=0A+#=20=20= endif=0A=20=0A=20typedef=20unsigned=20long=20nfds_t;=0A=20=0Adiff=20= --git=20a/lib/timegm.c=20b/lib/timegm.c=0Aindex=20168da8ead..35bc67dc1=20= 100644=0A---=20a/lib/timegm.c=0A+++=20b/lib/timegm.c=0A@@=20-38,3=20= +38,5=20@@=20timegm=20(struct=20tm=20*tmp)=0A=20=20=20tmp->tm_isdst=20=3D=20= 0;=0A=20=20=20return=20__mktime_internal=20(tmp,=20__gmtime_r,=20= &gmtime_offset);=0A=20}=0A+=0A+#include=20"mktime.c"=0Adiff=20--git=20= a/libguile/socket.c=20b/libguile/socket.c=0Aindex=2071c17e892..f5371b6c8=20= 100644=0A---=20a/libguile/socket.c=0A+++=20b/libguile/socket.c=0A@@=20= -40,7=20+40,11=20@@=0A=20#include=20=0A=20#endif=0A=20#include=20= =0A-#include=20=0A+#ifdef=20__MINGW32__=0A= +#=20include=20=0A+#else=0A+#=20include=20=0A= +#endif=0A=20#include=20=0A=20#include=20=0A=20=0A= --=20=0A2.20.1=0A=0A= --Apple-Mail=_E1A5BCD7-28E6-4A3D-A3E4-157733F75AD5--