diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-30 16:34:38 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-12-07 11:10:35 -0800 |
| commit | f06e8a61d6ed8f3054878167bffee619f852aad9 (patch) | |
| tree | b8f533e12207526faec16dcd241295f66679b07a | |
| parent | 780754050bc9cb1489f92a2a890ab5665e3e6358 (diff) | |
Move inclusion of panoramiX headers to top of render.c
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 <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | render/render.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/render/render.c b/render/render.c index 85a43924a..0bbbae899 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);\ |