[Xorg-commit] xc/programs/Xserver/hw/xfree86/common xf86Globals.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/common
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/common

Modified Files:
      Tag: XORG-CURRENT
	xf86Globals.c 
Log Message:
bug #214. Merge most of 4.4RC3 


Index: xf86Globals.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Globals.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xf86Globals.c	26 Nov 2003 22:48:58 -0000	1.1.4.1
+++ b/xf86Globals.c	24 Feb 2004 15:22:40 -0000	1.1.4.2
@@ -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.
@@ -236,7 +236,7 @@
 Bool xf86MiscModInDevDisabled = FALSE;
 Bool xf86MiscModInDevAllowNonLocal = FALSE;
 #endif
-PropertyPtr *xf86RegisteredPropertiesTable = NULL;
+RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
 Bool xf86inSuspend = FALSE;
 
 #ifdef DLOPEN_HACK