summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-03-12 09:45:05 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-03-13 16:18:31 +1000
commit90d6633d11aa3691b6b39df3931a4024b832eb05 (patch)
tree92b27df8923a6b0dcc5430ec0ae2afd87eed6866
parentfadf9cf5e8659ca8500faac498327e6cadcd2652 (diff)
Fix build error - duplicate typedef (#47168)
Introduced in c34cf307f9982b62c6e6dfa2687e1b16f527f2a4. synapticsstr.h includes synproto.h, which now contains the typedef. X.Org Bug 47168 <http://bugs.freedesktop.org/show_bug.cgi?id=47168> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--src/synapticsstr.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index d4daeba..92c64fb 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -183,7 +183,7 @@ typedef struct _SynapticsParameters
} SynapticsParameters;
-typedef struct _SynapticsPrivateRec
+struct _SynapticsPrivateRec
{
SynapticsParameters synpara; /* Default parameter settings, read from
the X config file */
@@ -286,6 +286,6 @@ typedef struct _SynapticsPrivateRec
int *open_slots; /* Array of currently open touch slots */
int num_active_touches; /* Number of active touches on device */
#endif
-} SynapticsPrivate;
+};
#endif /* _SYNAPTICSSTR_H_ */