summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-09-14 23:21:22 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-09-14 23:21:22 +0000
commitf642fc729b481c55073c75beca301b2f17881179 (patch)
treea18e46d83da756609514a900eafc78a70dbe05ce
parent0d95bdfbabf4c526f6f54d6f1de8811f4e6d5d5f (diff)
Refix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1361 - RFE: Allow
enabling/disabling of more extensions (fixing duplicate symbols caused by previous checkin; attachment #899)
-rw-r--r--hw/xfree86/loader/dixsym.c3
-rw-r--r--hw/xfree86/loader/extsym.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 724c00d56..321be9e04 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.5 2004/08/19 04:08:40 kem Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.6 2004/09/14 00:51:24 gisburn Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03
* 17:11:29 tsi Exp $ */
@@ -493,7 +493,6 @@ LOOKUP dixLookupTab[] = {
/* xkb/xkbInit.c */
SYMFUNC(XkbInitKeyboardDeviceStruct)
SYMFUNC(XkbSetRulesDflts)
- SYMVAR(noXkbExtension)
#endif
#ifdef XINPUT
diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c
index 76682e783..11fb50472 100644
--- a/hw/xfree86/loader/extsym.c
+++ b/hw/xfree86/loader/extsym.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.3 2004/08/08 17:02:19 krh Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.4 2004/08/09 03:40:50 krh Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.9 2003/10/15 16:29:03 dawes Exp $ */
/*
@@ -66,7 +66,6 @@ LOOKUP extLookupTab[] = {
#ifdef PANORAMIX
SYMFUNC(XineramaRegisterConnectionBlockCallback)
SYMFUNC(XineramaDeleteResource)
- SYMVAR(noPanoramiXExtension)
SYMVAR(PanoramiXNumScreens)
SYMVAR(panoramiXdataPtr)
SYMVAR(PanoramiXVisualTable)