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

ICU-231 Win32 fix for a different file handle problem

Browse Source 
X-SVN-Rev: 603
This commit is contained in:
Vladimir Weinstein 2000-01-17 19:04:48 +00:00
parent 822bc77ef3
commit 6adc9bb374
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4c/source/extra/ustdio/ufile.c
View File

@ -186,7 +186,11 @@ u_finit(FILE *f,
if(result == 0)
return 0;
#ifdef WIN32
result->fFile = &_iob[_fileno(f)];
#else
result->fFile = f;
#endif
result->fOwnFile = FALSE;
/* if locale is 0, use the default */

8
icu4c/source/extra/ustdio/ustdio.dsp
View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 ..\..\..\lib\Release\icuuc.lib ..\..\..\lib\Release\icui18n.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\Release\ustdio.dll"
# ADD LINK32 icuuc.lib icui18n.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\Release\ustdio.dll" /libpath:"..\..\..\lib\Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
@ -70,8 +70,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /YX /FD /GZ /c
# SUBTRACT CPP /X
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -81,7 +80,8 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 ..\..\..\lib\debug\icuuc.lib ..\..\..\lib\debug\icui18n.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\Debug\ustdio.dll" /pdbtype:sept
# ADD LINK32 icuuc.lib icui18n.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\Debug\ustdio.dll" /pdbtype:sept /libpath:"..\..\..\lib\debug"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF