AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-3499 Fix for Windows 98

Browse Source 
X-SVN-Rev: 15626
This commit is contained in:
George Rhoten 2004-05-28 22:12:25 +00:00
parent acea6d47fa
commit ed683c99db
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
icu4c/source/io/ufile.c
View File

@ -34,7 +34,6 @@ u_finit(FILE *f,
const char *codepage)
{
UErrorCode status = U_ZERO_ERROR;
UBool useSysCP = (UBool)(locale == NULL && codepage == NULL);
UFILE *result = (UFILE*) uprv_malloc(sizeof(UFILE));
if(result == NULL || f == NULL) {
return 0;
@ -43,10 +42,20 @@ u_finit(FILE *f,
uprv_memset(result, 0, sizeof(UFILE));
#ifdef WIN32
result->fFile = &_iob[_fileno(f)];
{
int filenum = _fileno(f);
if (0 <= filenum && filenum <= 2) {
/* stdin, stdout and stderr need to be special cased for Windows 98 */
result->fFile = &_iob[_fileno(f)];
}
else {
result->fFile = f;
}
}
#else
result->fFile = f;
#endif
result->str.fBuffer = result->fUCBuffer;
result->str.fPos = result->fUCBuffer;
result->str.fLimit = result->fUCBuffer;
@ -68,6 +77,7 @@ u_finit(FILE *f,
if(codepage == NULL || *codepage != '\0') {
result->fConverter = ucnv_open(codepage, &status);
}
/* else result->fConverter is already memset'd to NULL. */
if(U_FAILURE(status)) {
#if !UCONFIG_NO_FORMATTING