diff options
| -rw-r--r-- | Xext/panoramiX.c | 10 | ||||
| -rw-r--r-- | Xext/panoramiXsrv.h | 12 | ||||
| -rw-r--r-- | render/render.c | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index e6334bd93..391346a6b 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 b0a5a6e1f..9751feb54 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 702955818..fbb296809 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 |