diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:10 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:10 +0000 |
| commit | 9b69c93543a87fe6cbf6416944d0d3fbab2fe4b4 (patch) | |
| tree | 3ca22ce1ea394bf671359a6e65d6e623cfce79a1 /do_simple.c | |
| parent | 9105cd947989db96a61c83493c44a336bf10a18c (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE
Diffstat (limited to 'do_simple.c')
| -rw-r--r-- | do_simple.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/do_simple.c b/do_simple.c index 934303b..096cdcc 100644 --- a/do_simple.c +++ b/do_simple.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.6 2001/11/03 21:59:20 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.7 2003/05/27 22:26:58 tsi Exp $ */ #ifndef VMS #include <X11/Xatom.h> @@ -32,7 +32,6 @@ SOFTWARE. #include "x11perf.h" static Atom XA_PK_TEMP; -static Window root; void DoNoOp(XParms xp, Parms p, int reps) @@ -82,7 +81,6 @@ InitGetProperty(XParms xp, Parms p, int reps) foo[1] = 14; foo[2] = 37; foo[3] = 73; - root = RootWindow (xp->d, 0); XA_PK_TEMP = XInternAtom (xp->d, "_PK_TEMP", False); XChangeProperty ( xp->d, xp->w, XA_PK_TEMP, XA_INTEGER, 32, @@ -93,7 +91,7 @@ InitGetProperty(XParms xp, Parms p, int reps) void DoGetProperty(XParms xp, Parms p, int reps) { - int i, status; + int i; int actual_format; unsigned long actual_length, bytes_remaining; unsigned char *prop; @@ -101,7 +99,7 @@ DoGetProperty(XParms xp, Parms p, int reps) Atom actual_type; for (i = 0; i != reps; i++) { - status = XGetWindowProperty ( + XGetWindowProperty ( xp->d, xp->w, XA_PK_TEMP, 0, 4, False, AnyPropertyType, &actual_type, &actual_format, &actual_length, &bytes_remaining, &prop); |