[xserver-commit] xserver/Xext shmint.h,1.1,3.1 syncint.h,1.1,3.1 xext.h,1.1,3.1 Makefile.am,3.5,3.6 bigreq.c,3.7,3.8 mitmisc.c,3.6,3.7 saver.c,3.8,3.9 shape.c,3.18,3.19 shm.c,3.40,3.41 sleepuntil.c,3.7,3.8 sleepuntil.h,1.2,1.3 sync.c,3.13,3.14 xcmisc.c,3.8,3.9 xres.c,1.8,1.9 xtest.c,3.9,3.10 xtest1di.c,3.5,3.6 xvmc.c,1.10,1.11 xvmcext.h,1.3,1.4

Keith Packard xserver-commit@pdx.freedesktop.org
Sun, 02 Nov 2003 11:56:12 -0800


Committed by: keithp

Update of /cvs/xserver/xserver/Xext
In directory pdx:/tmp/cvs-serv23831/Xext

Modified Files:
	Makefile.am bigreq.c mitmisc.c saver.c shape.c shm.c 
	sleepuntil.c sleepuntil.h sync.c xcmisc.c xres.c xtest.c 
	xtest1di.c xvmc.c xvmcext.h 
Added Files:
	shmint.h syncint.h xext.h 
Log Message:
	merge xfixes_2_branch back to HEAD





Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Xext/Makefile.am,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- Makefile.am	4 Oct 2003 02:43:16 -0000	3.5
+++ Makefile.am	2 Nov 2003 19:56:10 -0000	3.6
@@ -1,32 +1,36 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/include			\
-	$(XSERVER_CFLAGS)
+	@XSERVER_CFLAGS@
 
 noinst_LIBRARIES = libXext.a
 
-libXext_a_SOURCES =	\
-	bigreq.c	\
-	mitmisc.c	\
-	shape.c		\
-	sleepuntil.c	\
-	sync.c		\
-	xtest.c		\
-	xtest1di.c	\
-	xtest1dd.c	\
-	xcmisc.c
-
 if MITSHM
-libXext_a_SOURCES += shm.c
+MITSHM_SRCS = shm.c
 endif
 
 if XV
-libXext_a_SOURCES += xvmain.c xvdisp.c xvmc.c
+XV_SRCS = xvmain.c xvdisp.c xvmc.c
 endif
 
 if RES
-libXext_a_SOURCES += xres.c
+RES_SRCS = xres.c
 endif
 
 if SCREENSAVER
-libXext_a_SOURCES += saver.c
+SCREENSAVER_SRCS = saver.c
 endif
+
+libXext_a_SOURCES =		\
+	bigreq.c		\
+	mitmisc.c		\
+	shape.c			\
+	sleepuntil.c		\
+	sync.c			\
+	xtest.c			\
+	xtest1di.c		\
+	xtest1dd.c		\
+	xcmisc.c		\
+	$(MITSHM_SRCS)		\
+	$(XV_SRCS)		\
+	$(RES_SRCS)		\
+	$(SCREENSAVER_SRCS)

Index: bigreq.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/bigreq.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- bigreq.c	11 Sep 2003 05:12:50 -0000	3.7
+++ bigreq.c	2 Nov 2003 19:56:10 -0000	3.8
@@ -39,6 +39,7 @@
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include <X11/extensions/bigreqstr.h>
+#include "xext.h"
 
 static unsigned char XBigReqCode;
 
@@ -51,7 +52,7 @@
 static DISPATCH_PROC(ProcBigReqDispatch);
 
 void
-BigReqExtensionInit()
+BigReqExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: mitmisc.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/mitmisc.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- mitmisc.c	11 Sep 2003 05:12:50 -0000	3.6
+++ mitmisc.c	2 Nov 2003 19:56:10 -0000	3.7
@@ -41,6 +41,7 @@
 #include "extnsionst.h"
 #define _MITMISC_SERVER_
 #include <X11/extensions/mitmiscstr.h>
+#include "xext.h"
 
 extern Bool permitOldBugs;
 
@@ -60,7 +61,7 @@
 static DISPATCH_PROC(SProcMITSetBugMode);
 
 void
-MITMiscExtensionInit()
+MITMiscExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: saver.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/saver.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- saver.c	4 Oct 2003 02:43:16 -0000	3.8
+++ saver.c	2 Nov 2003 19:56:10 -0000	3.9
@@ -52,6 +52,7 @@
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
+#include "xext.h"
 
 
 #ifdef IN_MODULE
@@ -250,7 +251,7 @@
  ****************/
 
 void
-ScreenSaverExtensionInit()
+ScreenSaverExtensionInit(void)
 {
     ExtensionEntry *extEntry;
     int		    i;

Index: shape.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/shape.c,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -d -r3.18 -r3.19
--- shape.c	11 Sep 2003 05:12:50 -0000	3.18
+++ shape.c	2 Nov 2003 19:56:10 -0000	3.19
@@ -46,91 +46,56 @@
 #include <X11/extensions/shapestr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
+#include "shapeint.h"
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif
 
-typedef	RegionPtr (*CreateDftPtr)(
-#if NeedNestedPrototypes
-	WindowPtr /* pWin */
-#endif
-	);
+typedef	RegionPtr (*CreateDftPtr)(WindowPtr pWin);
 
-static int ShapeFreeClient(
-#if NeedFunctionPrototypes
-	pointer /* data */,
-	XID /* id */
-#endif
-	);
-static int ShapeFreeEvents(
-#if NeedFunctionPrototypes
-	pointer /* data */,
-	XID /* id */
-#endif
-	);
-static void SendShapeNotify(
-#if NeedFunctionPrototypes
-	WindowPtr /* pWin */,
-	int /* which */
-#endif
-	);
-static void ShapeResetProc(
-#if NeedFunctionPrototypes
-	ExtensionEntry * /* extEntry */
-#endif
-	);
-static void SShapeNotifyEvent(
-#if NeedFunctionPrototypes
-	xShapeNotifyEvent * /* from */,
-	xShapeNotifyEvent * /* to */
-#endif
-	);
 static int
-RegionOperate (
-#if NeedFunctionPrototypes
-	ClientPtr /* client */,
-	WindowPtr /* pWin */,
-	int /* kind */,
-	RegionPtr * /* destRgnp */,
-	RegionPtr /* srcRgn */,
-	int /* op */,
-	int /* xoff */,
-	int /* yoff */,
-	CreateDftPtr /* create */
-#endif
-	);
+ShapeFreeClient(pointer data, XID id);
 
-#if NeedFunctionPrototypes
-#define CREATE_PROC(func) RegionPtr func(WindowPtr /* pWin */)
-#else
-#define CREATE_PROC(func) RegionPtr func(/* WindowPtr pWin */)
-#endif
+static int
+ShapeFreeEvents(pointer data, XID id);
 
-static CREATE_PROC(CreateBoundingShape);
-static CREATE_PROC(CreateClipShape);
+static void
+ShapeResetProc(ExtensionEntry *extEntry);
 
-#undef CREATE_PROC
+static void
+SShapeNotifyEvent(xShapeNotifyEvent * from,	xShapeNotifyEvent * to);
 
-static DISPATCH_PROC(ProcShapeCombine);
-static DISPATCH_PROC(ProcShapeDispatch);
-static DISPATCH_PROC(ProcShapeGetRectangles);
-static DISPATCH_PROC(ProcShapeInputSelected);
-static DISPATCH_PROC(ProcShapeMask);
-static DISPATCH_PROC(ProcShapeOffset);
-static DISPATCH_PROC(ProcShapeQueryExtents);
-static DISPATCH_PROC(ProcShapeQueryVersion);
-static DISPATCH_PROC(ProcShapeRectangles);
-static DISPATCH_PROC(ProcShapeSelectInput);
-static DISPATCH_PROC(SProcShapeCombine);
-static DISPATCH_PROC(SProcShapeDispatch);
-static DISPATCH_PROC(SProcShapeGetRectangles);
-static DISPATCH_PROC(SProcShapeInputSelected);
-static DISPATCH_PROC(SProcShapeMask);
-static DISPATCH_PROC(SProcShapeOffset);
-static DISPATCH_PROC(SProcShapeQueryExtents);
-static DISPATCH_PROC(SProcShapeQueryVersion);
-static DISPATCH_PROC(SProcShapeRectangles);
-static DISPATCH_PROC(SProcShapeSelectInput);
+static int
+RegionOperate (ClientPtr client,
+	       WindowPtr pWin,
+	       int kind,
+	       RegionPtr * destRgnp,
+	       RegionPtr srcRgn,
+	       int op,
+	       int xoff,
+	       int yoff,
+	       CreateDftPtr create);
+
+static int ProcShapeCombine (ClientPtr pClient);
+static int ProcShapeDispatch (ClientPtr pClient);
+static int ProcShapeGetRectangles (ClientPtr pClient);
+static int ProcShapeInputSelected (ClientPtr pClient);
+static int ProcShapeMask (ClientPtr pClient);
+static int ProcShapeOffset (ClientPtr pClient);
+static int ProcShapeQueryExtents (ClientPtr pClient);
+static int ProcShapeQueryVersion (ClientPtr pClient);
+static int ProcShapeRectangles (ClientPtr pClient);
+static int ProcShapeSelectInput (ClientPtr pClient);
+static int SProcShapeCombine (ClientPtr pClient);
+static int SProcShapeDispatch (ClientPtr pClient);
+static int SProcShapeGetRectangles (ClientPtr pClient);
+static int SProcShapeInputSelected (ClientPtr pClient);
+static int SProcShapeMask (ClientPtr pClient);
+static int SProcShapeOffset (ClientPtr pClient);
+static int SProcShapeQueryExtents (ClientPtr pClient);
+static int SProcShapeQueryVersion (ClientPtr pClient);
+static int SProcShapeRectangles (ClientPtr pClient);
+static int SProcShapeSelectInput (ClientPtr pClient);
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
@@ -167,7 +132,7 @@
  ****************/
 
 void
-ShapeExtensionInit()
+ShapeExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 
@@ -276,32 +241,6 @@
     return Success;
 }
 
-static RegionPtr
-CreateBoundingShape (pWin)
-    WindowPtr	pWin;
-{
-    BoxRec	extents;
-
-    extents.x1 = -wBorderWidth (pWin);
-    extents.y1 = -wBorderWidth (pWin);
-    extents.x2 = pWin->drawable.width + wBorderWidth (pWin);
-    extents.y2 = pWin->drawable.height + wBorderWidth (pWin);
-    return REGION_CREATE(pWin->drawable.pScreen, &extents, 1);
-}
-
-static RegionPtr
-CreateClipShape (pWin)
-    WindowPtr	pWin;
-{
-    BoxRec	extents;
-
-    extents.x1 = 0;
-    extents.y1 = 0;
-    extents.x2 = pWin->drawable.width;
-    extents.y2 = pWin->drawable.height;
-    return REGION_CREATE(pWin->drawable.pScreen, &extents, 1);
-}
-
 static int
 ProcShapeQueryVersion (client)
     register ClientPtr	client;
@@ -895,10 +834,8 @@
  * deliver the event
  */
 
-static void
-SendShapeNotify (pWin, which)
-    WindowPtr	pWin;
-    int		which;
+void
+SendShapeNotify (WindowPtr pWin, int which)
 {
     ShapeEventPtr	*pHead, pShapeEvent;
     ClientPtr		client;

Index: shm.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/shm.c,v
retrieving revision 3.40
retrieving revision 3.41
diff -u -d -r3.40 -r3.41
--- shm.c	12 Sep 2003 01:49:46 -0000	3.40
+++ shm.c	2 Nov 2003 19:56:10 -0000	3.41
@@ -62,6 +62,8 @@
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif
+#include "xext.h"
+#include "shmint.h"
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
@@ -77,26 +79,50 @@
     unsigned long size;
 } ShmDescRec, *ShmDescPtr;
 
-static void miShmPutImage(XSHM_PUT_IMAGE_ARGS);
-static void fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
-static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
-static int ShmDetachSegment(
-#if NeedFunctionPrototypes
-    pointer		/* value */,
-    XID			/* shmseg */
-#endif
-    );
-static void ShmResetProc(
-#if NeedFunctionPrototypes
-    ExtensionEntry *	/* extEntry */
-#endif
-    );
-static void SShmCompletionEvent(
-#if NeedFunctionPrototypes
-    xShmCompletionEvent * /* from */,
-    xShmCompletionEvent * /* to */
-#endif
-    );
+static void
+miShmPutImage(DrawablePtr   dst,
+	      GCPtr	    pGC,
+	      int	    depth,
+	      unsigned int  format,
+	      int	    w,
+	      int	    h,
+	      int	    sx,
+	      int	    sy,
+	      int	    sw,
+	      int	    sh,
+	      int	    dx,
+	      int	    dy,
+	      char	    *data);
+    
+static void
+fbShmPutImage(DrawablePtr   dst,
+	      GCPtr	    pGC,
+	      int	    depth,
+	      unsigned int  format,
+	      int	    w,
+	      int	    h,
+	      int	    sx,
+	      int	    sy,
+	      int	    sw,
+	      int	    sh,
+	      int	    dx,
+	      int	    dy,
+	      char	    *data);
+    
+static PixmapPtr
+fbShmCreatePixmap (ScreenPtr	pScreen,
+		   int		width,
+		   int		height,
+		   int		depth,
+		   char		*addr);
+
+static int ShmDetachSegment(pointer	value,
+			    XID		shmseg);
+
+static void ShmResetProc(ExtensionEntry	*extEntry);
+
+static void SShmCompletionEvent(xShmCompletionEvent *from,
+				xShmCompletionEvent *to);
 
 static Bool ShmDestroyPixmap (PixmapPtr pPixmap);
 
@@ -195,7 +221,7 @@
 #endif
     
 void
-ShmExtensionInit()
+ShmExtensionInit(void)
 {
     ExtensionEntry *extEntry;
     int i;
@@ -273,17 +299,13 @@
 }
 
 void
-ShmRegisterFuncs(pScreen, funcs)
-    ScreenPtr pScreen;
-    ShmFuncsPtr funcs;
+ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs)
 {
     shmFuncs[pScreen->myNum] = funcs;
 }
 
 void
-ShmSetPixmapFormat(pScreen, format)
-    ScreenPtr pScreen;
-    int format;
+ShmSetPixmapFormat(ScreenPtr pScreen, int format)
 {
     shmPixFormat[pScreen->myNum] = format;
 }
@@ -324,8 +346,7 @@
 }
 
 void
-ShmRegisterFbFuncs(pScreen)
-    ScreenPtr pScreen;
+ShmRegisterFbFuncs(ScreenPtr pScreen)
 {
     shmFuncs[pScreen->myNum] = &fbFuncs;
 }
@@ -494,12 +515,19 @@
 }
 
 static void
-miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
-    DrawablePtr dst;
-    GCPtr	pGC;
-    int		depth, w, h, sx, sy, sw, sh, dx, dy;
-    unsigned int format;
-    char 	*data;
+miShmPutImage(DrawablePtr   dst,
+	      GCPtr	    pGC,
+	      int	    depth,
+	      unsigned int  format,
+	      int	    w,
+	      int	    h,
+	      int	    sx,
+	      int	    sy,
+	      int	    sw,
+	      int	    sh,
+	      int	    dx,
+	      int	    dy,
+	      char	    *data)
 {
     PixmapPtr pmap;
     GCPtr putGC;
@@ -1013,12 +1041,11 @@
 }
 
 static PixmapPtr
-fbShmCreatePixmap (pScreen, width, height, depth, addr)
-    ScreenPtr	pScreen;
-    int		width;
-    int		height;
-    int		depth;
-    char	*addr;
+fbShmCreatePixmap (ScreenPtr	pScreen,
+		   int		width,
+		   int		height,
+		   int		depth,
+		   char		*addr)
 {
     register PixmapPtr pPixmap;
 

Index: sleepuntil.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/sleepuntil.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- sleepuntil.c	11 Sep 2003 05:12:50 -0000	3.7
+++ sleepuntil.c	2 Nov 2003 19:56:10 -0000	3.8
@@ -89,11 +89,10 @@
 );
 
 int
-ClientSleepUntil (client, revive, notifyFunc, closure)
-    ClientPtr	client;
-    TimeStamp	*revive;
-    void	(*notifyFunc)();
-    pointer	closure;
+ClientSleepUntil (ClientPtr client, 
+		  TimeStamp *revive,
+		  void	    (*notifyFunc) (ClientPtr client, pointer closure),
+		  pointer   closure)
 {
     SertafiedPtr	pRequest, pReq, pPrev;
 

Index: sleepuntil.h
===================================================================
RCS file: /cvs/xserver/xserver/Xext/sleepuntil.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sleepuntil.h	11 Sep 2003 05:12:50 -0000	1.2
+++ sleepuntil.h	2 Nov 2003 19:56:10 -0000	1.3
@@ -30,18 +30,10 @@
 
 #include "dix.h"
 
-extern int ClientSleepUntil(
-#if NeedFunctionPrototypes
-    ClientPtr client,
-    TimeStamp *revive,
-    void (*notifyFunc)(
-#if NeedNestedPrototypes
-	ClientPtr /* client */,
-	pointer   /* closure */
-#endif
-	),
-    pointer Closure
-#endif
-);
+int
+ClientSleepUntil (ClientPtr client, 
+		  TimeStamp *revive,
+		  void	    (*notifyFunc) (ClientPtr client, pointer closure),
+		  pointer   closure);
 
 #endif

Index: sync.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/sync.c,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -d -r3.13 -r3.14
--- sync.c	11 Sep 2003 05:12:50 -0000	3.13
+++ sync.c	2 Nov 2003 19:56:10 -0000	3.14
@@ -69,6 +69,8 @@
 #define _SYNC_SERVER
 #include <X11/extensions/sync.h>
 #include <X11/extensions/syncstr.h>
+#include "syncint.h"
+#include "xext.h"
 
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
@@ -1094,15 +1096,13 @@
  * ***** System Counter utilities
  */
 
-pointer 
-SyncCreateSystemCounter(name, initial, resolution, counterType,
-			QueryValue, BracketValues)
-    char           *name;
-    CARD64          initial;
-    CARD64          resolution;
-    SyncCounterType counterType;
-    void            (*QueryValue) ();
-    void            (*BracketValues) ();
+pointer
+SyncCreateSystemCounter(char			    *name,
+			CARD64			    initial,
+			CARD64			    resolution,
+			SyncCounterType		    counterType,
+			SyncQueryValueProcPtr	    QueryValue,
+			SyncBracketValuesProcPtr    BracketValues)
 {
     SyncCounter    *pCounter;
 
@@ -2402,7 +2402,7 @@
  * ** Initialise the extension.
  */
 void 
-SyncExtensionInit()
+SyncExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: xcmisc.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xcmisc.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- xcmisc.c	12 Sep 2003 01:49:46 -0000	3.8
+++ xcmisc.c	2 Nov 2003 19:56:10 -0000	3.9
@@ -41,6 +41,7 @@
 #include "extnsionst.h"
 #include "swaprep.h"
 #include <X11/extensions/xcmiscstr.h>
+#include "xext.h"
 
 static unsigned char XCMiscCode;
 
@@ -60,7 +61,7 @@
 static DISPATCH_PROC(SProcXCMiscGetXIDRange);
 
 void
-XCMiscExtensionInit()
+XCMiscExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: xres.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xres.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xres.c	30 Sep 2003 06:02:41 -0000	1.8
+++ xres.c	2 Nov 2003 19:56:10 -0000	1.9
@@ -17,6 +17,7 @@
 #include "swaprep.h"
 #include <X11/extensions/XResproto.h>
 #include "pixmapstr.h"
+#include "xext.h"
 
 extern RESTYPE lastResourceType;
 extern RESTYPE TypeMask;

Index: xtest.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xtest.c,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- xtest.c	11 Sep 2003 05:12:50 -0000	3.9
+++ xtest.c	2 Nov 2003 19:56:10 -0000	3.10
@@ -55,6 +55,7 @@
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif
+#include "xext.h"
 
 static unsigned char XTestReqCode;
 
@@ -86,7 +87,7 @@
 static DISPATCH_PROC(SProcXTestGrabControl);
 
 void
-XTestExtensionInit()
+XTestExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: xtest1di.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xtest1di.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- xtest1di.c	11 Sep 2003 05:12:50 -0000	3.5
+++ xtest1di.c	2 Nov 2003 19:56:10 -0000	3.6
@@ -77,6 +77,7 @@
 #include <X11/extensions/xtestext1.h>
 
 #include "xtest1dd.h"
+#include "xext.h"
 
 /*****************************************************************************
  * defines
@@ -189,7 +190,7 @@
  *	(other than the core errors).
  */
 void
-XTestExtension1Init()
+XTestExtension1Init(void)
 {
 	/*
 	 * holds the pointer to the extension entry structure

Index: xvmc.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xvmc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- xvmc.c	12 Sep 2003 01:49:46 -0000	1.10
+++ xvmc.c	2 Nov 2003 19:56:10 -0000	1.11
@@ -644,7 +644,8 @@
    return Success;
 }
 
-XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
+XvImagePtr
+XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
 {
     XvImagePtr pImage = NULL;
     ScreenPtr pScreen = pPort->pAdaptor->pScreen;

Index: xvmcext.h
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xvmcext.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xvmcext.h	12 Sep 2003 01:49:46 -0000	1.3
+++ xvmcext.h	2 Nov 2003 19:56:10 -0000	1.4
@@ -106,4 +106,7 @@
 
 int XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr adapt);
 
+XvImagePtr
+XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
+
 #endif /* _XVMC_H */