aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-02 17:54:24 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-02 17:54:24 +0100
commit1d1d1fc2199672c722dd75cefe8389268bfbbad3 (patch)
tree4f28577cc0f7a05a8f31169a6a367abe36518ae3 /nx-X11/programs/Xserver/Xext
parent6eb8d3ec60549e54ea2b4df3e4a53a84045ea1cd (diff)
parent7d884049b20e50f7a35098874dad2a42e36bf6b6 (diff)
downloadnx-libs-1d1d1fc2199672c722dd75cefe8389268bfbbad3.tar.gz
nx-libs-1d1d1fc2199672c722dd75cefe8389268bfbbad3.tar.bz2
nx-libs-1d1d1fc2199672c722dd75cefe8389268bfbbad3.zip
Merge branch 'pr/unused_files' into 3.6.x
Attributes GH PR #267: https://github.com/ArcticaProject/nx-libs/pull/267
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
-rw-r--r--nx-X11/programs/Xserver/Xext/Imakefile16
-rw-r--r--nx-X11/programs/Xserver/Xext/bigreq.c1
-rw-r--r--nx-X11/programs/Xserver/Xext/dpms.c1
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/Imakefile66
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.c182
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.h91
-rw-r--r--nx-X11/programs/Xserver/Xext/panoramiX.c1
-rw-r--r--nx-X11/programs/Xserver/Xext/saver.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/security.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/shape.c1
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/sync.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xcmisc.c1
-rw-r--r--nx-X11/programs/Xserver/Xext/xres.c1
-rw-r--r--nx-X11/programs/Xserver/Xext/xtest.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xtest1.frags90
-rw-r--r--nx-X11/programs/Xserver/Xext/xtest1di.c1
-rw-r--r--nx-X11/programs/Xserver/Xext/xvmod.c23
-rw-r--r--nx-X11/programs/Xserver/Xext/xvmodproc.h13
19 files changed, 0 insertions, 498 deletions
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile
index 745ba1788..becc7b66e 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -25,11 +25,6 @@
#include <Server.tmpl>
-#if DoLoadableServer
-#define IHaveSubdirs
-SUBDIRS = extmod
-#endif
-
#if HasShm && (!(defined(NXAgentServer) && NXAgentServer))
SHMSRCS = shm.c
SHMOBJS = shm.o
@@ -123,10 +118,6 @@ NormalLibraryTarget(ext,$(OBJS))
LintLibraryTarget(ext,$(SRCS))
NormalLintTarget($(SRCS))
-#if DoLoadableServer
-NormalLibraryTarget(exts,$(SOBJS))
-#endif
-
#if BuildXF86BigfontExt
SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES))
#endif
@@ -136,18 +127,11 @@ SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF))
LinkConfDirectory(xserver,.,xserver,.)
-LinkSourceFile(modinit.h,extmod)
-
#if BuildXCSecurity && InstallSecurityConfig
InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR))
#endif
DependTarget()
-#if DoLoadableServer
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-#endif
-
InstallDriverSDKNonExecFile(xvdix.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xvmcext.h,$(DRIVERSDKINCLUDEDIR))
diff --git a/nx-X11/programs/Xserver/Xext/bigreq.c b/nx-X11/programs/Xserver/Xext/bigreq.c
index 00e67c058..be5919328 100644
--- a/nx-X11/programs/Xserver/Xext/bigreq.c
+++ b/nx-X11/programs/Xserver/Xext/bigreq.c
@@ -38,7 +38,6 @@ from The Open Group.
#include "extnsionst.h"
#include <nx-X11/extensions/bigreqstr.h>
#include "opaque.h"
-#include "modinit.h"
#if 0
static unsigned char XBigReqCode;
diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c
index 3f75918ad..ea9781353 100644
--- a/nx-X11/programs/Xserver/Xext/dpms.c
+++ b/nx-X11/programs/Xserver/Xext/dpms.c
@@ -48,7 +48,6 @@ Equipment Corporation.
#include <nx-X11/extensions/dpms.h>
#include <nx-X11/extensions/dpmsstr.h>
#include "dpmsproc.h"
-#include "modinit.h"
#if 0
static unsigned char DPMSCode;
diff --git a/nx-X11/programs/Xserver/Xext/extmod/Imakefile b/nx-X11/programs/Xserver/Xext/extmod/Imakefile
deleted file mode 100644
index 0105cf775..000000000
--- a/nx-X11/programs/Xserver/Xext/extmod/Imakefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#define IHaveModules
-#include <Server.tmpl>
-
-#if BuildScreenSaverExt
- SCRNSAVSRC = saver.c
- SCRNSAVOBJ = saver.o
-LinkSourceFile(saver.c,..)
-#endif
-
-#if BuildDPMS
- DPMSSRCS = dpms.c
- DPMSOBJS = dpms.o
-LinkSourceFile(dpms.c,..)
-#endif
-
-#if BuildXvExt
- XVSRCS = xvmain.c xvdisp.c xvmod.c xvmc.c
- XVOBJS = xvmain.o xvdisp.o xvmod.o xvmc.o
-LinkSourceFile(xvmain.c,..)
-LinkSourceFile(xvdisp.c,..)
-LinkSourceFile(xvmod.c,..)
-LinkSourceFile(xvmc.c,..)
-#endif
-
-#if BuildXResExt
- XRESSRCS = xres.c
- XRESOBJS = xres.o
-LinkSourceFile(xres.c,..)
-#endif
-
- MODINITSRCS = modinit.c
- MODINITOBJS = modinit.o
-
- SRCS = shape.c \
- bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c \
- $(DPMSSRCS) \
- $(XVSRCS) $(MODINITSRCS) $(XRESSRCS)
-
- MOBJS = $(MODINITOBJS) shape.o \
- bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o \
- $(DPMSOBJS) \
- $(XVOBJS) $(XRESOBJS)
-
- DEFINES = -DEXTMODULE $(EXT_DEFINES)
-
-XF86INCLUDES = -I$(XF86COMSRC)
- INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
- $(XF86INCLUDES)
- LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln
-
-LinkSourceFile(shape.c,..)
-LinkSourceFile(bigreq.c,..)
-LinkSourceFile(sync.c,..)
-LinkSourceFile(xcmisc.c,..)
-
-ModuleObjectRule()
-
-SpecialCObjectRule(modinit,$(ICONFIGFILES),$(EXT_DEFINES))
-LibraryModuleTarget(extmod,$(MOBJS))
-NormalLintTarget($(SRCS))
-
-InstallLibraryModule(extmod,$(MODULEDIR),extensions)
-
-DependTarget()
-
-InstallDriverSDKLibraryModule(extmod,$(DRIVERSDKMODULEDIR),extensions)
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c
deleted file mode 100644
index 7b5530973..000000000
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c
+++ /dev/null
@@ -1,182 +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
-
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-
-#include "xf86Module.h"
-#include "xf86Opt.h"
-
-#include <nx-X11/Xproto.h>
-
-#include "modinit.h"
-#include "globals.h"
-
-static MODULESETUPPROTO(extmodSetup);
-
-/*
- * Array describing extensions to be initialized
- */
-ExtensionModule extensionModules[] = {
-#ifdef SHAPE
- {
- ShapeExtensionInit,
- SHAPENAME,
- &noShapeExtension,
- NULL,
- NULL
- },
-#endif
-#ifdef notyet
- {
- XTestExtensionInit,
- XTestExtensionName,
- &noTestExtensions,
- NULL,
- NULL
- },
-#endif
-#ifdef BIGREQS
- {
- BigReqExtensionInit,
- XBigReqExtensionName,
- &noBigReqExtension,
- NULL,
- NULL
- },
-#endif
-#ifdef XSYNC
- {
- SyncExtensionInit,
- SYNC_NAME,
- &noSyncExtension,
- NULL,
- NULL
- },
-#endif
-#ifdef SCREENSAVER
- {
- ScreenSaverExtensionInit,
- ScreenSaverName,
- &noScreenSaverExtension,
- NULL,
- NULL
- },
-#endif
-#ifdef DPMSExtension
- {
- DPMSExtensionInit,
- DPMSExtensionName,
- &noDPMSExtension,
- NULL,
- NULL
- },
-#endif
-#ifdef XV
- {
- XvExtensionInit,
- XvName,
- &noXvExtension,
- XvRegister,
- NULL
- },
- {
- XvMCExtensionInit,
- XvMCName,
- &noXvExtension,
- NULL,
- NULL
- },
-#endif
-#ifdef RES
- {
- ResExtensionInit,
- XRES_NAME,
- &noResExtension,
- NULL,
- NULL
- },
-#endif
- { /* DON'T delete this entry ! */
- NULL,
- NULL,
- NULL,
- NULL,
- NULL
- }
-};
-
-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
- */
-XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
-
-static void *
-extmodSetup(void * module, void * opts, int *errmaj, int *errmin)
-{
- int i;
-
- /* XXX the option stuff here is largely a sample/test case */
-
- for (i = 0; extensionModules[i].name != NULL; i++) {
- if (opts) {
- char *s;
- s = (char *)malloc(strlen(extensionModules[i].name) + 5);
- if (s) {
- void * o;
- strcpy(s, "omit");
- strcat(s, extensionModules[i].name);
- o = xf86FindOption(opts, s);
- free(s);
- if (o) {
- xf86MarkOptionUsed(o);
- continue;
- }
- }
- }
- LoadExtension(&extensionModules[i], FALSE);
- }
- /* Need a non-NULL return */
- return (void *)1;
-}
-
-#endif /* XFree86LOADER */
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
deleted file mode 100644
index 96ba2da48..000000000
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifdef SHAPE
-extern void ShapeExtensionInit(void);
-#include <X11/extensions/shapeproto.h>
-#endif
-
-#ifdef XTEST
-extern void XTestExtensionInit(void);
-#define _XTEST_SERVER_
-#include <nx-X11/extensions/xtestconst.h>
-#include <nx-X11/extensions/xteststr.h>
-#endif
-
-#if 1
-extern void XTestExtension1Init(void);
-#endif
-
-#ifdef BIGREQS
-extern void BigReqExtensionInit(void);
-#include <nx-X11/extensions/bigreqstr.h>
-#endif
-
-#ifdef XSYNC
-extern void SyncExtensionInit(void);
-#define _SYNC_SERVER
-#include <nx-X11/extensions/sync.h>
-#include <nx-X11/extensions/syncstr.h>
-#endif
-
-#ifdef SCREENSAVER
-extern void ScreenSaverExtensionInit (void);
-#include <nx-X11/extensions/saver.h>
-#endif
-
-#ifdef XCMISC
-extern void XCMiscExtensionInit(void);
-#include <nx-X11/extensions/xcmiscstr.h>
-#endif
-
-#ifdef DPMSExtension
-extern void DPMSExtensionInit(void);
-#include <nx-X11/extensions/dpmsstr.h>
-#endif
-
-#ifdef XV
-extern void XvExtensionInit(void);
-extern void XvMCExtensionInit(void);
-extern void XvRegister(void);
-#include <nx-X11/extensions/Xv.h>
-#include <nx-X11/extensions/XvMC.h>
-#endif
-
-#ifdef RES
-extern void ResExtensionInit(void);
-#include <nx-X11/extensions/XResproto.h>
-#endif
-
-#ifdef SHM
-extern void ShmExtensionInit(void);
-#include <X11/extensions/shmproto.h>
-extern void ShmSetPixmapFormat(
- ScreenPtr pScreen,
- int format);
-extern void ShmRegisterFuncs(
- ScreenPtr pScreen,
- ShmFuncsPtr funcs);
-#endif
-
-#if 1
-extern void SecurityExtensionInit(void);
-#endif
-
-#if 1
-extern void XagExtensionInit(void);
-#endif
-
-#if 1
-extern void XpExtensionInit(void);
-#endif
-
-#if 1
-extern void PanoramiXExtensionInit(int argc, char *argv[]);
-#endif
-
-#if 1
-extern void XkbExtensionInit(void);
-#endif
diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c
index 206fa5406..3809890bc 100644
--- a/nx-X11/programs/Xserver/Xext/panoramiX.c
+++ b/nx-X11/programs/Xserver/Xext/panoramiX.c
@@ -55,7 +55,6 @@ Equipment Corporation.
#ifdef RENDER
#include "picturestr.h"
#endif
-#include "modinit.h"
#include "protocol-versions.h"
#ifdef GLXPROXY
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index 51f18e4e4..0cb71de42 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -59,8 +59,6 @@ in this Software without prior written authorization from the X Consortium.
#include <stdio.h>
#endif
-#include "modinit.h"
-
#include "protocol-versions.h"
#if 0
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index c1b7b50a9..6883db5f8 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -112,8 +112,6 @@ static char _NXPolicyFilePath[1024];
#endif
-#include "modinit.h"
-
static int SecurityErrorBase; /* first Security error number */
static int SecurityEventBase; /* first Security event number */
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 165bee50c..50a6db119 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -46,7 +46,6 @@ in this Software without prior written authorization from The Open Group.
#ifdef EXTMODULE
#include "xf86_ansic.h"
#endif
-#include "modinit.h"
typedef RegionPtr (*CreateDftPtr)(
WindowPtr /* pWin */
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index a91afdaf0..f27d70ffe 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -68,8 +68,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;
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index 945dec250..0421cd9f9 100644
--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -77,8 +77,6 @@ PERFORMANCE OF THIS SOFTWARE.
#endif
#endif
-#include "modinit.h"
-
/*
* Local Global Variables
*/
diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c
index b7f55aa6d..bb47df979 100644
--- a/nx-X11/programs/Xserver/Xext/xcmisc.c
+++ b/nx-X11/programs/Xserver/Xext/xcmisc.c
@@ -38,7 +38,6 @@ from The Open Group.
#include "extnsionst.h"
#include "swaprep.h"
#include <nx-X11/extensions/xcmiscstr.h>
-#include "modinit.h"
#include <stdint.h>
diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c
index 243de9c39..426983135 100644
--- a/nx-X11/programs/Xserver/Xext/xres.c
+++ b/nx-X11/programs/Xserver/Xext/xres.c
@@ -15,7 +15,6 @@
#include "swaprep.h"
#include <nx-X11/extensions/XResproto.h>
#include "pixmapstr.h"
-#include "modinit.h"
#include "protocol-versions.h"
static int
diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c
index 6cd7d1111..c410a4955 100644
--- a/nx-X11/programs/Xserver/Xext/xtest.c
+++ b/nx-X11/programs/Xserver/Xext/xtest.c
@@ -54,8 +54,6 @@ from The Open Group.
#include "xf86_ansic.h"
#endif
-#include "modinit.h"
-
#if 0
static unsigned char XTestReqCode;
#endif
diff --git a/nx-X11/programs/Xserver/Xext/xtest1.frags b/nx-X11/programs/Xserver/Xext/xtest1.frags
deleted file mode 100644
index bdf7943b7..000000000
--- a/nx-X11/programs/Xserver/Xext/xtest1.frags
+++ /dev/null
@@ -1,90 +0,0 @@
-There are several code fragments that need to be placed in the device
-dependent part of the server. These are described below. These code
-fragments are device and implementation dependent.
-
-This code fragment should go in your ddx InitInput() routine:
-
-#ifdef XTESTEXT1
-extern KeyCode xtest_command_key;
-#endif
-
-#ifdef XTESTEXT1
- xtest_command_key = <whatever-is-a-good-keycode-for-your-keyboard>;
-#endif
-
-This code fragment should go at the front of the file that handles
-keyboards:
-
-#ifdef XTESTEXT1
-/*
- * defined in xtestext1di.c
- */
-extern int on_steal_input;
-extern Bool XTestStealKeyData();
-#endif XTESTEXT1
-
-This code fragment should go in the function that parses input from the
-keyboard or pointer after you know what input action has occurred, but before
-you have told the server about it. If conditionalizes the actual function
-call to pass the information on:
-
-#ifdef XTESTEXT1
- if (!on_steal_input ||
- XTestStealKeyData(code, direction, dev_type, x, y))
-#endif /* XTESTEXT1 */
- handle_device_event(...);
-
-This code fragment should go in the function that handles mouse motion after
-you have figured out how much the mouse has moved:
-
-#ifdef XTESTEXT1
- if (on_steal_input)
- XTestStealMotionData(dx, dy, dev, x, y);
-#endif XTESTEXT1
-
-
-This code fragment should go at the front of the os-specific code where
-you wait (by doing a select on the socket in our implementation) for
-something to happen:
-
-#ifdef XTESTEXT1
-extern int playback_on;
-void XTestComputeWaitTime();
-#endif XTESTEXT1
-
-These code fragments should go in the os-specific code on both sides of
-where you wait (by doing a select on the socket in our implementation)
-for something to happen:
-
-#ifdef XTESTEXT1
- if (playback_on)
- XTestComputeWaitTime(wt = &waittime);
-#endif XTESTEXT1
- ... code to do select ...
- WakeupHandler(i, LastSelectMask);
-#ifdef XTESTEXT1
- if (playback_on)
- i = XTestProcessInputAction(i, &waittime);
-#endif XTESTEXT1
-
-
-You also need to implement the following routines (documentation
-is needed; for now, see server/ddx/hp/hp/x_hil.c):
-
-void
-XTestGenerateEvent(dev_type, keycode, keystate, mousex, mousey)
- int dev_type;
- int keycode;
- int keystate;
- int mousex;
- int mousey;
-
-void
-XTestGetPointerPos(fmousex, fmousey)
- short *fmousex, *fmousey;
-
-void
-XTestJumpPointer(jx, jy, dev_type)
- int jx;
- int jy;
- int dev_type;
diff --git a/nx-X11/programs/Xserver/Xext/xtest1di.c b/nx-X11/programs/Xserver/Xext/xtest1di.c
index ac49ba2a3..b1d69ef47 100644
--- a/nx-X11/programs/Xserver/Xext/xtest1di.c
+++ b/nx-X11/programs/Xserver/Xext/xtest1di.c
@@ -71,7 +71,6 @@ University of California.
#include "opaque.h"
#define XTestSERVER_SIDE
#include <nx-X11/extensions/xtestext1.h>
-#include "modinit.h"
#include "xtest1dd.h"
diff --git a/nx-X11/programs/Xserver/Xext/xvmod.c b/nx-X11/programs/Xserver/Xext/xvmod.c
deleted file mode 100644
index 469bd950d..000000000
--- a/nx-X11/programs/Xserver/Xext/xvmod.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <nx-X11/X.h>
-#include "misc.h"
-#include "scrnintstr.h"
-#include "gc.h"
-#include <nx-X11/extensions/Xv.h>
-#include <nx-X11/extensions/Xvproto.h>
-#include "xvdix.h"
-#include "xvmodproc.h"
-
-void
-XvRegister()
-{
- XvScreenInitProc = XvScreenInit;
- XvGetScreenIndexProc = XvGetScreenIndex;
- XvGetRTPortProc = XvGetRTPort;
- XvMCScreenInitProc = XvMCScreenInit;
-}
-
diff --git a/nx-X11/programs/Xserver/Xext/xvmodproc.h b/nx-X11/programs/Xserver/Xext/xvmodproc.h
deleted file mode 100644
index 81356a149..000000000
--- a/nx-X11/programs/Xserver/Xext/xvmodproc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "xvmcext.h"
-
-extern int (*XvGetScreenIndexProc)(void);
-extern unsigned long (*XvGetRTPortProc)(void);
-extern int (*XvScreenInitProc)(ScreenPtr);
-extern int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr);
-
-extern void XvRegister(void);