Solaris doesn't support the LATIN1 character set alias.

Merged from 1.2 svn revision 3133f
This commit is contained in:
Sam Lantinga
2007-07-04 07:08:16 +00:00
parent 803256bf09
commit c123a18337
3 changed files with 36 additions and 28 deletions

View File

@@ -110,29 +110,33 @@ static struct
const char *name;
int format;
} encodings[] = {
{
"ASCII", ENCODING_ASCII}, {
"US-ASCII", ENCODING_ASCII}, {
"LATIN1", ENCODING_LATIN1}, {
"ISO-8859-1", ENCODING_LATIN1}, {
"UTF8", ENCODING_UTF8}, {
"UTF-8", ENCODING_UTF8}, {
"UTF16", ENCODING_UTF16}, {
"UTF-16", ENCODING_UTF16}, {
"UTF16BE", ENCODING_UTF16BE}, {
"UTF-16BE", ENCODING_UTF16BE}, {
"UTF16LE", ENCODING_UTF16LE}, {
"UTF-16LE", ENCODING_UTF16LE}, {
"UTF32", ENCODING_UTF32}, {
"UTF-32", ENCODING_UTF32}, {
"UTF32BE", ENCODING_UTF32BE}, {
"UTF-32BE", ENCODING_UTF32BE}, {
"UTF32LE", ENCODING_UTF32LE}, {
"UTF-32LE", ENCODING_UTF32LE}, {
"UCS2", ENCODING_UCS2}, {
"UCS-2", ENCODING_UCS2}, {
"UCS4", ENCODING_UCS4}, {
"UCS-4", ENCODING_UCS4},};
/* *INDENT-OFF* */
{ "646", ENCODING_ASCII },
{ "ASCII", ENCODING_ASCII },
{ "US-ASCII", ENCODING_ASCII },
{ "LATIN1", ENCODING_LATIN1 },
{ "8859-1", ENCODING_LATIN1 },
{ "ISO-8859-1", ENCODING_LATIN1 },
{ "UTF8", ENCODING_UTF8 },
{ "UTF-8", ENCODING_UTF8 },
{ "UTF16", ENCODING_UTF16 },
{ "UTF-16", ENCODING_UTF16 },
{ "UTF16BE", ENCODING_UTF16BE },
{ "UTF-16BE", ENCODING_UTF16BE },
{ "UTF16LE", ENCODING_UTF16LE },
{ "UTF-16LE", ENCODING_UTF16LE },
{ "UTF32", ENCODING_UTF32 },
{ "UTF-32", ENCODING_UTF32 },
{ "UTF32BE", ENCODING_UTF32BE },
{ "UTF-32BE", ENCODING_UTF32BE },
{ "UTF32LE", ENCODING_UTF32LE },
{ "UTF-32LE", ENCODING_UTF32LE },
{ "UCS2", ENCODING_UCS2 },
{ "UCS-2", ENCODING_UCS2 },
{ "UCS4", ENCODING_UCS4 },
{ "UCS-4", ENCODING_UCS4 },
/* *INDENT-ON* */
};
SDL_iconv_t
SDL_iconv_open(const char *tocode, const char *fromcode)