[PATCH] kdrive: Delete unused TOUCHSCREEN define.

Jamey Sharp jamey at minilop.net
Thu May 12 15:21:52 PDT 2011


There's nothing in configure to enable this, and KdTsPhyScreen isn't
defined anywhere.

Signed-off-by: Jamey Sharp <jamey at minilop.net>
---
 hw/kdrive/ephyr/ephyr.c    |    1 -
 hw/kdrive/fake/fake.c      |    6 ------
 include/dix-config.h.in    |    3 ---
 include/kdrive-config.h.in |    3 ---
 include/xorg-server.h.in   |    3 ---
 5 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 8096a24..a05cccf 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -40,7 +40,6 @@
 
 #include "xkbsrv.h"
 
-extern int KdTsPhyScreen;
 #ifdef GLXEXT
 extern Bool noGlxVisualInit;
 #endif
diff --git a/hw/kdrive/fake/fake.c b/hw/kdrive/fake/fake.c
index ba05234..7114b8c 100644
--- a/hw/kdrive/fake/fake.c
+++ b/hw/kdrive/fake/fake.c
@@ -25,8 +25,6 @@
 #endif
 #include "fake.h"
 
-extern int KdTsPhyScreen;
-
 Bool
 fakeInitialize (KdCardInfo *card, FakePriv *priv)
 {
@@ -384,10 +382,6 @@ fakeCreateColormap (ColormapPtr pmap)
 Bool
 fakeInitScreen (ScreenPtr pScreen)
 {
-#ifdef TOUCHSCREEN
-    KdTsPhyScreen = pScreen->myNum;
-#endif
-
     pScreen->CreateColormap = fakeCreateColormap;
     return TRUE;
 }
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 4710ef8..1cd57bf 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -297,9 +297,6 @@
 /* Support TCP socket connections */
 #undef TCPCONN
 
-/* Enable touchscreen support */
-#undef TOUCHSCREEN
-
 /* Support tslib touchscreen abstraction library */
 #undef TSLIB
 
diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in
index 0e54aa1..3d7e9a4 100644
--- a/include/kdrive-config.h.in
+++ b/include/kdrive-config.h.in
@@ -13,9 +13,6 @@
 /* Include framebuffer support in X servers */
 #undef KDRIVEFBDEV
 
-/* Enable touchscreen support */
-#undef TOUCHSCREEN
-
 /* Support tslib touchscreen abstraction library */
 #undef TSLIB
 
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index b10b994..25fcdab 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -67,9 +67,6 @@
 /* Support TCP socket connections */
 #undef TCPCONN
 
-/* Enable touchscreen support */
-#undef TOUCHSCREEN
-
 /* Support tslib touchscreen abstraction library */
 #undef TSLIB
 
-- 
1.7.4.4



More information about the xorg-devel mailing list