[Xorg-commit] xc/include/extensions XRes.h,1.1,1.1.4.1 XvMClib.h,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/include/extensions
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/include/extensions

Modified Files:
      Tag: XORG-CURRENT
	XRes.h XvMClib.h 
Log Message:
merge XFree86 RC2 (4.3.99.902) from vendor branch

Index: XRes.h
===================================================================
RCS file: /cvs/xorg/xc/include/extensions/XRes.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- XRes.h	14 Nov 2003 16:48:42 -0000	1.1
+++ XRes.h	20 Dec 2003 00:28:21 -0000	1.1.4.1
@@ -1,7 +1,8 @@
 /*
    Copyright (c) 2002  XFree86 Inc
 */
-/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */
 
 #ifndef _XRES_H
 #define _XRES_H
@@ -29,8 +30,8 @@
 
 Status XResQueryVersion (
    Display *dpy,
-   int *major,
-   int *minor
+   int *major_versionp,
+   int *minor_versionp
 );
 
 Status XResQueryClients (

Index: XvMClib.h
===================================================================
RCS file: /cvs/xorg/xc/include/extensions/XvMClib.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- XvMClib.h	14 Nov 2003 16:48:43 -0000	1.1
+++ XvMClib.h	20 Dec 2003 00:28:21 -0000	1.1.4.1
@@ -1,4 +1,5 @@
-/* $XFree86: xc/include/extensions/XvMClib.h,v 1.6 2001/11/14 21:54:37 mvojkovi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/include/extensions/XvMClib.h,v 1.7 2003/12/18 05:48:06 dawes Exp $ */
 
 #ifndef _XVMCLIB_H_
 #define _XVMCLIB_H_
@@ -10,7 +11,8 @@
 _XFUNCPROTOBEGIN
 
 Bool XvMCQueryExtension (Display *display, int *eventBase, int *errBase);
-Status XvMCQueryVersion (Display *display, int *major, int *minor);
+Status XvMCQueryVersion (Display *display, int *major_versionp,
+			 int *minor_versionp);
 
 XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num);