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/include/X11 | |
| 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/include/X11')
| -rw-r--r-- | libXpm/include/X11/xpm.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libXpm/include/X11/xpm.h b/libXpm/include/X11/xpm.h index 38c62d80d..f108f1f6e 100644 --- a/libXpm/include/X11/xpm.h +++ b/libXpm/include/X11/xpm.h @@ -304,13 +304,13 @@ _XFUNCPROTOBEGIN FUNC(XpmReadFileToPixmap, int, (Display *display, Drawable d, - char *filename, + const char *filename, Pixmap *pixmap_return, Pixmap *shapemask_return, XpmAttributes *attributes)); FUNC(XpmWriteFileFromPixmap, int, (Display *display, - char *filename, + const char *filename, Pixmap pixmap, Pixmap shapemask, XpmAttributes *attributes)); @@ -329,13 +329,13 @@ _XFUNCPROTOBEGIN XpmAttributes *attributes)); FUNC(XpmReadFileToImage, int, (Display *display, - char *filename, + const char *filename, XImage **image_return, XImage **shapeimage_return, XpmAttributes *attributes)); FUNC(XpmWriteFileFromImage, int, (Display *display, - char *filename, + const char *filename, XImage *image, XImage *shapeimage, XpmAttributes *attributes)); @@ -365,11 +365,11 @@ _XFUNCPROTOBEGIN Pixmap shapemask, XpmAttributes *attributes)); #endif - FUNC(XpmReadFileToBuffer, int, (char *filename, char **buffer_return)); - FUNC(XpmWriteFileFromBuffer, int, (char *filename, char *buffer)); + FUNC(XpmReadFileToBuffer, int, (const char *filename, char **buffer_return)); + FUNC(XpmWriteFileFromBuffer, int, (const char *filename, char *buffer)); - FUNC(XpmReadFileToData, int, (char *filename, char ***data_return)); - FUNC(XpmWriteFileFromData, int, (char *filename, char **data)); + FUNC(XpmReadFileToData, int, (const char *filename, char ***data_return)); + FUNC(XpmWriteFileFromData, int, (const char *filename, char **data)); FUNC(XpmAttributesSize, int, (void)); FUNC(XpmFreeAttributes, void, (XpmAttributes *attributes)); @@ -382,11 +382,11 @@ _XFUNCPROTOBEGIN FUNC(XpmLibraryVersion, int, (void)); /* XpmImage functions */ - FUNC(XpmReadFileToXpmImage, int, (char *filename, + FUNC(XpmReadFileToXpmImage, int, (const char *filename, XpmImage *image, XpmInfo *info)); - FUNC(XpmWriteFileFromXpmImage, int, (char *filename, + FUNC(XpmWriteFileFromXpmImage, int, (const char *filename, XpmImage *image, XpmInfo *info)); #if !defined(FOR_MSW) && !defined(AMIGA) |