diff options
author | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
commit | 4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8 (patch) | |
tree | 3ddf28be6916dd5ea27837431b5be8c94017cd9a /libXt/src/Intrinsic.c | |
parent | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (diff) | |
parent | 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff) | |
download | vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.gz vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.bz2 vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXt/src/Intrinsic.c')
-rw-r--r-- | libXt/src/Intrinsic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libXt/src/Intrinsic.c b/libXt/src/Intrinsic.c index 8d9e8608c..901f3d7c2 100644 --- a/libXt/src/Intrinsic.c +++ b/libXt/src/Intrinsic.c @@ -1321,7 +1321,7 @@ static void FillInLangSubs( * The exact value should be documented in the implementation * notes for any Xt implementation. */ -static char *implementation_default_path(void) +static const char *implementation_default_path(void) { #if defined(WIN32) static char xfilesearchpath[] = ":"; @@ -1368,8 +1368,8 @@ String XtResolvePathname( XtFilePredicate predicate) { XtPerDisplay pd; - static char *defaultPath = NULL; - char *impl_default = implementation_default_path(); + static const char *defaultPath = NULL; + const char *impl_default = implementation_default_path(); int idef_len = strlen(impl_default); char *massagedPath; int bytesAllocd, bytesLeft; |