From 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 8 Dec 2011 09:26:34 +0100
Subject: git update glproto libX11 libxcb mesa xserver 8 dec 2011

---
 xorg-server/hw/kdrive/ephyr/hostx.c | 5 +++++
 xorg-server/hw/kdrive/src/kinput.c  | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'xorg-server/hw/kdrive')

diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index 47a6681c4..ebe4e52ed 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -332,6 +332,11 @@ hostx_set_title (char *title)
   ephyrTitle = title;
 }
 
+#ifdef __SUNPRO_C
+/* prevent "Function has no return statement" error for x_io_error_handler */
+#pragma does_not_return(exit)
+#endif
+
 static int _X_NORETURN
 x_io_error_handler (Display *dpy) {
     ErrorF("Lost connection to X server: %s\n", strerror(errno));
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index 9c0b34fe1..968ebb159 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -2146,12 +2146,6 @@ KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
 static void
 KdCrossScreen(ScreenPtr pScreen, Bool entering)
 {
-#ifndef XIPAQ
-    if (entering)
-	KdEnableScreen (pScreen);
-    else
-	KdDisableScreen (pScreen);
-#endif
 }
 
 int KdCurScreen;	/* current event screen */
-- 
cgit v1.2.3