extmod was originally a big pointless module. Now it's an empty, pointless module. This commit makes it unexist.
Signed-off-by: Daniel Stone <[email protected]> --- Xext/bigreq.c | 1 - Xext/dpms.c | 1 - Xext/panoramiX.c | 3 +- Xext/saver.c | 6 ++- Xext/security.c | 1 - Xext/shape.c | 1 - Xext/shm.c | 3 +- Xext/sync.c | 2 - Xext/xcmisc.c | 2 +- Xext/xres.c | 1 - Xext/xselinux_ext.c | 1 - Xext/xtest.c | 4 +- configure.ac | 1 - hw/xfree86/common/xf86Config.c | 1 - hw/xfree86/common/xf86DGA.c | 2 - hw/xfree86/dixmods/Makefile.am | 2 - hw/xfree86/dixmods/extmod/Makefile.am | 13 ----- hw/xfree86/dixmods/extmod/modinit.c | 61 ------------------------- hw/xfree86/dixmods/extmod/modinit.h | 81 --------------------------------- hw/xfree86/loader/loadmod.c | 1 + 20 files changed, 11 insertions(+), 177 deletions(-) delete mode 100644 hw/xfree86/dixmods/extmod/Makefile.am delete mode 100644 hw/xfree86/dixmods/extmod/modinit.c delete mode 100644 hw/xfree86/dixmods/extmod/modinit.h diff --git a/Xext/bigreq.c b/Xext/bigreq.c index ecfbe93..2a3becd 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -38,7 +38,6 @@ from The Open Group. #include "extnsionst.h" #include <X11/extensions/bigreqsproto.h> #include "opaque.h" -#include "modinit.h" void BigReqExtensionInit(void); diff --git a/Xext/dpms.c b/Xext/dpms.c index d09fd0a..2eb28ef 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -39,7 +39,6 @@ Equipment Corporation. #include "opaque.h" #include <X11/extensions/dpmsproto.h> #include "dpmsproc.h" -#include "modinit.h" extern void DPMSExtensionInit(void); diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 9481438..277b637 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -59,7 +59,6 @@ Equipment Corporation. #ifdef COMPOSITE #include "compint.h" #endif -#include "modinit.h" #include "protocol-versions.h" #ifdef GLXPROXY @@ -68,6 +67,8 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen, ScreenPtr pMatchScreen); #endif +extern void PanoramiXExtensionInit(void); + /* * PanoramiX data declarations */ diff --git a/Xext/saver.c b/Xext/saver.c index 0c4426c..0544506 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -58,8 +58,6 @@ in this Software without prior written authorization from the X Consortium. #include <stdio.h> -#include "modinit.h" - static int ScreenSaverEventBase = 0; @@ -94,6 +92,10 @@ static void SScreenSaverNotifyEvent ( xScreenSaverNotifyEvent * /* to */ ); +extern void ScreenSaverExtensionInit ( + void + ); + static RESTYPE SuspendType; /* resource type for suspension records */ typedef struct _ScreenSaverSuspension *ScreenSaverSuspensionPtr; diff --git a/Xext/security.c b/Xext/security.c index adec862..5e0a734 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -38,7 +38,6 @@ in this Software without prior written authorization from The Open Group. #include "xacestr.h" #include "securitysrv.h" #include <X11/extensions/securproto.h> -#include "modinit.h" #include "protocol-versions.h" /* Extension stuff */ diff --git a/Xext/shape.c b/Xext/shape.c index 115fc07..5f471d3 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -44,7 +44,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/extensions/shapeproto.h> #include "regionstr.h" #include "gcstruct.h" -#include "modinit.h" #include "protocol-versions.h" typedef RegionPtr (*CreateDftPtr)( diff --git a/Xext/shm.c b/Xext/shm.c index a67ce8b..09371f0 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -88,8 +88,6 @@ in this Software without prior written authorization from The Open Group. #include "panoramiXsrv.h" #endif -#include "modinit.h" - typedef struct _ShmDesc { struct _ShmDesc *next; int shmid; @@ -119,6 +117,7 @@ static void SShmCompletionEvent( ); static Bool ShmDestroyPixmap (PixmapPtr pPixmap); +extern void ShmExtensionInit(void); static unsigned char ShmReqCode; diff --git a/Xext/sync.c b/Xext/sync.c index 36dd278..8f604d5 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -76,8 +76,6 @@ PERFORMANCE OF THIS SOFTWARE. #include <sys/time.h> #endif -#include "modinit.h" - /* * Local Global Variables */ diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index ea85570..9357941 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -38,7 +38,6 @@ from The Open Group. #include "extnsionst.h" #include "swaprep.h" #include <X11/extensions/xcmiscproto.h> -#include "modinit.h" #if HAVE_STDINT_H #include <stdint.h> @@ -46,6 +45,7 @@ from The Open Group. #define UINT32_MAX 0xffffffffU #endif +extern void XCMiscExtensionInit(void); static int ProcXCMiscGetVersion(ClientPtr client) diff --git a/Xext/xres.c b/Xext/xres.c index c9487a3..653f140 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -20,7 +20,6 @@ #include "pixmapstr.h" #include "windowstr.h" #include "gcstruct.h" -#include "modinit.h" #include "protocol-versions.h" extern void ResExtensionInit(void); diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c index 5ab35e0..45f3c11 100644 --- a/Xext/xselinux_ext.c +++ b/Xext/xselinux_ext.c @@ -26,7 +26,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "windowstr.h" #include "propertyst.h" #include "extnsionst.h" -#include "modinit.h" #include "xselinuxint.h" #define CTX_DEV offsetof(SELinuxSubjectRec, dev_create_sid) diff --git a/Xext/xtest.c b/Xext/xtest.c index 2aa27de..510261a 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -55,8 +55,6 @@ #include "eventstr.h" #include "inpututils.h" -#include "modinit.h" - extern int DeviceValuator; /* XTest events are sent during request processing and may be interruped by @@ -86,6 +84,8 @@ static int XTestSwapFakeInput( xReq * /* req */ ); +extern void XTestExtensionInit(void); + static int ProcXTestGetVersion(ClientPtr client) diff --git a/configure.ac b/configure.ac index 820332a..61a6a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -2182,7 +2182,6 @@ hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile -hw/xfree86/dixmods/extmod/Makefile hw/xfree86/doc/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 9677c75..da1a39b 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -109,7 +109,6 @@ #endif static ModuleDefault ModuleDefaults[] = { - {.name = "extmod", .toLoad = TRUE, .load_opt=NULL}, #ifdef GLXEXT {.name = "glx", .toLoad = TRUE, .load_opt=NULL}, #endif diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index c42854b..cb78c6f 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -75,8 +75,6 @@ #include <string.h> -#include "modinit.h" - #define DGA_PROTOCOL_OLD_SUPPORT 1 static DevPrivateKeyRec DGAScreenKeyRec; diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 21536d5..4173983 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -1,7 +1,5 @@ noinst_LTLIBRARIES = libdixmods.la libxorgxkb.la -SUBDIRS = extmod - if GLX GLXMODS = libglx.la endif diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am deleted file mode 100644 index f769c85..0000000 --- a/hw/xfree86/dixmods/extmod/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -extsmoduledir = $(moduledir)/extensions -extsmodule_LTLIBRARIES = libextmod.la - -AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@ -INCLUDES = @XORG_INCS@ \ - -I$(top_srcdir)/dbe \ - -I$(top_srcdir)/hw/xfree86/loader \ - -I$(top_srcdir)/miext/shadow - -libextmod_la_LDFLAGS = -avoid-version -libextmod_la_SOURCES = modinit.c \ - modinit.h -libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c deleted file mode 100644 index 2ce5e23..0000000 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 1997 Matthieu Herrb - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Matthieu Herrb not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Matthieu Herrb makes no - * representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. - * - * MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#include "xf86Module.h" -#include "xf86Opt.h" - -#include <X11/Xproto.h> - -#include "modinit.h" -#include "globals.h" - -static MODULESETUPPROTO(extmodSetup); - -static XF86ModuleVersionInfo VersRec = -{ - "extmod", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_EXTENSION, - {0,0,0,0} -}; - -/* - * Data for the loader - */ -_X_EXPORT XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL }; - -static pointer -extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin) -{ - /* Need a non-NULL return */ - return (pointer)1; -} diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h deleted file mode 100644 index b115861..0000000 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ /dev/null @@ -1,81 +0,0 @@ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include <X11/extensions/shapeproto.h> - -#ifdef XTEST -extern void XTestExtensionInit(void); -#include <X11/extensions/xtestproto.h> -#endif - -#if 1 -extern void XTestExtension1Init(void); -#endif - -#if 1 -extern void XCMiscExtensionInit(void); -#endif - -#ifdef SCREENSAVER -extern void ScreenSaverExtensionInit (void); -#include <X11/extensions/saver.h> -#endif - -#ifdef XF86VIDMODE -extern void XFree86VidModeExtensionInit(void); -#include <X11/extensions/xf86vmproto.h> -#endif - -#ifdef XFreeXDGA -extern void XFree86DGAExtensionInit(void); -extern void XFree86DGARegister(void); -#include <X11/extensions/xf86dgaproto.h> -#endif - -#ifdef DPMSExtension -extern void DPMSExtensionInit(void); -#include <X11/extensions/dpmsconst.h> -#endif - -#ifdef XV -extern void XvExtensionInit(void); -extern void XvMCExtensionInit(void); -#include <X11/extensions/Xv.h> -#include <X11/extensions/XvMC.h> -#endif - -#ifdef RES -extern void ResExtensionInit(void); -#include <X11/extensions/XResproto.h> -#endif - -#ifdef SHM -extern void ShmExtensionInit(void); -#include <X11/extensions/shmproto.h> -extern void ShmRegisterFuncs( - ScreenPtr pScreen, - ShmFuncsPtr funcs); -#endif - -#ifdef XSELINUX -extern void SELinuxExtensionInit(void); -#include "xselinux.h" -#endif - -#ifdef XEVIE -extern void XevieExtensionInit(void); -#endif - -#if 1 -extern void SecurityExtensionInit(void); -#endif - -#if 1 -extern void PanoramiXExtensionInit(void); -#endif - -#if 1 -extern void XkbExtensionInit(void); -#endif diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 958d420..a7d0097 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -817,6 +817,7 @@ static const char *compiled_in_modules[] = { "ramdac", "dbe", "record", + "extmod", NULL }; -- 1.7.5.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
