[xserver-commit] xserver/hw/kdrive/src knoop.c,1.5,1.6

[Warren Turkal]

Committed by: wt

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/tmp/cvs-serv1375/hw/kdrive/src

Modified Files:
	knoop.c 
Log Message:
* completely get rid of NeedNestedPrototypes
* completely get rid of NeedVarargsPrototypes
* remove a lot of NeedFunctionPrototypes
* ansify many function declarations



Index: knoop.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/knoop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/knoop.c	2 Nov 2003 19:56:10 -0000	1.5
+++ b/knoop.c	18 Feb 2004 02:12:44 -0000	1.6
@@ -34,18 +34,15 @@
 #include <gcstruct.h>
 
 typedef void	(* typeFillSpans)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*nInit*/,
 		DDXPointPtr /*pptInit*/,
 		int * /*pwidthInit*/,
 		int /*fSorted*/
-#endif
 );
 
 typedef void	(* typeSetSpans)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		char * /*psrc*/,
@@ -53,11 +50,9 @@
 		int * /*pwidth*/,
 		int /*nspans*/,
 		int /*fSorted*/
-#endif
 );
 
 typedef void	(* typePutImage)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*depth*/,
@@ -68,11 +63,9 @@
 		int /*leftPad*/,
 		int /*format*/,
 		char * /*pBits*/
-#endif
 );
 
 typedef RegionPtr	(* typeCopyArea)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pSrc*/,
 		DrawablePtr /*pDst*/,
 		GCPtr /*pGC*/,
@@ -82,11 +75,9 @@
 		int /*h*/,
 		int /*dstx*/,
 		int /*dsty*/
-#endif
 );
 
 typedef RegionPtr	(* typeCopyPlane)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pSrcDrawable*/,
 		DrawablePtr /*pDstDrawable*/,
 		GCPtr /*pGC*/,
@@ -97,130 +88,104 @@
 		int /*dstx*/,
 		int /*dsty*/,
 		unsigned long /*bitPlane*/
-#endif
 );
 typedef void	(* typePolyPoint)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*mode*/,
 		int /*npt*/,
 		DDXPointPtr /*pptInit*/
-#endif
 );
 
 typedef void	(* typePolylines)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*mode*/,
 		int /*npt*/,
 		DDXPointPtr /*pptInit*/
-#endif
 );
 
 typedef void	(* typePolySegment)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*nseg*/,
 		xSegment * /*pSegs*/
-#endif
 );
 
 typedef void	(* typePolyRectangle)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*nrects*/,
 		xRectangle * /*pRects*/
-#endif
 );
 
 typedef void	(* typePolyArc)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*narcs*/,
 		xArc * /*parcs*/
-#endif
 );
 
 typedef void	(* typeFillPolygon)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*shape*/,
 		int /*mode*/,
 		int /*count*/,
 		DDXPointPtr /*pPts*/
-#endif
 );
 
 typedef void	(* typePolyFillRect)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*nrectFill*/,
 		xRectangle * /*prectInit*/
-#endif
 );
 
 typedef void	(* typePolyFillArc)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*narcs*/,
 		xArc * /*parcs*/
-#endif
 );
 
 typedef int		(* typePolyText8)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*x*/,
 		int /*y*/,
 		int /*count*/,
 		char * /*chars*/
-#endif
 );
 
 typedef int		(* typePolyText16)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*x*/,
 		int /*y*/,
 		int /*count*/,
 		unsigned short * /*chars*/
-#endif
 );
 
 typedef void	(* typeImageText8)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*x*/,
 		int /*y*/,
 		int /*count*/,
 		char * /*chars*/
-#endif
 );
 
 typedef void	(* typeImageText16)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*x*/,
 		int /*y*/,
 		int /*count*/,
 		unsigned short * /*chars*/
-#endif
 );
 
 typedef void	(* typeImageGlyphBlt)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*x*/,
@@ -228,11 +193,9 @@
 		unsigned int /*nglyph*/,
 		CharInfoPtr * /*ppci*/,
 		pointer /*pglyphBase*/
-#endif
 );
 
 typedef void	(* typePolyGlyphBlt)(
-#if NeedNestedPrototypes
 		DrawablePtr /*pDrawable*/,
 		GCPtr /*pGC*/,
 		int /*x*/,
@@ -240,11 +203,9 @@
 		unsigned int /*nglyph*/,
 		CharInfoPtr * /*ppci*/,
 		pointer /*pglyphBase*/
-#endif
 );
 
 typedef void	(* typePushPixels)(
-#if NeedNestedPrototypes
 		GCPtr /*pGC*/,
 		PixmapPtr /*pBitMap*/,
 		DrawablePtr /*pDst*/,
@@ -252,7 +213,6 @@
 		int /*h*/,
 		int /*x*/,
 		int /*y*/
-#endif
 );
 
 static RegionPtr