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/include/globals.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/include/globals.h')
| -rw-r--r-- | xorg-server/include/globals.h | 58 |
1 files changed, 3 insertions, 55 deletions
diff --git a/xorg-server/include/globals.h b/xorg-server/include/globals.h index 1ff701380..74b09e71d 100644 --- a/xorg-server/include/globals.h +++ b/xorg-server/include/globals.h @@ -17,16 +17,16 @@ extern Bool screenSaverSuspended; extern char *defaultFontPath; extern int monitorResolution; -extern Bool loadableFonts; extern int defaultColorVisualClass; -extern Bool Must_have_memory; -extern WindowPtr *WindowTable; +extern WindowPtr WindowTable[MAXSCREENS]; extern int GrabInProgress; extern Bool noTestExtensions; extern DDXPointRec dixScreenOrigins[MAXSCREENS]; +extern char *ConnectionInfo; + #ifdef DPMSExtension extern CARD32 defaultDPMSStandbyTime; extern CARD32 defaultDPMSSuspendTime; @@ -46,10 +46,6 @@ extern Bool DPMSCapableFlag; extern Bool PanoramiXExtensionDisabledHack; #endif -#ifdef BIGREQS -extern Bool noBigReqExtension; -#endif - extern Bool noCompositeExtension; #ifdef DAMAGE @@ -64,14 +60,6 @@ extern Bool noDbeExtension; extern Bool noDPMSExtension; #endif -#ifdef EVI -extern Bool noEVIExtension; -#endif - -#ifdef FONTCACHE -extern Bool noFontCacheExtension; -#endif - #ifdef GLXEXT extern Bool noGlxExtension; #endif @@ -84,10 +72,6 @@ extern Bool noScreenSaverExtension; extern Bool noMITShmExtension; #endif -#ifdef MITMISC -extern Bool noMITMiscExtension; -#endif - #ifdef MULTIBUFFER extern Bool noMultibufferExtension; #endif @@ -100,38 +84,14 @@ extern Bool noRRExtension; extern Bool noRenderExtension; #endif -#ifdef SHAPE -extern Bool noShapeExtension; -#endif - #ifdef XCSECURITY extern Bool noSecurityExtension; #endif -#ifdef XSYNC -extern Bool noSyncExtension; -#endif - -#ifdef TOGCUP -extern Bool noXcupExtension; -#endif - #ifdef RES extern Bool noResExtension; #endif -#ifdef XAPPGROUP -extern Bool noXagExtension; -#endif - -#ifdef XCMISC -extern Bool noXCMiscExtension; -#endif - -#ifdef XEVIE -extern Bool noXevieExtension; -#endif - #ifdef XF86BIGFONT extern Bool noXFree86BigfontExtension; #endif @@ -144,10 +104,6 @@ extern Bool noXFree86DGAExtension; extern Bool noXFree86DRIExtension; #endif -#ifdef XF86MISC -extern Bool noXFree86MiscExtension; -#endif - #ifdef XF86VIDMODE extern Bool noXFree86VidModeExtension; #endif @@ -165,14 +121,6 @@ extern Bool noXkbExtension; extern Bool noPanoramiXExtension; #endif -#ifdef XINPUT -extern Bool noXInputExtension; -#endif - -#ifdef XIDLE -extern Bool noXIdleExtension; -#endif - #ifdef XSELINUX extern Bool noSELinuxExtension; |