diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
| commit | be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (patch) | |
| tree | 807b5640d1fedc88ddcda752f101ffdb3071092a /libXpm/src/RdFToI.c | |
| parent | 11b60c4ebaf348b01051bfff19f947b073028a99 (diff) | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.gz vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.bz2 vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update following packages:
Conflicts:
X11/Xwinsock.h
apps/xhost/xhost.c
libXaw/src/Vendor.c
libXfont/include/X11/fonts/bdfint.h
libXfont/src/fontfile/catalogue.c
Diffstat (limited to 'libXpm/src/RdFToI.c')
| -rw-r--r-- | libXpm/src/RdFToI.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libXpm/src/RdFToI.c b/libXpm/src/RdFToI.c index b27a6726d..eff843dce 100644 --- a/libXpm/src/RdFToI.c +++ b/libXpm/src/RdFToI.c @@ -50,7 +50,7 @@ typedef int pid_t; #endif #endif -LFUNC(OpenReadFile, int, (char *filename, xpmData *mdata)); +LFUNC(OpenReadFile, int, (const char *filename, xpmData *mdata)); LFUNC(xpmDataClose, void, (xpmData *mdata)); FUNC(xpmPipeThrough, FILE*, (int fd, @@ -62,7 +62,7 @@ FUNC(xpmPipeThrough, FILE*, (int fd, int XpmReadFileToImage( Display *display, - char *filename, + const char *filename, XImage **image_return, XImage **shapeimage_return, XpmAttributes *attributes) @@ -105,7 +105,7 @@ XpmReadFileToImage( int XpmReadFileToXpmImage( - char *filename, + const char *filename, XpmImage *image, XpmInfo *info) { @@ -195,7 +195,7 @@ fail2: */ static int OpenReadFile( - char *filename, + const char *filename, xpmData *mdata) { if (!filename) { |