From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5471 invoked by alias); 21 Aug 2012 11:11:55 -0000 Received: (qmail 5446 invoked by uid 22791); 21 Aug 2012 11:11:53 -0000 X-SWARE-Spam-Status: No, hits=-3.0 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from smtpout.karoo.kcom.com (HELO smtpout.karoo.kcom.com) (212.50.160.34) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 21 Aug 2012 11:11:30 +0000 Received: from 213-152-38-55.dsl.eclipse.net.uk (HELO [192.168.1.103]) ([213.152.38.55]) by smtpout.karoo.kcom.com with ESMTP; 21 Aug 2012 12:11:28 +0100 Message-ID: <50336CEB.6060900@dronecode.org.uk> Date: Tue, 21 Aug 2012 11:11:00 -0000 From: Jon TURNEY Reply-To: cygwin-apps@cygwin.com User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: cygwin-apps@cygwin.com CC: jon_y-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org 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> In-Reply-To: <503312FD.4030305@users.sourceforge.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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/msg00069.txt.bz2 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 >>> =================================================================== >>> --- 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_INCLUDE_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 ifdefs. I've never been really sure what historical accidents are behind the #ifdef 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. [1] http://cgit.freedesktop.org/xorg/proto/xproto/tree/Xwindows.h