diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
| commit | be8a3ecf0bebc7134452778070cd83b7decf7f71 (patch) | |
| tree | e3a5d81a99754c393062ed811bece6e0787e3767 /libX11/src/RdBitF.c | |
| parent | 7403278d95051a554e2cbec3fafdde8ce9c6d200 (diff) | |
| parent | 5ee5b91b019005aa27273dff01388a68c12be293 (diff) | |
| download | vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.gz vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.bz2 vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git update 26 Aug 2013
Diffstat (limited to 'libX11/src/RdBitF.c')
| -rw-r--r-- | libX11/src/RdBitF.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/src/RdBitF.c b/libX11/src/RdBitF.c index d20731215..7f6750d64 100644 --- a/libX11/src/RdBitF.c +++ b/libX11/src/RdBitF.c @@ -138,7 +138,7 @@ XReadBitmapFileData ( /* error cleanup and return macro */ #define RETURN(code) \ -{ if (bits) Xfree ((char *)bits); fclose (fstream); return code; } +{ if (bits) Xfree (bits); fclose (fstream); return code; } while (fgets(line, MAX_SIZE, fstream)) { if (strlen(line) == MAX_SIZE-1) @@ -255,7 +255,7 @@ XReadBitmapFile ( if (res != BitmapSuccess) return res; *pixmap = XCreateBitmapFromData(display, d, (char *)data, *width, *height); - Xfree((char *)data); + Xfree(data); if (*pixmap == None) return (BitmapNoMemory); return (BitmapSuccess); |