Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.366
diff -u -2 -0 -r1.366 ChangeLog
--- xc/ChangeLog	14 Sep 2004 00:51:24 -0000	1.366
+++ xc/ChangeLog	14 Sep 2004 23:16:47 -0000
@@ -1,22 +1,28 @@
 2004-09-14 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/programs/Xserver/hw/xfree86/loader/dixsym.c
+        * xc/programs/Xserver/hw/xfree86/loader/extsym.c
+        Bugzilla #1361: Fix module loader bustage due duplicate symbols
+        caused by the first patch in Bugzilla #1361
+
+2004-09-14 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/programs/Xserver/hw/xfree86/loader/dixsym.c
         * xc/programs/Xserver/include/globals.h
         * xc/programs/Xserver/mi/miinitext.c
         * xc/programs/Xserver/os/utils.c
         Bugzilla #1361: Allow turning on/off most of the Xserver extensions
         (=all except server-specific extensions (e.g. DMX, XpExtension,
         etc.) via +extension/-extension
 
 2004-09-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* BUILD:
 	* programs/Xserver/hw/xfree86/doc/BUILD:
 	* programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml:
 	* programs/Xserver/hw/xfree86/doc/sgml/index.pre:
 	Fix dates for release.
 
 2004-09-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* RELNOTES:
 	* programs/Xserver/hw/xfree86/doc/RELNOTES:
 	* programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml:
Index: xc/programs/Xserver/hw/xfree86/loader/dixsym.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v
retrieving revision 1.6
diff -u -2 -0 -r1.6 dixsym.c
--- xc/programs/Xserver/hw/xfree86/loader/dixsym.c	14 Sep 2004 00:51:24 -0000	1.6
+++ xc/programs/Xserver/hw/xfree86/loader/dixsym.c	14 Sep 2004 23:16:55 -0000
@@ -476,41 +476,40 @@
     SYMVAR(SkippedRequestsCallback)
     SYMFUNC(ResetCurrentRequest)
     /* connection.c */
     SYMFUNC(IgnoreClient)
     SYMFUNC(AttendClient)
     SYMFUNC(AddEnabledDevice)
     SYMFUNC(RemoveEnabledDevice)
     SYMFUNC(MakeClientGrabPervious)
     SYMFUNC(MakeClientGrabImpervious)
     SYMVAR(GrabInProgress)
 
     /* devices.c */
     SYMFUNC(InitPointerDeviceStruct)
     SYMFUNC(LookupKeyboardDevice)
     SYMFUNC(LookupPointerDevice)
 
 #ifdef XKB
     /* xkb/xkbInit.c */
     SYMFUNC(XkbInitKeyboardDeviceStruct)
     SYMFUNC(XkbSetRulesDflts)
-    SYMVAR(noXkbExtension)
 #endif
 
 #ifdef XINPUT
     /* Xi */
     /* exevents.c */
     SYMFUNC(InitValuatorAxisStruct)
     SYMFUNC(InitProximityClassDeviceStruct)
     /* extinit.c */
     SYMFUNC(AssignTypeAndName)
 #endif
 
     /* xf86DGA.c */
     /* XXX This is exported from the DDX, not DIX. */
     SYMVAR(XDGAEventBase)
 
     /* librender.a */
 #ifdef RENDER
     SYMFUNC(PictureInit)
     SYMFUNC(miPictureInit)
     SYMFUNC(miComputeCompositeRegion)
Index: xc/programs/Xserver/hw/xfree86/loader/extsym.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/extsym.c,v
retrieving revision 1.4
diff -u -2 -0 -r1.4 extsym.c
--- xc/programs/Xserver/hw/xfree86/loader/extsym.c	9 Aug 2004 03:40:50 -0000	1.4
+++ xc/programs/Xserver/hw/xfree86/loader/extsym.c	14 Sep 2004 23:16:55 -0000
@@ -49,33 +49,32 @@
 extern unsigned long XRT_GC;
 extern unsigned long XRT_COLORMAP;
 extern unsigned long XRC_DRAWABLE;
 extern Bool XineramaRegisterConnectionBlockCallback(void (*func) (void));
 extern int XineramaDeleteResource(pointer, XID);
 #endif
 
 LOOKUP extLookupTab[] = {
 
     SYMFUNC(ClientSleepUntil)
 
 #ifdef HAS_SHM
     SYMVAR(ShmCompletionCode)
     SYMVAR(BadShmSegCode)
     SYMVAR(ShmSegType)
 #endif
 
 #ifdef PANORAMIX
     SYMFUNC(XineramaRegisterConnectionBlockCallback)
     SYMFUNC(XineramaDeleteResource)
-    SYMVAR(noPanoramiXExtension)
     SYMVAR(PanoramiXNumScreens)
     SYMVAR(panoramiXdataPtr)
     SYMVAR(PanoramiXVisualTable)
     SYMVAR(XRT_WINDOW)
     SYMVAR(XRT_PIXMAP)
     SYMVAR(XRT_GC)
     SYMVAR(XRT_COLORMAP)
     SYMVAR(XRC_DRAWABLE)
 #endif
 
     {0, 0}
 };