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/record/set.c
+++ b/record/set.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.

 */
-/* $XFree86: xc/programs/Xserver/record/set.c,v 1.7 2001/12/14 20:00:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/record/set.c,v 1.8 2003/11/17 22:20:44 dawes Exp $ */

 /*

@@ -447,12 +447,10 @@ _RecordForceSetImplementation(setimpl)
 #endif

 typedef RecordSetPtr (*RecordCreateSetProcPtr)(
-#if NeedNestedPrototypes
    RecordSetInterval *pIntervals,
    int nIntervals,
    void *pMem,
    int memsize
-#endif
 );

 static int