merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 52 insertions, 5 deletions

diff --git a/multibuf.h b/multibuf.h
index 38cb359..24b13fd 100644
--- a/multibuf.h
+++ b/multibuf.h
@@ -24,6 +24,8 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
 
+/* $XFree86: xc/include/extensions/multibuf.h,v 3.4 2001/12/14 19:53:28 dawes Exp $ */
+
 #ifndef _MULTIBUF_H_
 #define _MULTIBUF_H_
 
@@ -294,13 +296,58 @@ _XFUNCPROTOEND
 
 #else
 
+#include "scrnintstr.h"
+
 typedef Bool	(* mbInitFunc)();
-extern void	RegisterMultibufferInit();
-extern void	RegisterDoubleBufferHardware();
 
-extern int	CreateImageBuffers ();
-extern void	DestroyImageBuffers ();
-extern int	DisplayImageBuffers ();
+struct _mbufScreen;		/* declared in multibufst.h */
+
+extern void	RegisterMultibufferInit(
+#if NeedFunctionPrototypes
+    ScreenPtr			/* pScreen */,
+    Bool (* /* bufMultibufferInit */)(
+#if NeedNestedPrototypes
+	ScreenPtr		/* pScreen */,
+	struct _mbufScreen *	/* pMBScreen */
+#endif
+    )
+#endif
+);
+
+struct xMbufBufferInfo;		/* declared in multibufst.h */
+
+extern void	RegisterDoubleBufferHardware(
+#if NeedFunctionPrototypes
+    ScreenPtr			/* pScreen */,
+    int				/* nInfo */,
+    struct xMbufBufferInfo *	/* pInfo */,
+    DevUnion *			/* frameBuffer */,
+    DevUnion			/* selectPlane */,
+    void (* /* CopyBufferBitsFunc */ )(),
+    void (* /* DrawSelectPlaneFunc */ )()
+#endif
+);
+
+extern int	CreateImageBuffers (
+#if NeedFunctionPrototypes
+    WindowPtr			/* pWin */,
+    int				/* nbuf */,
+    XID *			/* ids */,
+    int				/* action */,
+    int				/* hint */
+#endif
+);
+extern void	DestroyImageBuffers (
+#if NeedFunctionPrototypes
+    WindowPtr			/* pWin */
+#endif
+);
+extern int	DisplayImageBuffers (
+#if NeedFunctionPrototypes
+    XID *			/* ids */,
+    int				/* nbuf */
+#endif
+);
 
 #endif /* _MULTIBUF_SERVER_ */
 #endif /* _MULTIBUF_H_ */