diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-23 14:07:27 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-31 14:56:49 +1000 |
| commit | 9c819b5f541b22c8b866f4b69344ac056597b806 (patch) | |
| tree | 59c3288e35f0f671d789345130797b5054ca3486 | |
| parent | 6a3f12b1b68e7f5838efd3cc7b488adaa5d465bf (diff) | |
Un-typedef SynapticsTouchAxisRec
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/eventcomm.c | 2 | ||||
| -rw-r--r-- | src/synaptics-x11.c | 4 | ||||
| -rw-r--r-- | src/synapticsstr.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c index c4fbc94..4daa350 100644 --- a/src/eventcomm.c +++ b/src/eventcomm.c @@ -792,7 +792,7 @@ event_query_touch(struct SynapticsPrivate *priv, int fd) mtdev->caps.slot.minimum + 1; priv->touch_axes = malloc(priv->num_mt_axes * - sizeof(SynapticsTouchAxisRec)); + sizeof(struct SynapticsTouchAxis)); if (!priv->touch_axes) { priv->has_touch = FALSE; goto out; diff --git a/src/synaptics-x11.c b/src/synaptics-x11.c index 0e3ebcd..d72ea64 100644 --- a/src/synaptics-x11.c +++ b/src/synaptics-x11.c @@ -158,7 +158,7 @@ InitAxesLabels(Atom *labels, int nlabels, const struct SynapticsPrivate * priv) } for (i = 0; i < priv->num_mt_axes; i++) { - SynapticsTouchAxisRec *axis = &priv->touch_axes[i]; + struct SynapticsTouchAxis *axis = &priv->touch_axes[i]; int axnum = nlabels - priv->num_mt_axes + i; labels[axnum] = XIGetKnownProperty(axis->label); @@ -808,7 +808,7 @@ DeviceInitTouchAxes(DeviceIntPtr dev, Atom *axes_labels) } for (i = 0; i < priv->num_mt_axes; i++) { - SynapticsTouchAxisRec *axis = &priv->touch_axes[i]; + struct SynapticsTouchAxis *axis = &priv->touch_axes[i]; int axnum = 4 + i; /* Skip x, y, and scroll axes */ if (!xf86InitValuatorAxisStruct(dev, axnum, axes_labels[axnum], diff --git a/src/synapticsstr.h b/src/synapticsstr.h index 7fe0ab5..c3fcba1 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -91,12 +91,12 @@ struct SynapticsMoveHist { unsigned int millis; }; -typedef struct _SynapticsTouchAxis { +struct SynapticsTouchAxis { const char *label; int min; int max; int res; -} SynapticsTouchAxisRec; +}; enum FingerState { /* Note! The order matters. Compared with < operator. */ FS_BLOCKED = -1, @@ -291,7 +291,7 @@ struct SynapticsPrivate { Bool has_touch; /* Device has multitouch capabilities */ int max_touches; /* Number of touches supported */ int num_mt_axes; /* Number of multitouch axes other than X, Y */ - SynapticsTouchAxisRec *touch_axes; /* Touch axis information other than X, Y */ + struct SynapticsTouchAxis *touch_axes; /* Touch axis information other than X, Y */ int num_slots; /* Number of touch slots allocated */ int *open_slots; /* Array of currently open touch slots */ int num_active_touches; /* Number of active touches on device */ |