summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-11-03 21:18:56 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-11-23 12:15:06 -0800
commitf8dd5efb673439e7e9f7d82e6f9cfb97afacc85a (patch)
tree23f05fbd009552ad45b4398dc71d5e89bc4e808d /include
parentcccafabd56d0f8e5784ea0ad9fdc03224f952bfe (diff)
Mark XKB char * as const to clean up gcc -Wwrite-strings warnings
Cleans up around 120 warnings from this set Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'include')
-rw-r--r--include/xkbfile.h4
-rw-r--r--include/xkbsrv.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/xkbfile.h b/include/xkbfile.h
index a4b99ee07..db7dbfa40 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -136,7 +136,7 @@ extern _X_EXPORT char * XkbConfigText(
unsigned /* format */
);
-extern _X_EXPORT char * XkbSIMatchText(
+extern _X_EXPORT const char * XkbSIMatchText(
unsigned /* type */,
unsigned /* format */
);
@@ -161,7 +161,7 @@ extern _X_EXPORT char * XkbDoodadTypeText(
unsigned /* format */
);
-extern _X_EXPORT char * XkbActionTypeText(
+extern _X_EXPORT const char * XkbActionTypeText(
unsigned /* type */,
unsigned /* format */
);
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index c6f86f544..7b0053486 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -296,8 +296,8 @@ extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
extern _X_EXPORT int XkbReqCode;
extern _X_EXPORT int XkbEventBase;
extern _X_EXPORT int XkbKeyboardErrorCode;
-extern _X_EXPORT char * XkbBaseDirectory;
-extern _X_EXPORT char * XkbBinDirectory;
+extern _X_EXPORT const char * XkbBaseDirectory;
+extern _X_EXPORT const char * XkbBinDirectory;
extern _X_EXPORT CARD32 xkbDebugFlags;