summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/include/opaque.h
diff options
context:
space:
mode:
authorjensowen <jensowen>2002-07-30 20:58:18 +0000
committerjensowen <jensowen>2002-07-30 20:58:18 +0000
commit324ff3efd22c82a38df1d4e8e77c6668bb7f014f (patch)
tree8209754f737b4590a194b00b85de070b2df0df3d /xc/programs/Xserver/include/opaque.h
parent36344aa9a4487dbc576427dd275734bd465ad7b3 (diff)
Option to override standard root weave to black.
Diffstat (limited to 'xc/programs/Xserver/include/opaque.h')
-rw-r--r--xc/programs/Xserver/include/opaque.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/xc/programs/Xserver/include/opaque.h b/xc/programs/Xserver/include/opaque.h
index 0743f6975..048963991 100644
--- a/xc/programs/Xserver/include/opaque.h
+++ b/xc/programs/Xserver/include/opaque.h
@@ -1,9 +1,13 @@
-/* $TOG: opaque.h /main/20 1998/02/09 14:29:12 kaleb $ */
+/* $Xorg: opaque.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
-All Rights Reserved.
+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.
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
@@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.7 1999/03/20 08:59:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.10 2001/12/14 19:59:55 dawes Exp $ */
#ifndef OPAQUE_H
#define OPAQUE_H
@@ -70,10 +74,8 @@ extern int limitNoFile;
#endif
extern Bool permitOldBugs;
extern Bool defeatAccessControl;
-#ifdef SERVER_LOCK
-static Bool nolock = FALSE;
-#endif
extern char* protNoListen;
+extern Bool blackRoot;