From 6d8fefe38077f4d532c256e79cfcaf2a46c5269d Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 12 Nov 2013 16:58:49 +0100 Subject: Now use visual studio 2013 express edition for compilation --- xkbcomp/expr.c | 2 +- xkbcomp/utils.c | 2 +- xkbcomp/utils.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xkbcomp') diff --git a/xkbcomp/expr.c b/xkbcomp/expr.c index e0f957c15..09ffca1d8 100644 --- a/xkbcomp/expr.c +++ b/xkbcomp/expr.c @@ -729,7 +729,7 @@ ExprResolveString(ExprDef * expr, val_rtrn->str = XkbAtomGetString(NULL, expr->value.str); if (val_rtrn->str == NULL) { - static const char *empty = ""; + static char *empty = ""; val_rtrn->str = empty; } return True; diff --git a/xkbcomp/utils.c b/xkbcomp/utils.c index 541c33e14..53dc99472 100644 --- a/xkbcomp/utils.c +++ b/xkbcomp/utils.c @@ -352,7 +352,7 @@ uStrCaseCmp(const char *str1, const char *str2) } int -uStrCasePrefix(const char *my_prefix, char *str) +uStrCasePrefix(const char *my_prefix, const char *str) { char c1; char c2; diff --git a/xkbcomp/utils.h b/xkbcomp/utils.h index b644f7d3a..e51d1a091 100644 --- a/xkbcomp/utils.h +++ b/xkbcomp/utils.h @@ -210,7 +210,7 @@ uInformation(const char * /* s */ , ... const char * /* s2 */ ); extern int uStrCasePrefix(const char * /* p */ , - char * /* str */ + const char * /* str */ ); #endif #ifdef HAVE_STRDUP -- cgit v1.2.3