[5/8] xinerama: Use RESTYPE consistently

Submitted by Adam Jackson on March 8, 2011, 12:28 a.m.

Details

Message ID 1299515298-21167-6-git-send-email-ajax@redhat.com
State Accepted, archived
Commit cd58924d294de2abddbd2f03c2db021894fe9759
Headers show

Not browsing as part of any series.

Commit Message

Adam Jackson March 8, 2011, 12:28 a.m. 
No functional change

Signed-off-by: Adam Jackson <ajax@redhat.com>
---
 Xext/panoramiX.c    |   10 +++++-----
 Xext/panoramiXsrv.h |   12 ++++++------
 render/render.c     |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index e6334bd..391346a 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -83,11 +83,11 @@  static DepthPtr		PanoramiXDepths;
 static int		PanoramiXNumVisuals;
 static VisualPtr	PanoramiXVisuals;
 
-unsigned long XRC_DRAWABLE;
-unsigned long XRT_WINDOW;
-unsigned long XRT_PIXMAP;
-unsigned long XRT_GC;
-unsigned long XRT_COLORMAP;
+RESTYPE XRC_DRAWABLE;
+RESTYPE XRT_WINDOW;
+RESTYPE XRT_PIXMAP;
+RESTYPE XRT_GC;
+RESTYPE XRT_COLORMAP;
 
 static Bool VisualsEqual(VisualPtr, ScreenPtr, VisualPtr);
 XineramaVisualsEqualProcPtr XineramaVisualsEqualPtr = &VisualsEqual;
diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
index b0a5a6e..9751feb 100644
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@@ -21,12 +21,12 @@  extern _X_EXPORT int XineramaDeleteResource(pointer, XID);
 
 extern _X_EXPORT void XineramaReinitData(ScreenPtr);
 
-extern _X_EXPORT unsigned long XRC_DRAWABLE;
-extern _X_EXPORT unsigned long XRT_WINDOW;
-extern _X_EXPORT unsigned long XRT_PIXMAP;
-extern _X_EXPORT unsigned long XRT_GC;
-extern _X_EXPORT unsigned long XRT_COLORMAP;
-extern _X_EXPORT unsigned long XRT_PICTURE;
+extern _X_EXPORT RESTYPE XRC_DRAWABLE;
+extern _X_EXPORT RESTYPE XRT_WINDOW;
+extern _X_EXPORT RESTYPE XRT_PIXMAP;
+extern _X_EXPORT RESTYPE XRT_GC;
+extern _X_EXPORT RESTYPE XRT_COLORMAP;
+extern _X_EXPORT RESTYPE XRT_PICTURE;
 
 /*
  * Drivers are allowed to wrap this function.  Each wrapper can decide that the
diff --git a/render/render.c b/render/render.c
index 7029558..fbb2968 100644
--- a/render/render.c
+++ b/render/render.c
@@ -239,7 +239,7 @@  RenderClientCallback (CallbackListPtr	*list,
 }
 
 #ifdef PANORAMIX
-unsigned long	XRT_PICTURE;
+RESTYPE	XRT_PICTURE;
 #endif
 
 void

Comments

Dave Airlie March 10, 2011, 7:16 a.m. 
On Tue, Mar 8, 2011 at 2:28 AM, Adam Jackson <ajax@redhat.com> wrote:
> No functional change
>
> Signed-off-by: Adam Jackson <ajax@redhat.com>

Reviewed-by: Dave Airlie <airlied@redhat.com>

since I just posted nearly the exact same patch.

Dave.