Better fix for bug 419
--HG-- branch : SDL-1.2 extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402385
This commit is contained in:
parent
8915c4f95b
commit
aa3a251d43
2 changed files with 2 additions and 3 deletions
|
@ -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_t iconv_t
|
||||||
#define SDL_iconv_open iconv_open
|
#define SDL_iconv_open iconv_open
|
||||||
#define SDL_iconv_close iconv_close
|
#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
|
#else
|
||||||
typedef struct _SDL_iconv_t *SDL_iconv_t;
|
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 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 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
|
#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
|
/* This function converts a string between encodings in one pass, returning a
|
||||||
string that must be freed with SDL_free() or NULL on error.
|
string that must be freed with SDL_free() or NULL on error.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
size_t SDL_iconv(SDL_iconv_t cd,
|
size_t SDL_iconv(SDL_iconv_t cd,
|
||||||
char **inbuf, size_t *inbytesleft,
|
const char **inbuf, size_t *inbytesleft,
|
||||||
char **outbuf, size_t *outbytesleft)
|
char **outbuf, size_t *outbytesleft)
|
||||||
{
|
{
|
||||||
size_t retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft);
|
size_t retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue