summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/xf86Elo.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 7f8865c..d42ebec 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -66,7 +66,7 @@
typedef struct {
int type;
- char *name;
+ const char *name;
} Model;
static Model SupportedModels[] =
@@ -911,7 +911,11 @@ xf86EloUninit(InputDriverPtr drv,
xf86DeleteInput(pInfo, 0);
}
-static char *default_options[] = {
+static
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18
+const
+#endif
+char *default_options[] = {
"BaudRate", "9600",
"StopBits", "1",
"DataBits", "8",
@@ -926,7 +930,7 @@ xf86EloInit(InputDriverPtr drv,
int flags)
{
EloPrivatePtr priv=NULL;
- char *str;
+ const char *str;
int portrait = 0;
int height, width;
char *opt_model;