Mesa (master): st/xorg: Fix some warnings

[Jakob Bornecrantz]

Module: Mesa
Branch: master
Commit: 7d9af52bc59bfeb19d9bdb55258f4a830a1b0d04
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d9af52bc59bfeb19d9bdb55258f4a830a1b0d04

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Thu Aug 27 17:56:30 2009 +0100

st/xorg: Fix some warnings

---

 src/gallium/state_trackers/xorg/xorg_crtc.c    |    3 +--
 src/gallium/state_trackers/xorg/xorg_driver.c  |    6 +-----
 src/gallium/state_trackers/xorg/xorg_tracker.h |    4 ++++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c
index 2235961..2110c87 100644
--- a/src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c
@@ -260,9 +260,8 @@ static const xf86CrtcFuncsRec crtc_funcs = {
 };
 
 void
-cursor_destroy(xf86CrtcPtr crtc)
+crtc_cursor_destroy(xf86CrtcPtr crtc)
 {
-    modesettingPtr ms = modesettingPTR(crtc->scrn);
     struct crtc_private *crtcp = crtc->driver_private;
 
     if (crtcp->cursor_buf) {
diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c
index d225345..bc3fd54 100644
--- a/src/gallium/state_trackers/xorg/xorg_driver.c
+++ b/src/gallium/state_trackers/xorg/xorg_driver.c
@@ -661,10 +661,6 @@ FreeScreen(int scrnIndex, int flags)
     FreeRec(xf86Screens[scrnIndex]);
 }
 
-/* HACK */
-void
-cursor_destroy(xf86CrtcPtr crtc);
-
 static void
 LeaveVT(int scrnIndex, int flags)
 {
@@ -676,7 +672,7 @@ LeaveVT(int scrnIndex, int flags)
     for (o = 0; o < config->num_crtc; o++) {
 	xf86CrtcPtr crtc = config->crtc[o];
 
-	cursor_destroy(crtc);
+	crtc_cursor_destroy(crtc);
 
 	if (crtc->rotatedPixmap || crtc->rotatedData) {
 	    crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap,
diff --git a/src/gallium/state_trackers/xorg/xorg_tracker.h b/src/gallium/state_trackers/xorg/xorg_tracker.h
index 8c60d50..b1ab783 100644
--- a/src/gallium/state_trackers/xorg/xorg_tracker.h
+++ b/src/gallium/state_trackers/xorg/xorg_tracker.h
@@ -39,6 +39,7 @@
 #include <xf86drmMode.h>
 #include <xorg-server.h>
 #include <xf86.h>
+#include "xf86Crtc.h"
 #include <exa.h>
 
 #ifdef DRM_MODE_FEATURE_DIRTYFB
@@ -140,6 +141,9 @@ driCloseScreen(ScreenPtr pScreen);
 void
 crtc_init(ScrnInfoPtr pScrn);
 
+void
+crtc_cursor_destroy(xf86CrtcPtr crtc);
+
 
 /***********************************************************************
  * xorg_output.c