From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19009 invoked by alias); 21 Aug 2012 11:34:48 -0000 Received: (qmail 18917 invoked by uid 22791); 21 Aug 2012 11:34:46 -0000 X-SWARE-Spam-Status: No, hits=-8.5 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,KHOP_PGP_SIGNED,KHOP_RCVD_TRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-pb0-f43.google.com (HELO mail-pb0-f43.google.com) (209.85.160.43) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 21 Aug 2012 11:34:26 +0000 Received: by pbbrq2 with SMTP id rq2so8044481pbb.2 for ; Tue, 21 Aug 2012 04:34:26 -0700 (PDT) Received: by 10.68.191.97 with SMTP id gx1mr13381938pbc.149.1345548865877; Tue, 21 Aug 2012 04:34:25 -0700 (PDT) Received: from [219.92.175.163] (swz-175-163.tm.net.my. [219.92.175.163]) by mx.google.com with ESMTPS id qn3sm1306318pbc.6.2012.08.21.04.34.22 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Aug 2012 04:34:24 -0700 (PDT) Message-ID: <50337233.4030205@users.sourceforge.net> Date: Tue, 21 Aug 2012 11:34:00 -0000 From: JonY User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.12) Gecko/20080213 Thunderbird/2.0.0.12 Mnenhy/0.7.5.0 MIME-Version: 1.0 To: cygwin-apps@cygwin.com Subject: Re: [ITA] w32api-3.0b_svn5368-1 References: <20120814072938.GA13181@calimero.vinschen.de> <20120814073403.GB13181@calimero.vinschen.de> <20120814075611.GC13181@calimero.vinschen.de> <50322A61.1050806@users.sourceforge.net> <5032C6C9.4070704@users.sourceforge.net> <5032E14F.5090604@users.sourceforge.net> <5032F137.2070905@users.sourceforge.net> <5033010B.1020509@users.sourceforge.net> <20120821034635.GA17755@ednor.casa.cgf.cx> <503312FD.4030305@users.sourceforge.net> <50336CEB.6060900@dronecode.org.uk> In-Reply-To: <50336CEB.6060900@dronecode.org.uk> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigC110BF8D869DBFD7092FF996" X-IsSubscribed: yes Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com X-SW-Source: 2012-08/txt/msg00071.txt.bz2 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigC110BF8D869DBFD7092FF996 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-length: 3215 On 8/21/2012 19:11, Jon TURNEY wrote: > On 21/08/2012 05:47, JonY wrote: >> On 8/21/2012 11:46, Christopher Faylor wrote: >>> On Tue, Aug 21, 2012 at 11:31:23AM +0800, JonY wrote: >>>> On 8/21/2012 10:23, JonY wrote: >>>>> On 8/21/2012 09:15, JonY wrote: >>>>>> On 8/21/2012 07:22, Yaakov (Cygwin/X) wrote: >>>>>>> On 2012-08-20 07:15, JonY wrote: >>>>>>> So I built this from SVN trunk myself, and xorg-server still FTBFS: >>>>>>> >>>>>>> In file included from /usr/include/w32api/windows.h:69:0, >>>>>>> from /usr/include/X11/Xwindows.h:60, >>>>>>> from ../../../hw/xwin/winms.h:42, >>>>>>> from ../../../hw/xwin/win.h:193, >>>>>>> from winpriv.c:10: >>>>>>> /usr/include/w32api/windef.h:107:13: error: conflicting types for '= BOOL' >>>>>>> /usr/include/X11/Xmd.h:143:16: note: previous declaration of 'BOOL'= was >>>> >>>> Yaakov, try this change: >>>> >>>> Index: include/windef.h >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >>>> --- include/windef.h (revision 5374) >>>> +++ include/windef.h (working copy) >>>> @@ -101,6 +101,7 @@ >>>> #ifndef _DEF_WINBOOL_ >>>> #define _DEF_WINBOOL_ >>>> typedef int WINBOOL; >>>> +#ifndef XFree86Server /* For xorg-server */ >>>> #pragma push_macro("BOOL") >>>> #undef BOOL >>>> #if !defined(__OBJC__) && !defined(__OBJC_BOOL) && !defined(__objc_INC= LUDE_GNU) >>>> @@ -110,6 +111,7 @@ >>>> typedef BOOL *PBOOL; >>>> typedef BOOL *LPBOOL; >>>> #pragma pop_macro("BOOL") >>>> +#endif /* XFree86Server */ >>>> #endif /* _DEF_WINBOOL_ */ >>>> >>>> I'm not sure if things will explode horribly. >>> >>> Maybe this is just a sanity check/proof of concept thing but do we >>> really want to have specific ifdef's like this in shipping headers? >>> That would suggest a neverending cascade of ifdefs. >>> >>> If we really need something like this then I'd suggest something more >>> generic like a #ifdef __PROTECT_PROTECT_BOOL_MACRO. >> >> yeah, it is just a proof of concept, it is copied from the existing >> w32api package. If this works, I'll talk to Kai about untangling the ifd= efs. >=20 > I've never been really sure what historical accidents are behind the #ifd= ef > XFree86Server in w32api. It doesn't do anything useful, since in the X > server, windows header files are always included via a header which wraps= them > to avoid name collisions [1], which carefully arranges for XFree86Server = to be > undefined. >=20 > [1] http://cgit.freedesktop.org/xorg/proto/xproto/tree/Xwindows.h >=20 >=20 Here's the part from mingw-w64 windef.h: #ifndef _DEF_WINBOOL_ #define _DEF_WINBOOL_ typedef int WINBOOL; #pragma push_macro("BOOL") #undef BOOL #if !defined(__OBJC__) && !defined(__OBJC_BOOL) && !defined(__objc_INCLUDE_GNU) typedef int BOOL; #endif #define BOOL WINBOOL typedef BOOL *PBOOL; typedef BOOL *LPBOOL; #pragma pop_macro("BOOL") #endif /* _DEF_WINBOOL_ */ Note the pragma push and undef, the Xwindows.h macro tricks no longer works. Perhaps guarding against _XFree86Server instead of XFree86Server will work? --------------enigC110BF8D869DBFD7092FF996 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" Content-length: 196 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (MingW32) iEYEARECAAYFAlAzcjkACgkQp56AKe10wHcHbwCeOU5GJwWHDOhjTU1Ia1GZuJJq C+IAn3n3Is739dphnyXc9YX7y90qfnsS =diSN -----END PGP SIGNATURE----- --------------enigC110BF8D869DBFD7092FF996--