From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andy Moreton Newsgroups: gmane.emacs.devel Subject: Re: Windows mingw64 and cygwin builds broken Date: Fri, 13 Nov 2015 02:11:36 +0000 Message-ID: <86lha2ir6v.fsf@gmail.com> References: <867flnrnhg.fsf@gmail.com> <83y4e3gdbb.fsf@gnu.org> <86y4e2rhom.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1447380730 10402 80.91.229.3 (13 Nov 2015 02:12:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 13 Nov 2015 02:12:10 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 13 03:12:01 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Zx3qK-0004xw-Uq for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 03:12:01 +0100 Original-Received: from localhost ([::1]:50631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zx3qL-0001OH-3B for ged-emacs-devel@m.gmane.org; Thu, 12 Nov 2015 21:12:01 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zx3qH-0001Nj-6l for emacs-devel@gnu.org; Thu, 12 Nov 2015 21:11:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zx3qD-0001iy-Up for emacs-devel@gnu.org; Thu, 12 Nov 2015 21:11:57 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:50240) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zx3qD-0001it-Nj for emacs-devel@gnu.org; Thu, 12 Nov 2015 21:11:53 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Zx3qA-0004k3-Ca for emacs-devel@gnu.org; Fri, 13 Nov 2015 03:11:50 +0100 Original-Received: from 82-69-64-228.dsl.in-addr.zen.co.uk ([82.69.64.228]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 Nov 2015 03:11:50 +0100 Original-Received: from andrewjmoreton by 82-69-64-228.dsl.in-addr.zen.co.uk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 Nov 2015 03:11:50 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 69 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 82-69-64-228.dsl.in-addr.zen.co.uk User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5.50 (windows-nt) Cancel-Lock: sha1:RCkGiYbEEZEc/Ze73ciD13pq1yw= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:194315 Archived-At: On Thu 12 Nov 2015, Andy Moreton wrote: > On Thu 12 Nov 2015, Eli Zaretskii wrote: > >>> From: Andy Moreton >>> Date: Thu, 12 Nov 2015 20:06:51 +0000 >>> >>> Changes in commit 9d43941569fc broke the Windows builds. >> >> Thanks, I tried to fix those problems in c1bc6e5. > make[2]: Leaving directory '/cygdrive/c/emacs/git/emacs/master/obj-cygwin64-w32/lisp' > ./temacs --batch --load loadup bootstrap > > /cygdrive/c/emacs/git/emacs/master/src/lread.c:3787: Emacs fatal error: assertion failed: INTEGERP (bucket) > Fatal error 6: Aborted: paxctl -zex emacs.exe > mv -f emacs.exe bootstrap-emacs.exe > mv: cannot stat ‘emacs.exe’: No such file or directory > Makefile:707: recipe for target 'bootstrap-emacs.exe' failed This appears to be caused by a clash between symbols: ./dbusbind.c:1704: DEFSYM (QCdbus_timeout, ":timeout"); ./w32fns.c:9302: DEFSYM (QCtimeout, ":timeout"); Renaming QCdbus_timeout to QCtimeout allows the cygwin-w32 and mingw64 builds to bootstrap successfully (I don't know if that is the right fix though). Should the other keyword argument symbols in dbusbind.c also be renamed QCdbus_* -> QC* ? Here's a minimal working patch: diff --git a/src/dbusbind.c b/src/dbusbind.c index ce0465dcb8b9..d3ace51cf1eb 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -1405,7 +1405,7 @@ usage: (dbus-message-internal &rest REST) */) } /* Check for timeout parameter. */ - if ((count+2 <= nargs) && (EQ ((args[count]), QCdbus_timeout))) + if ((count+2 <= nargs) && (EQ ((args[count]), QCtimeout))) { CHECK_NATNUM (args[count+1]); timeout = min (XFASTINT (args[count+1]), INT_MAX); @@ -1701,7 +1701,7 @@ syms_of_dbusbind (void) DEFSYM (QCdbus_session_bus, ":session"); /* Lisp symbol for method call timeout. */ - DEFSYM (QCdbus_timeout, ":timeout"); + DEFSYM (QCtimeout, ":timeout"); /* Lisp symbols of D-Bus types. */ DEFSYM (QCdbus_type_byte, ":byte"); diff --git a/src/w32fns.c b/src/w32fns.c index b71002f8bfc9..07102e477245 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -9635,8 +9635,10 @@ This variable has effect only on Windows Vista and later. */); defsubr (&Sw32_window_exists_p); defsubr (&Sw32_battery_status); defsubr (&Sw32__menu_bar_in_use); +#ifndef CYGWIN defsubr (&Sw32_notification_notify); defsubr (&Sw32_notification_close); +#endif #ifdef WINDOWSNT defsubr (&Sfile_system_info);