From b282d9d73575d0a7d87dedbf89cd91f03fb5ca3d Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 28 Jun 2007 05:35:50 +0000 Subject: [PATCH] Better fix for bug 419 --- include/SDL_stdinc.h | 3 +-- src/stdlib/SDL_iconv.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h index dc90828d4..421392d29 100644 --- a/include/SDL_stdinc.h +++ b/include/SDL_stdinc.h @@ -574,13 +574,12 @@ extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char #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); -extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); #endif +extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); /* This function converts a string between encodings in one pass, returning a string that must be freed with SDL_free() or NULL on error. */ diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c index caa3eb1e5..1285f4916 100644 --- a/src/stdlib/SDL_iconv.c +++ b/src/stdlib/SDL_iconv.c @@ -31,7 +31,7 @@ #include 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);