From 2f5836f13996f1bb843a2c92968d372e073cf914 Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:28:45 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- include/X11/extensions/XRes.h | 5 +++-- man/XRes.man | 3 ++- src/XRes.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h index bd0ebc5..a4c8c9b 100644 --- a/include/X11/extensions/XRes.h +++ b/include/X11/extensions/XRes.h @@ -1,6 +1,7 @@ /* Copyright (c) 2002 XFree86 Inc */ +/* $XdotOrg: xc/include/extensions/XRes.h,v 1.1.4.1.4.2 2004/03/05 12:46:30 eich Exp $ */ /* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */ #ifndef _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..354c557 100644 --- a/man/XRes.man +++ b/man/XRes.man @@ -1,4 +1,5 @@ .\" +.\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.1.4.1.4.2 2004/03/05 12:46:31 eich Exp $ .\" $XFree86: xc/lib/XRes/XRes.man,v 1.2 2003/10/13 21:22:54 herrb 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 +.B #include .PP .nf .ta .5i 2i diff --git a/src/XRes.c b/src/XRes.c index 3e9bf24..474d2df 100644 --- a/src/XRes.c +++ b/src/XRes.c @@ -1,7 +1,7 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/lib/XRes/XRes.c,v 1.4 2002/10/16 00:37:26 dawes Exp $ */ +/* $XFree86: xc/lib/XRes/XRes.c,v 1.3 2002/03/10 22:06:53 mvojkovi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES -- cgit v1.2.1