[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg
Subject:    Re: Current tinderbox regression (xserver)
From:       Paulo =?iso-8859-1?Q?C=E9sar_Pereira_de_Andrade?= <pcpa () mandriva ! com ! br>
Date:       2009-01-30 5:41:49
Message-ID: 50272.201.25.142.193.1233294109.squirrel () webmail ! mandriva ! com ! br
[Download RAW message or body]

Chris Ball wrote:
> http://tinderbox.x.org/builds/2009-01-30-0005/logs/xserver/#build
>
> In file included from ../Xext/panoramiX.h:43, from dispatch.c:134:
> /home/cjb/xorg-build/include/X11/extensions/panoramiXext.h:48:
>   error: expected ')' before '*' token
> /home/cjb/xorg-build/include/X11/extensions/panoramiXext.h:53:
>   error: expected '=', ',', ';', 'asm' or '__attribute__'
>   before 'XPanoramiXQueryVersion'

  It is me striking again :-)  Since there was already one
missing prototype declared in panoramiXext.h, I just added the
remaining ones, but that requires defining "Display" to something
(yes, I did not remember the X Server build could include that
header...)

  The X Server build only needs the macros PANORAMIX_MAJOR_VERSION
and PANORAMIX_MINOR_VERSION from <X11/extensions/panoramiXext.h>

  One option is to use the schema used by some other related
cases, and protect the prototypes there with something like:
#ifndef _PANORAMIX_SERVER
...
#endif

  Or move those macros to X11/extensions/panoramiXproto.h like
is done in other similar cases.

  There is also some code doing weird things to get Display
defined, see xserver/Xext/securitysrv.h

  To avoid the risk of breaking things elsewhere, the proper
correction should be to protect the prototypes with:
#ifndef _PANORAMIX_SERVER
and add _XFUNCPROTOBEGIN/_XFUNCPROTOEND while at it.

> --
> Chris Ball   <cjb@laptop.org>

Paulo

_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg
[prev in list] [next in list] [prev in thread] [next in thread]