diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xfree86/dixmods/extmod/modinit.h | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/dixmods/extmod/modinit.h')
| -rw-r--r-- | xorg-server/hw/xfree86/dixmods/extmod/modinit.h | 64 |
1 files changed, 3 insertions, 61 deletions
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/modinit.h b/xorg-server/hw/xfree86/dixmods/extmod/modinit.h index 3c2e2022a..1de14858c 100644 --- a/xorg-server/hw/xfree86/dixmods/extmod/modinit.h +++ b/xorg-server/hw/xfree86/dixmods/extmod/modinit.h @@ -7,10 +7,8 @@ #define INITARGS void #endif -#ifdef SHAPE #define _SHAPE_SERVER_ /* don't want Xlib structures */ #include <X11/extensions/shapestr.h> -#endif #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); @@ -18,12 +16,6 @@ extern void MultibufferExtensionInit(INITARGS); #include <X11/extensions/multibufst.h> #endif -#ifdef MITMISC -extern void MITMiscExtensionInit(INITARGS); -#define _MITMISC_SERVER_ -#include <X11/extensions/mitmiscstr.h> -#endif - #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ @@ -35,41 +27,17 @@ extern void XTestExtensionInit(INITARGS); extern void XTestExtension1Init(INITARGS); #endif -#ifdef BIGREQS -extern void BigReqExtensionInit(INITARGS); -#include <X11/extensions/bigreqstr.h> -#endif - -#ifdef XSYNC -extern void SyncExtensionInit(INITARGS); -#define _SYNC_SERVER -#include <X11/extensions/sync.h> -#include <X11/extensions/syncstr.h> -#endif - #ifdef SCREENSAVER extern void ScreenSaverExtensionInit (INITARGS); #include <X11/extensions/saver.h> #endif -#ifdef XCMISC -extern void XCMiscExtensionInit(INITARGS); -#include <X11/extensions/xcmiscstr.h> -#endif - #ifdef XF86VIDMODE extern void XFree86VidModeExtensionInit(INITARGS); #define _XF86VIDMODE_SERVER_ #include <X11/extensions/xf86vmstr.h> #endif -#ifdef XF86MISC -extern void XFree86MiscExtensionInit(INITARGS); -#define _XF86MISC_SERVER_ -#define _XF86MISC_SAVER_COMPAT_ -#include <X11/extensions/xf86mscstr.h> -#endif - #ifdef XFreeXDGA extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGARegister(INITARGS); @@ -82,25 +50,6 @@ extern void DPMSExtensionInit(INITARGS); #include <X11/extensions/dpmsstr.h> #endif -#ifdef FONTCACHE -extern void FontCacheExtensionInit(INITARGS); -#define _FONTCACHE_SERVER_ -#include "fontcacheP.h" -#include "fontcachstr.h" -#endif - -#ifdef TOGCUP -extern void XcupExtensionInit(INITARGS); -#define _XCUP_SERVER_ -#include <X11/extensions/Xcupstr.h> -#endif - -#ifdef EVI -extern void EVIExtensionInit(INITARGS); -#define _XEVI_SERVER_ -#include <X11/extensions/XEVIstr.h> -#endif - #ifdef XV extern void XvExtensionInit(INITARGS); extern void XvMCExtensionInit(INITARGS); @@ -117,9 +66,6 @@ extern void ResExtensionInit(INITARGS); #ifdef SHM extern void ShmExtensionInit(INITARGS); #include <X11/extensions/shmstr.h> -extern void ShmSetPixmapFormat( - ScreenPtr pScreen, - int format); extern void ShmRegisterFuncs( ScreenPtr pScreen, ShmFuncsPtr funcs); @@ -130,16 +76,12 @@ extern void SELinuxExtensionInit(INITARGS); #include "xselinux.h" #endif -#if 1 -extern void SecurityExtensionInit(INITARGS); -#endif - -#if 1 -extern void XagExtensionInit(INITARGS); +#ifdef XEVIE +extern void XevieExtensionInit(INITARGS); #endif #if 1 -extern void XpExtensionInit(INITARGS); +extern void SecurityExtensionInit(INITARGS); #endif #if 1 |