On Tue, Nov 30, 2010 at 04:37:56PM -0800, Alan Coopersmith wrote: > Fixes compiler error from Sun compilers due to _X_EXPORT declaration > being included after the unlabeled version: > > "../Xext/panoramiXsrv.h", line 29: redeclaration must have the same or more > restrictive linker scoping: XRT_PICTURE > > Signed-off-by: Alan Coopersmith <[email protected]> > --- > render/render.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/render/render.c b/render/render.c > index 00241f9..de2e9b4 100644 > --- a/render/render.c > +++ b/render/render.c > @@ -47,6 +47,11 @@ > #include "xace.h" > #include "protocol-versions.h" > > +#ifdef PANORAMIX > +#include "panoramiX.h" > +#include "panoramiXsrv.h" > +#endif > + > #if HAVE_STDINT_H > #include <stdint.h> > #elif !defined(UINT32_MAX) > @@ -2651,9 +2656,6 @@ SProcRenderDispatch (ClientPtr client) > } > > #ifdef PANORAMIX > -#include "panoramiX.h" > -#include "panoramiXsrv.h" > - > #define VERIFY_XIN_PICTURE(pPicture, pid, client, mode) {\ > int rc = dixLookupResourceByType((pointer *)&(pPicture), pid,\ > XRT_PICTURE, client, mode);\ > -- > 1.7.3.2 >
Reviewed-by: Peter Hutterer <[email protected]> Cheers, Peter _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
