bug #214. Merge most of 4.4RC3
This commit is contained in:
parent
9343c8f5ac
commit
14ab4ade74
|
@ -1,4 +1,4 @@
|
||||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Globals.c,v 1.41 2003/08/24 17:36:52 dawes Exp $ */
|
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Globals.c,v 1.42 2004/01/27 01:31:44 dawes Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
|
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
|
||||||
|
@ -236,7 +236,7 @@ Bool xf86VidModeAllowNonLocal = FALSE;
|
||||||
Bool xf86MiscModInDevDisabled = FALSE;
|
Bool xf86MiscModInDevDisabled = FALSE;
|
||||||
Bool xf86MiscModInDevAllowNonLocal = FALSE;
|
Bool xf86MiscModInDevAllowNonLocal = FALSE;
|
||||||
#endif
|
#endif
|
||||||
PropertyPtr *xf86RegisteredPropertiesTable = NULL;
|
RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
|
||||||
Bool xf86inSuspend = FALSE;
|
Bool xf86inSuspend = FALSE;
|
||||||
|
|
||||||
#ifdef DLOPEN_HACK
|
#ifdef DLOPEN_HACK
|
||||||
|
|
Loading…
Reference in New Issue