xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/xnest/XNCursor.h |    1 +
 1 files changed, 1 insertion(+)

New commits:
diff-tree f059b61ab3af25b03c704669eddb838d3ce4366c (from cc3e99f747586f9d32622e5a682de39891b1fcba)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jul 5 11:47:25 2006 -0700

    fix compiler warning about xnestRecolorCursor() not being defined

diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h
index 8684a5e..6cbccfd 100644
--- a/hw/xnest/XNCursor.h
+++ b/hw/xnest/XNCursor.h
@@ -29,6 +29,7 @@ typedef struct {
 
 Bool xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
 Bool xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
+void xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed);
 void xnestSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y);
 void xnestMoveCursor (ScreenPtr pScreen, int x, int y);