|
@@ -146,7 +146,7 @@ static struct
|
|
|
{ "US-ASCII", ENCODING_ASCII },
|
|
|
{ "8859-1", ENCODING_LATIN1 },
|
|
|
{ "ISO-8859-1", ENCODING_LATIN1 },
|
|
|
-#if defined(__WIN32__)||defined(__OS2__)
|
|
|
+#if defined(__WIN32__) || defined(__OS2__)
|
|
|
{ "WCHAR_T", ENCODING_UTF16LE },
|
|
|
#else
|
|
|
{ "WCHAR_T", ENCODING_UCS4NATIVE },
|
|
@@ -887,8 +887,7 @@ SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf,
|
|
|
break;
|
|
|
}
|
|
|
/* Avoid infinite loops when nothing gets converted */
|
|
|
- if (oldinbytesleft == inbytesleft)
|
|
|
- {
|
|
|
+ if (oldinbytesleft == inbytesleft) {
|
|
|
break;
|
|
|
}
|
|
|
}
|