From f06e8a61d6ed8f3054878167bffee619f852aad9 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 30 Nov 2010 16:34:38 -0800
Subject: [PATCH] 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>
---
 render/render.c | 8 +++++---
 1 file 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);\