summaryrefslogtreecommitdiff
path: root/do_simple.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:03 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:03 +0000
commitc3ee38aec0f064a3916ecef9a29ecf6538a794a1 (patch)
tree3ca22ce1ea394bf671359a6e65d6e623cfce79a1 /do_simple.c
parentee11b04c48b57b74beacd0a905fbc96a86c75931 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
Diffstat (limited to 'do_simple.c')
-rw-r--r--do_simple.c8
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);