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 <[email protected]>
> 
> ---
> 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

Attachment: pgpe2hmzTEp3O.pgp
Description: PGP signature

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to