[xserver-commit] xserver/dri xf86dri.h,1.2,1.3

[Warren Turkal]

Committed by: wt

Update of /cvs/xserver/xserver/dri
In directory pdx:/tmp/cvs-serv15213/dri

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



Index: xf86dri.h
===================================================================
RCS file: /cvs/xserver/xserver/dri/xf86dri.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/xf86dri.h	29 Dec 2003 06:24:01 -0000	1.2
+++ b/xf86dri.h	18 Feb 2004 03:23:36 -0000	1.3
@@ -62,7 +62,7 @@
 #define XF86DRIOperationNotSupported	1
 #define XF86DRINumberErrors		(XF86DRIOperationNotSupported + 1)
 
-/* Warning : Do not change XF86DRIClipRect without changing the kernel 
+/* Warning : Do not change XF86DRIClipRect without changing the kernel
  * structure! */
 typedef struct _XF86DRIClipRect {
     unsigned short	x1; /* Upper left: inclusive */
@@ -76,102 +76,79 @@
 _XFUNCPROTOBEGIN
 
 Bool XF86DRIQueryExtension(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int*		/* event_base */,
     int*		/* error_base */
-#endif
 );
 
 Bool XF86DRIQueryVersion(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int*		/* majorVersion */,
     int*		/* minorVersion */,
     int*		/* patchVersion */
-#endif
 );
 
 Bool XF86DRIQueryDirectRenderingCapable(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     Bool*		/* isCapable */
-#endif
 );
 
 Bool XF86DRIOpenConnection(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     drmHandlePtr	/* hSAREA */,
     char**		/* busIDString */
-#endif
 );
 
 Bool XF86DRIAuthConnection(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     drmMagic            /* magic */
-#endif
 );
 
 Bool XF86DRICloseConnection(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */
-#endif
 );
 
 Bool XF86DRIGetClientDriverName(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     int*		/* ddxDriverMajorVersion */,
     int*		/* ddxDriverMinorVersion */,
     int*		/* ddxDriverPatchVersion */,
     char**		/* clientDriverName */
-#endif
 );
 
 Bool XF86DRICreateContext(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     Visual*		/* visual */,
     XID*		/* ptr to returned context id */,
     drmContextPtr	/* hHWContext */
-#endif
 );
 
 Bool XF86DRIDestroyContext(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     XID 	        /* context id */
-#endif
 );
 
 Bool XF86DRICreateDrawable(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     Drawable		/* drawable */,
     drmDrawablePtr 	/* hHWDrawable */
-#endif
 );
 
 Bool XF86DRIDestroyDrawable(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     Drawable 		/* drawable */
-#endif
 );
 
 Bool XF86DRIGetDrawableInfo(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     Drawable 		/* drawable */,
@@ -186,12 +163,10 @@
     int*		/* backX */,
     int*		/* backY */,
     int*		/* numBackClipRects */,
-    XF86DRIClipRectPtr*	/* pBackClipRects */    
-#endif
+    XF86DRIClipRectPtr*	/* pBackClipRects */
 );
 
 Bool XF86DRIGetDeviceInfo(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     drmHandlePtr	/* hFrameBuffer */,
@@ -200,23 +175,18 @@
     int*		/* fbStride */,
     int*		/* devPrivateSize */,
     void**		/* pDevPrivate */
-#endif
 );
 
 Bool XF86DRIOpenFullScreen(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int                 /* screen */,
     Drawable 		/* drawable */
-#endif
 );
 
 Bool XF86DRICloseFullScreen(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int                 /* screen */,
     Drawable 		/* drawable */
-#endif
 );
 
 _XFUNCPROTOEND