Mercurial > sdl-ios-xcode
changeset 3984:b74530a1dad6 SDL-1.2
Better fix for bug 419
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Thu, 28 Jun 2007 05:35:50 +0000 |
| parents | 540466e900db |
| children | 2f8efcf14c83 |
| files | include/SDL_stdinc.h src/stdlib/SDL_iconv.c |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/include/SDL_stdinc.h Wed Jun 27 10:12:49 2007 +0000 +++ b/include/SDL_stdinc.h Thu Jun 28 05:35:50 2007 +0000 @@ -574,13 +574,12 @@ #define SDL_iconv_t iconv_t #define SDL_iconv_open iconv_open #define SDL_iconv_close iconv_close -extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); #else typedef struct _SDL_iconv_t *SDL_iconv_t; extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode, const char *fromcode); extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd); +#endif extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); -#endif /* This function converts a string between encodings in one pass, returning a string that must be freed with SDL_free() or NULL on error. */
--- a/src/stdlib/SDL_iconv.c Wed Jun 27 10:12:49 2007 +0000 +++ b/src/stdlib/SDL_iconv.c Thu Jun 28 05:35:50 2007 +0000 @@ -31,7 +31,7 @@ #include <errno.h> size_t SDL_iconv(SDL_iconv_t cd, - char **inbuf, size_t *inbytesleft, + const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) { size_t retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft);