diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-23 09:22:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-23 09:22:39 +0200 |
| commit | a7c19a157eb0ba6a7789fe31f5bf7a2066d7966c (patch) | |
| tree | d00e9cb782f34582f722e3da544b9c42b16ac850 /libXmu/src/LocBitmap.c | |
| parent | 81d811ac780a2524fff09a516b6f0212c3f209a2 (diff) | |
| parent | 5c340ceb9356ea029dea53b73440268d4769d5a5 (diff) | |
| download | vcxsrv-a7c19a157eb0ba6a7789fe31f5bf7a2066d7966c.tar.gz vcxsrv-a7c19a157eb0ba6a7789fe31f5bf7a2066d7966c.tar.bz2 vcxsrv-a7c19a157eb0ba6a7789fe31f5bf7a2066d7966c.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libXmu mesa xserver git update 23 July 2013
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; } |