diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-08 05:32:54 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-08 05:32:54 +0000 |
| commit | c47036e9c059468dbda553e14d72ef6db9875626 (patch) | |
| tree | fac1f301b978a8b88858d8c8ff7c5d26ce87d869 | |
| parent | b48a2a340f2bc1e86cf08a9239c5025f7308c9c2 (diff) | |
xc/programs/Xserver/hw/xfree86/loader/dixsym.c
//bugs.freedesktop.org/show_bug.cgi?id=1361) attachment #899
(https://bugs.freedesktop.org/attachment.cgi?id=899): Fix module loader
bustage due duplicate symbols caused by the first patch in Bugzilla
#1361
| -rw-r--r-- | hw/xfree86/loader/dixsym.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/loader/extsym.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 724c00d56..cc226ee7b 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.5.2.1 2004/12/08 05:28:11 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) |