aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx/dmx.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
commit2553bdd7c359cd87525d367761c86932cec5adff (patch)
treeae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/dmx/dmx.c
parente2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff)
parent4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff)
downloadvcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/dmx/dmx.c')
-rw-r--r--xorg-server/hw/dmx/dmx.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/xorg-server/hw/dmx/dmx.c b/xorg-server/hw/dmx/dmx.c
index 5f1fc0546..10d9e2206 100644
--- a/xorg-server/hw/dmx/dmx.c
+++ b/xorg-server/hw/dmx/dmx.c
@@ -113,10 +113,6 @@ static int _DMXXineramaActive(void)
return 0;
}
-static void DMXResetProc(ExtensionEntry *extEntry)
-{
-}
-
/** Initialize the extension. */
void DMXExtensionInit(void)
{
@@ -124,7 +120,7 @@ void DMXExtensionInit(void)
if ((extEntry = AddExtension(DMX_EXTENSION_NAME, 0, 0,
ProcDMXDispatch, SProcDMXDispatch,
- DMXResetProc, StandardMinorOpcode)))
+ NULL, StandardMinorOpcode)))
DMXCode = extEntry->base;
}