From 65f14840898dd7e9d61d8c966f3ff11ae3e82d4f Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 26 Sep 2009 22:48:49 -0700 Subject: [PATCH] XQuartz: Fix a brain-o array indexing problem /bop Peter (cherry picked from commit 494a6b046a258ad83dc98eb92b7c3d8f1d2626bb) --- hw/xquartz/darwin.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 5ad53921e..8836782a2 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -290,8 +290,8 @@ static int DarwinMouseProc(DeviceIntPtr pPointer, int what) { #define NAXES 2 // 7 buttons: left, right, middle, then four scroll wheel "buttons" CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7}; - Atom btn_labels[NAXES] = {0}; - Atom axes_labels[NBUTTONS] = {0}; + Atom btn_labels[NBUTTONS] = {0}; + Atom axes_labels[NAXES] = {0}; switch (what) { case DEVICE_INIT: @@ -340,8 +340,8 @@ static int DarwinTabletProc(DeviceIntPtr pPointer, int what) { #define NBUTTONS 3 #define NAXES 5 CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3}; - Atom axes_labels[NAXES] = {0}; Atom btn_labels[NBUTTONS] = {0}; + Atom axes_labels[NAXES] = {0}; switch (what) { case DEVICE_INIT: