summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:39 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:39 +0000
commit010a4625727822f5d328a7bf1e169278a58af15f (patch)
tree9cf61e926f2035bdae5d066f19b0259ec40158ee /src
parent52d0891b9e3c51d43fd13d0b2680b7e24b2f2e2d (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src')
-rw-r--r--src/Xrandr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Xrandr.c b/src/Xrandr.c
index e464431..6b3e2f5 100644
--- a/src/Xrandr.c
+++ b/src/Xrandr.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.13 2003/02/07 11:21:07 eich Exp $
+ * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.14 2003/05/27 22:26:42 tsi Exp $
*
* Copyright © 2000 Compaq Computer Corporation, Inc.
* Copyright © 2002 Hewlett Packard Company, Inc.
@@ -437,7 +437,6 @@ static XRRScreenConfiguration *_XRRGetScreenInfo (Display *dpy, Window window)
_XRRVersionState async_state;
int nbytes, nbytesRead, rbytes;
int i;
- int snum;
xScreenSizes size;
struct _XRRScreenConfiguration *scp;
XRRScreenSize *ssp;
@@ -530,7 +529,7 @@ static XRRScreenConfiguration *_XRRGetScreenInfo (Display *dpy, Window window)
/* set up the screen configuration structure */
scp->screen =
- ScreenOfDisplay (dpy, (snum = XRRRootToScreen(dpy, rep.root)));
+ ScreenOfDisplay (dpy, XRRRootToScreen(dpy, rep.root));
scp->sizes = ssp;
scp->rates = rates;