diff options
author | marha <marha@users.sourceforge.net> | 2013-07-23 09:20:51 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-07-23 09:20:51 +0200 |
commit | 5c340ceb9356ea029dea53b73440268d4769d5a5 (patch) | |
tree | ae22100b15246769392280ed7b10eba3dc68b0ea /libXmu/src/LocBitmap.c | |
parent | b6aadb8490bdacf33196fa0898fe1247b9a8ee2c (diff) | |
download | vcxsrv-5c340ceb9356ea029dea53b73440268d4769d5a5.tar.gz vcxsrv-5c340ceb9356ea029dea53b73440268d4769d5a5.tar.bz2 vcxsrv-5c340ceb9356ea029dea53b73440268d4769d5a5.zip |
libX11 libXmu mesa xserver git update 23 July 2013
xserver commit d5ebe20f9ba9569351c4a41449866679fd60ba45
libX11 commit feb131b18aee31c2c125dc3275b0260940245882
libXmu commit d5dac08d65c4865f311cb62c161dbb1300eecd11
mesa commit 5a7bdd4b4173958c53109517b7c95f1039623e7e
Diffstat (limited to 'libXmu/src/LocBitmap.c')
-rw-r--r-- | libXmu/src/LocBitmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libXmu/src/LocBitmap.c b/libXmu/src/LocBitmap.c index 1d8b19828..229d0fde4 100644 --- a/libXmu/src/LocBitmap.c +++ b/libXmu/src/LocBitmap.c @@ -150,7 +150,7 @@ XmuLocatePixmapFile(Screen *screen, _Xconst char *name, */ for (i = 1; i <= 4; i++) { - char *fn = filename; + const char *fn = filename; Pixmap pixmap; unsigned char *data; @@ -158,7 +158,7 @@ XmuLocatePixmapFile(Screen *screen, _Xconst char *name, case 1: if (!(name[0] == '/' || ((name[0] == '.') && name[1] == '/'))) continue; - fn = (char *) name; + fn = name; try_plain_name = False; break; case 2: @@ -175,7 +175,7 @@ XmuLocatePixmapFile(Screen *screen, _Xconst char *name, break; case 4: if (!try_plain_name) continue; - fn = (char *) name; + fn = name; break; } |