diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-07-30 13:47:34 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-07-30 13:56:12 +1000 |
| commit | ad74c47b0adaacc88449a123f353a0f4e182b2f9 (patch) | |
| tree | b5984b942d1686d55121c20530c01f4b5de7b9e8 | |
| parent | 461d74ba17339ea228e8d8b40efd996e3e4757a4 (diff) | |
Constify a few strings
xf86Elo.c:74:5: warning: initialization discards 'const' qualifier from
pointer target type [enabled by default]
several of:
xf86Elo.c:915:3: warning: initialization discards 'const' qualifier from
pointer target type [enabled by default]
(input ABI 18 only)
xf86Elo.c:1012:9: warning: assignment discards 'const' qualifier from
pointer target type [enabled by default]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/xf86Elo.c | 10 |
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; |