aboutsummaryrefslogtreecommitdiff
path: root/libXt/src/Converters.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-10 15:05:45 +0200
committermarha <marha@users.sourceforge.net>2012-04-10 15:05:45 +0200
commit4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8 (patch)
tree3ddf28be6916dd5ea27837431b5be8c94017cd9a /libXt/src/Converters.c
parent5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (diff)
parent5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff)
downloadvcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.gz
vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.bz2
vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXt/src/Converters.c')
-rw-r--r--libXt/src/Converters.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libXt/src/Converters.c b/libXt/src/Converters.c
index a19ca673a..6be3ba61d 100644
--- a/libXt/src/Converters.c
+++ b/libXt/src/Converters.c
@@ -257,7 +257,7 @@ void XtStringConversionWarning(
params,&num_params);
}
-static int CompareISOLatin1(char *, char *);
+static int CompareISOLatin1(const char *, const char *);
static Boolean IsInteger(
@@ -1379,11 +1379,12 @@ void LowerCase(register char *source, register *dest)
}
#endif
-static int CompareISOLatin1 (char *first, char *second)
+static int CompareISOLatin1 (const char *first, const char *second)
{
- register unsigned char *ap, *bp;
+ register const unsigned char *ap, *bp;
- for (ap = (unsigned char *) first, bp = (unsigned char *) second;
+ for (ap = (const unsigned char *) first,
+ bp = (const unsigned char *) second;
*ap && *bp; ap++, bp++) {
register unsigned char a, b;
@@ -1410,11 +1411,10 @@ static int CompareISOLatin1 (char *first, char *second)
return (((int) *bp) - ((int) *ap));
}
-static void CopyISOLatin1Lowered(char *dst, char *src)
+static void CopyISOLatin1Lowered(char *dst, const char *src)
{
- unsigned char *dest, *source;
-
- dest = (unsigned char *) dst; source = (unsigned char *) src;
+ unsigned char *dest = (unsigned char *) dst;
+ const unsigned char *source = (const unsigned char *) src;
for ( ; *source; source++, dest++) {
if (*source >= XK_A && *source <= XK_Z)
@@ -1737,7 +1737,7 @@ Boolean XtCvtStringToGravity (
{
static struct _namepair {
XrmQuark quark;
- char *name;
+ const char *name;
int gravity;
} names[] = {
{ NULLQUARK, "forget", ForgetGravity },