summaryrefslogtreecommitdiff
path: root/include/dix.h
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-02-02 19:25:14 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-02-03 10:06:00 -0800
commit5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3 (patch)
tree5ef32d8457f859742bcf2aa12019306db49d5c25 /include/dix.h
parent6869efae74381e5305b2d6517bf286e3ef7fdcb7 (diff)
Constify atom name strings
Changes MakeAtom to take a const char * and NameForAtom to return them, since many callers pass pointers to constant strings stored in read-only ELF sections. Updates in-tree callers as necessary to clear const mismatch warnings introduced by this change. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include/dix.h')
-rw-r--r--include/dix.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dix.h b/include/dix.h
index b21084607..658dd293c 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -280,14 +280,14 @@ extern _X_EXPORT Bool ClientIsAsleep(
/* atom.c */
extern _X_EXPORT Atom MakeAtom(
- char * /*string*/,
+ const char * /*string*/,
unsigned /*len*/,
Bool /*makeit*/);
extern _X_EXPORT Bool ValidAtom(
Atom /*atom*/);
-extern _X_EXPORT char *NameForAtom(
+extern _X_EXPORT const char *NameForAtom(
Atom /*atom*/);
extern _X_EXPORT void AtomError(void);