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/opaque.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/opaque.h')
-rw-r--r-- | xorg-server/include/opaque.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xorg-server/include/opaque.h b/xorg-server/include/opaque.h index 3d19d275f..07a0715ef 100644 --- a/xorg-server/include/opaque.h +++ b/xorg-server/include/opaque.h @@ -49,14 +49,11 @@ extern int ScreenSaverBlanking; extern int ScreenSaverAllowExposures; extern int defaultScreenSaverBlanking; extern int defaultScreenSaverAllowExposures; -extern int argcGlobal; -extern char **argvGlobal; extern char *display; extern int defaultBackingStore; extern Bool disableBackingStore; extern Bool enableBackingStore; -extern Bool disableSaveUnders; extern Bool PartialNetwork; #ifndef NOLOGOHACK extern int logoScreenSaver; @@ -72,7 +69,7 @@ extern int limitNoFile; #endif extern Bool defeatAccessControl; extern long maxBigRequestSize; -extern Bool blackRoot; +extern Bool party_like_its_1989; extern Bool whiteRoot; extern Bool CoreDump; |