aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-12 16:58:49 +0100
committermarha <marha@users.sourceforge.net>2013-11-12 16:58:49 +0100
commit6d8fefe38077f4d532c256e79cfcaf2a46c5269d (patch)
treedfc74a8d253b690dac620212cbb9d46001cdaa2b /xkbcomp
parent0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (diff)
downloadvcxsrv-6d8fefe38077f4d532c256e79cfcaf2a46c5269d.tar.gz
vcxsrv-6d8fefe38077f4d532c256e79cfcaf2a46c5269d.tar.bz2
vcxsrv-6d8fefe38077f4d532c256e79cfcaf2a46c5269d.zip
Now use visual studio 2013 express edition for compilation
Diffstat (limited to 'xkbcomp')
-rw-r--r--xkbcomp/expr.c2
-rw-r--r--xkbcomp/utils.c2
-rw-r--r--xkbcomp/utils.h2
3 files changed, 3 insertions, 3 deletions
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