merge latest (4.3.99.16) from XFree86 (vendor) branch

2003-11-26 22:49:07 +00:00
parent c57959ad6a
commit 0097b6fe2d
796 changed files with 58012 additions and 26524 deletions
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.8 2003/01/12 02:44:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.9 2003/11/17 22:20:33 dawes Exp $ */
 /***********************************************************

 Copyright 1987, 1998  The Open Group
@@ -69,12 +69,7 @@ typedef struct _GlyphShare {
 static GlyphSharePtr sharedGlyphs = (GlyphSharePtr)NULL;

 static void
-#if NeedFunctionPrototypes
 FreeCursorBits(CursorBitsPtr bits)
-#else
-FreeCursorBits(bits)
-    CursorBitsPtr bits;
-#endif
 {
    if (--bits->refcnt > 0)
 	return;