diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:22 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:22 +0000 |
| commit | 1f27e1259a6dd2237b3dfe752ac138d83c5e5409 (patch) | |
| tree | 5f18531076a73c94a44903b7101f2bf48735eca6 | |
| parent | 345fbee57dc02964c90e8e232cb9274860276d27 (diff) | |
merge XFree86 RC2 (4.3.99.902) from vendor branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE
| -rw-r--r-- | include/X11/extensions/XRes.h | 7 | ||||
| -rw-r--r-- | man/XRes.man | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h index bd0ebc5..93779c6 100644 --- a/include/X11/extensions/XRes.h +++ b/include/X11/extensions/XRes.h @@ -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: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */ +/* $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 @@ Bool XResQueryExtension ( Status XResQueryVersion ( Display *dpy, - int *major, - int *minor + int *major_versionp, + int *minor_versionp ); Status XResQueryClients ( diff --git a/man/XRes.man b/man/XRes.man index 5bba729..1cc61d7 100644 --- a/man/XRes.man +++ b/man/XRes.man @@ -1,5 +1,6 @@ .\" -.\" $XFree86: xc/lib/XRes/XRes.man,v 1.2 2003/10/13 21:22:54 herrb Exp $ +.\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $ +.\" $XFree86: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $ .\" .\" Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. .\" @@ -31,7 +32,7 @@ .SH NAME XRes \- X-Resource extension client library .SH SYNOPSIS -.B #include <X11/extension/XRres.h> +.B #include <X11/extension/XRes.h> .PP .nf .ta .5i 2i |