[PATCH] xfixes: fix sdksyms exporting PanoramiXSaveXFixesVector

Thierry Reding thierry.reding at avionic-design.de
Fri Jan 18 03:19:19 PST 2013


On Wed, Jan 09, 2013 at 05:18:00PM +0100, Maarten Lankhorst wrote:
> Slap _X_INTERNAL so sdksyms won't attempt to export PanoramiXSaveXFixesVector just because it has extern in it..
> 
> Fixes build of x1.14rc1
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
> 
> ---
> diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
> index 334c71f..309954d 100644
> --- a/xfixes/xfixesint.h
> +++ b/xfixes/xfixesint.h
> @@ -291,7 +291,7 @@ int
>   SProcXFixesDestroyPointerBarrier(ClientPtr client);
>  
>  /* Xinerama */
> -extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
> +_X_INTERNAL extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
>  void PanoramiXFixesInit(void);
>  void PanoramiXFixesReset(void);
>  

I had a different fix for this but forgot to send it out. Basically the
patch protects the symbol using an #ifdef PANORAMIX which fixes the
build failure as well. Since the symbol is clearly Xinerama specific,
maybe that would be a more correct fix?

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20130118/551dab84/attachment.pgp>


More information about the xorg-devel mailing list