mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-20 23:37:33 +09:00
Issue #1971 - Part 2: Update ICU source to 63.2.
This commit is contained in:
Job Bautista
roytam1
parent
8df84683be
commit
1e69214382
3160 changed files with 275815 additions and 234203 deletions
|
|
@ -55,7 +55,7 @@ DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
|
|||
CFLAGS += $(LIBCFLAGS)
|
||||
CXXFLAGS += $(LIBCXXFLAGS)
|
||||
|
||||
CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) $(CPPFLAGSICUIO)
|
||||
CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) $(CPPFLAGSICUIO)
|
||||
DEFS += -DU_IO_IMPLEMENTATION
|
||||
LDFLAGS += $(LDFLAGSICUIO)
|
||||
LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS)
|
||||
|
|
|
|||
|
|
@ -1,50 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<!-- The following import will include the 'default' configuration options for VS projects. -->
|
||||
<Import Project="..\allinone\Build.Windows.ProjectConfiguration.props" />
|
||||
<!-- The following import will include the library configuration options for VS projects. -->
|
||||
<Import Project="..\allinone\Build.Windows.Library.ProjectConfiguration.props" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{C2B04507-2521-4801-BF0D-5FD79D6D518C}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<PropertyGroup Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
|
|
@ -81,41 +48,39 @@
|
|||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</IntDir>
|
||||
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<!-- Options that are common to *all* project configurations -->
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>U_IO_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<BaseAddress>0x4ab00000</BaseAddress>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Midl>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<TargetEnvironment>Win32</TargetEnvironment>
|
||||
<TypeLibraryName>.\..\..\lib\icuio.tlb</TypeLibraryName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
|
||||
<PrecompiledHeaderOutputFile>.\x86\Release/icuio.pch</PrecompiledHeaderOutputFile>
|
||||
<AssemblerListingLocation>.\x86\Release/</AssemblerListingLocation>
|
||||
<ObjectFileName>.\x86\Release/</ObjectFileName>
|
||||
<ProgramDataBaseFileName>.\x86\Release/</ProgramDataBaseFileName>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<CompileAs>Default</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<OutputFile>..\..\bin\icuio58.dll</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<OutputFile>..\..\bin\icuio63.dll</OutputFile>
|
||||
<AdditionalDependencies>icuuc.lib;icuin.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<ProgramDatabaseFile>.\..\..\lib\icuio.pdb</ProgramDatabaseFile>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<BaseAddress>0x4ab00000</BaseAddress>
|
||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||
<DataExecutionPrevention>
|
||||
</DataExecutionPrevention>
|
||||
|
|
@ -124,42 +89,24 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Midl>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<TargetEnvironment>Win32</TargetEnvironment>
|
||||
<TypeLibraryName>.\..\..\lib\icuio.tlb</TypeLibraryName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
|
||||
<PrecompiledHeaderOutputFile>.\x86\Debug/icuio.pch</PrecompiledHeaderOutputFile>
|
||||
<AssemblerListingLocation>.\x86\Debug/</AssemblerListingLocation>
|
||||
<ObjectFileName>.\x86\Debug/</ObjectFileName>
|
||||
<ProgramDataBaseFileName>.\x86\Debug/</ProgramDataBaseFileName>
|
||||
<BrowseInformation>true</BrowseInformation>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
<CompileAs>Default</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<OutputFile>..\..\bin\icuio58d.dll</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<OutputFile>..\..\bin\icuio63d.dll</OutputFile>
|
||||
<AdditionalDependencies>icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\..\..\lib\icuiod.pdb</ProgramDatabaseFile>
|
||||
<BaseAddress>0x4ab00000</BaseAddress>
|
||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||
<DataExecutionPrevention>
|
||||
</DataExecutionPrevention>
|
||||
|
|
@ -168,104 +115,64 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Midl>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
<TypeLibraryName>.\..\..\lib64\icuio.tlb</TypeLibraryName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
|
||||
<PrecompiledHeaderOutputFile>.\x64\Release/icuio.pch</PrecompiledHeaderOutputFile>
|
||||
<AssemblerListingLocation>.\x64\Release/</AssemblerListingLocation>
|
||||
<ObjectFileName>.\x64\Release/</ObjectFileName>
|
||||
<ProgramDataBaseFileName>.\x64\Release/</ProgramDataBaseFileName>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<CompileAs>Default</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<OutputFile>..\..\bin64\icuio58.dll</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<OutputFile>..\..\bin64\icuio63.dll</OutputFile>
|
||||
<AdditionalDependencies>icuuc.lib;icuin.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<ProgramDatabaseFile>.\..\..\lib64\icuio.pdb</ProgramDatabaseFile>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<BaseAddress>0x4ab00000</BaseAddress>
|
||||
<ImportLibrary>..\..\lib64\icuio.lib</ImportLibrary>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Midl>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
<TypeLibraryName>.\..\..\lib64\icuio.tlb</TypeLibraryName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
|
||||
<PrecompiledHeaderOutputFile>.\x64\Debug/icuio.pch</PrecompiledHeaderOutputFile>
|
||||
<AssemblerListingLocation>.\x64\Debug/</AssemblerListingLocation>
|
||||
<ObjectFileName>.\x64\Debug/</ObjectFileName>
|
||||
<ProgramDataBaseFileName>.\x64\Debug/</ProgramDataBaseFileName>
|
||||
<BrowseInformation>true</BrowseInformation>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>Default</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<OutputFile>..\..\bin64\icuio58d.dll</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<OutputFile>..\..\bin64\icuio63d.dll</OutputFile>
|
||||
<AdditionalDependencies>icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\..\..\lib64\icuiod.pdb</ProgramDatabaseFile>
|
||||
<BaseAddress>0x4ab00000</BaseAddress>
|
||||
<ImportLibrary>..\..\lib64\icuiod.lib</ImportLibrary>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="locbund.cpp" />
|
||||
<ClCompile Include="sprintf.c" />
|
||||
<ClCompile Include="sscanf.c" />
|
||||
<ClCompile Include="sprintf.cpp" />
|
||||
<ClCompile Include="sscanf.cpp" />
|
||||
<ClCompile Include="ucln_io.cpp">
|
||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ufile.c" />
|
||||
<ClCompile Include="ufmt_cmn.c" />
|
||||
<ClCompile Include="ufile.cpp" />
|
||||
<ClCompile Include="ufmt_cmn.cpp" />
|
||||
<ClCompile Include="uprintf.cpp" />
|
||||
<ClCompile Include="uprntf_p.c" />
|
||||
<ClCompile Include="uscanf.c" />
|
||||
<ClCompile Include="uscanf_p.c" />
|
||||
<ClCompile Include="ustdio.c" />
|
||||
<ClCompile Include="uprntf_p.cpp" />
|
||||
<ClCompile Include="uscanf.cpp" />
|
||||
<ClCompile Include="uscanf_p.cpp" />
|
||||
<ClCompile Include="ustdio.cpp" />
|
||||
<ClCompile Include="ustream.cpp">
|
||||
<DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</DisableLanguageExtensions>
|
||||
<DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DisableLanguageExtensions>
|
||||
<DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</DisableLanguageExtensions>
|
||||
<DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</DisableLanguageExtensions>
|
||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -275,49 +182,13 @@
|
|||
<ClInclude Include="ufmt_cmn.h" />
|
||||
<ClInclude Include="uprintf.h" />
|
||||
<ClInclude Include="uscanf.h" />
|
||||
<CustomBuild Include="unicode\ustdio.h">
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="unicode\ustream.h">
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
|
||||
</CustomBuild>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="io.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\common\common.vcxproj">
|
||||
<Project>{73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\i18n\i18n.vcxproj">
|
||||
<Project>{0178b127-6269-407d-b112-93877bb62776}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<!-- The following import will copy all of the header files from this projects 'unicode' folder. -->
|
||||
<Import Project="$(SolutionDir)\Windows.CopyUnicodeHeaderFiles.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Source Files">
|
||||
|
|
@ -18,34 +18,34 @@
|
|||
<ClCompile Include="locbund.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="sprintf.c">
|
||||
<ClCompile Include="sprintf.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="sscanf.c">
|
||||
<ClCompile Include="sscanf.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ucln_io.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ufile.c">
|
||||
<ClCompile Include="ufile.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ufmt_cmn.c">
|
||||
<ClCompile Include="ufmt_cmn.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="uprintf.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="uprntf_p.c">
|
||||
<ClCompile Include="uprntf_p.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="uscanf.c">
|
||||
<ClCompile Include="uscanf.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="uscanf_p.c">
|
||||
<ClCompile Include="uscanf_p.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ustdio.c">
|
||||
<ClCompile Include="ustdio.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ustream.cpp">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
*******************************************************************************
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
*******************************************************************************
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
* *
|
||||
******************************************************************************
|
||||
* file name: ucln_io.cpp
|
||||
* encoding: US-ASCII
|
||||
* encoding: UTF-8
|
||||
* tab size: 8 (not used)
|
||||
* indentation:4
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
* *
|
||||
******************************************************************************
|
||||
* file name: ucln_io.h
|
||||
* encoding: US-ASCII
|
||||
* encoding: UTF-8
|
||||
* tab size: 8 (not used)
|
||||
* indentation:4
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
*
|
||||
******************************************************************************
|
||||
*
|
||||
* File ufile.c
|
||||
* File ufile.cpp
|
||||
*
|
||||
* Modification History:
|
||||
*
|
||||
|
|
@ -20,10 +20,11 @@
|
|||
******************************************************************************
|
||||
*/
|
||||
|
||||
/*
|
||||
* fileno is not declared when building with GCC in strict mode.
|
||||
*/
|
||||
#if defined(__GNUC__) && defined(__STRICT_ANSI__)
|
||||
#include "unicode/platform.h"
|
||||
#if defined(__GNUC__) && !defined(__clang__) && defined(__STRICT_ANSI__)
|
||||
// g++, fileno isn't defined if __STRICT_ANSI__ is defined.
|
||||
// clang fails to compile the <string> header unless __STRICT_ANSI__ is defined.
|
||||
// __GNUC__ is set by both gcc and clang.
|
||||
#undef __STRICT_ANSI__
|
||||
#endif
|
||||
|
||||
|
|
@ -32,6 +33,8 @@
|
|||
|
||||
#if !UCONFIG_NO_CONVERSION
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "ufile.h"
|
||||
#include "unicode/uloc.h"
|
||||
#include "unicode/ures.h"
|
||||
|
|
@ -64,33 +67,7 @@ finit_owner(FILE *f,
|
|||
|
||||
uprv_memset(result, 0, sizeof(UFILE));
|
||||
result->fFileno = fileno(f);
|
||||
|
||||
#if U_PLATFORM_USES_ONLY_WIN32_API && _MSC_VER < 1900
|
||||
/*
|
||||
* Below is a very old workaround (ICU ticket:231).
|
||||
*
|
||||
* Previously, 'FILE*' from inside and outside ICU's DLL
|
||||
* were different, because they pointed into local copies
|
||||
* of the io block. At least by VS 2015 the implementation
|
||||
* is something like:
|
||||
* stdio = _acrt_iob_func(0)
|
||||
* .. which is a function call, so should return the same pointer
|
||||
* regardless of call site.
|
||||
* As of _MSC_VER 1900 this patch is retired, at 16 years old.
|
||||
*/
|
||||
if (0 <= result->fFileno && result->fFileno <= 2) {
|
||||
/* stdin, stdout and stderr need to be special cased for Windows 98 */
|
||||
#if _MSC_VER >= 1400
|
||||
result->fFile = &__iob_func()[_fileno(f)];
|
||||
#else
|
||||
result->fFile = &_iob[_fileno(f)];
|
||||
#endif
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
result->fFile = f;
|
||||
}
|
||||
result->fFile = f;
|
||||
|
||||
result->str.fBuffer = result->fUCBuffer;
|
||||
result->str.fPos = result->fUCBuffer;
|
||||
|
|
@ -180,7 +157,11 @@ u_fopen_u(const UChar *filename,
|
|||
#if U_PLATFORM_USES_ONLY_WIN32_API
|
||||
/* Try Windows API _wfopen if the above fails. */
|
||||
if (!result) {
|
||||
FILE *systemFile = _wfopen(filename, (UChar*)perm);
|
||||
// TODO: test this code path, including wperm.
|
||||
wchar_t wperm[40] = {};
|
||||
size_t retVal;
|
||||
mbstowcs_s(&retVal, wperm, UPRV_LENGTHOF(wperm), perm, _TRUNCATE);
|
||||
FILE *systemFile = _wfopen((const wchar_t *)filename, wperm);
|
||||
if (systemFile) {
|
||||
result = finit_owner(systemFile, locale, codepage, TRUE);
|
||||
}
|
||||
|
|
@ -208,7 +189,7 @@ u_fstropen(UChar *stringBuf,
|
|||
result = (UFILE*) uprv_malloc(sizeof(UFILE));
|
||||
/* Null pointer test */
|
||||
if (result == NULL) {
|
||||
return NULL; /* Just get out. */
|
||||
return NULL; /* Just get out. */
|
||||
}
|
||||
uprv_memset(result, 0, sizeof(UFILE));
|
||||
result->str.fBuffer = stringBuf;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
*******************************************************************************
|
||||
|
|
@ -25,6 +25,8 @@
|
|||
|
||||
#if !UCONFIG_NO_CONVERSION
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "unicode/ucnv.h"
|
||||
#include "unicode/utrans.h"
|
||||
#include "locbund.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -140,7 +140,7 @@ ufmt_uto64(const UChar *buffer,
|
|||
{
|
||||
const UChar *limit;
|
||||
int32_t count;
|
||||
int64_t result;
|
||||
uint64_t result;
|
||||
|
||||
|
||||
/* intialize parameters */
|
||||
|
|
@ -160,7 +160,7 @@ ufmt_uto64(const UChar *buffer,
|
|||
}
|
||||
|
||||
*len = count;
|
||||
return result;
|
||||
return static_cast<int64_t>(result);
|
||||
}
|
||||
|
||||
#define NIBBLE_PER_BYTE 2
|
||||
|
|
@ -187,7 +187,7 @@ ufmt_utop(const UChar *buffer,
|
|||
}
|
||||
|
||||
/* iterate through buffer, stop when you hit the end */
|
||||
while(ufmt_isdigit(buffer[count], 16) && count < *len) {
|
||||
while(count < *len && ufmt_isdigit(buffer[count], 16)) {
|
||||
/* increment the count consumed */
|
||||
++count;
|
||||
}
|
||||
|
|
@ -235,7 +235,7 @@ ufmt_defaultCPToUnicode(const char *s, int32_t sSize,
|
|||
return 0;
|
||||
|
||||
if(sSize <= 0) {
|
||||
sSize = uprv_strlen(s) + 1;
|
||||
sSize = static_cast<int32_t>(uprv_strlen(s)) + 1;
|
||||
}
|
||||
|
||||
/* perform the conversion in one swoop */
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
#include "unicode/utf16.h"
|
||||
|
||||
#define UFMT_DEFAULT_BUFFER_SIZE 128
|
||||
#define MAX_UCHAR_BUFFER_SIZE(buffer) (sizeof(buffer)/(U16_MAX_LENGTH*sizeof(UChar)))
|
||||
#define MAX_UCHAR_BUFFER_SIZE(buffer) ((int32_t)(sizeof(buffer)/(U16_MAX_LENGTH*sizeof(UChar))))
|
||||
#define MAX_UCHAR_BUFFER_NEEDED(strLen) ((strLen+1)*U16_MAX_LENGTH*sizeof(UChar))
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
**********************************************************************
|
||||
|
|
@ -34,13 +34,7 @@
|
|||
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
|
||||
#endif
|
||||
|
||||
#if U_IOSTREAM_SOURCE >= 199711
|
||||
#if (__GNUC__ == 2)
|
||||
#include <iostream>
|
||||
#else
|
||||
#include <istream>
|
||||
#include <ostream>
|
||||
#endif
|
||||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
|
|
@ -67,4 +61,3 @@ U_NAMESPACE_END
|
|||
/* No operator for UChar because it can conflict with wchar_t */
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -183,7 +183,7 @@ u_vfprintf( UFILE *f,
|
|||
else {
|
||||
pattern = buffer;
|
||||
}
|
||||
u_charsToUChars(patternSpecification, pattern, size);
|
||||
u_charsToUChars(patternSpecification, pattern, static_cast<int32_t>(size));
|
||||
|
||||
/* do the work */
|
||||
count = u_vfprintf_u(f, pattern, ap);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -184,6 +184,9 @@ u_printf_simple_percent_handler(const u_printf_stream_handler *handler,
|
|||
const u_printf_spec_info *info,
|
||||
const ufmt_args *args)
|
||||
{
|
||||
(void)formatBundle;
|
||||
(void)info;
|
||||
(void)args;
|
||||
static const UChar PERCENT[] = { UP_PERCENT };
|
||||
|
||||
/* put a single '%' onto the output */
|
||||
|
|
@ -198,6 +201,7 @@ u_printf_string_handler(const u_printf_stream_handler *handler,
|
|||
const u_printf_spec_info *info,
|
||||
const ufmt_args *args)
|
||||
{
|
||||
(void)formatBundle;
|
||||
UChar *s;
|
||||
UChar buffer[UFMT_DEFAULT_BUFFER_SIZE];
|
||||
int32_t len, written;
|
||||
|
|
@ -248,6 +252,7 @@ u_printf_char_handler(const u_printf_stream_handler *handler,
|
|||
const u_printf_spec_info *info,
|
||||
const ufmt_args *args)
|
||||
{
|
||||
(void)formatBundle;
|
||||
UChar s[U16_MAX_LENGTH+1];
|
||||
int32_t len = 1, written;
|
||||
unsigned char arg = (unsigned char)(args[0].int64Value);
|
||||
|
|
@ -418,6 +423,7 @@ u_printf_hex_handler(const u_printf_stream_handler *handler,
|
|||
const u_printf_spec_info *info,
|
||||
const ufmt_args *args)
|
||||
{
|
||||
(void)formatBundle;
|
||||
int64_t num = args[0].int64Value;
|
||||
UChar result[UPRINTF_BUFFER_SIZE];
|
||||
int32_t len = UPRINTF_BUFFER_SIZE;
|
||||
|
|
@ -453,6 +459,7 @@ u_printf_octal_handler(const u_printf_stream_handler *handler,
|
|||
const u_printf_spec_info *info,
|
||||
const ufmt_args *args)
|
||||
{
|
||||
(void)formatBundle;
|
||||
int64_t num = args[0].int64Value;
|
||||
UChar result[UPRINTF_BUFFER_SIZE];
|
||||
int32_t len = UPRINTF_BUFFER_SIZE;
|
||||
|
|
@ -539,7 +546,8 @@ u_printf_pointer_handler(const u_printf_stream_handler *handler,
|
|||
ULocaleBundle *formatBundle,
|
||||
const u_printf_spec_info *info,
|
||||
const ufmt_args *args)
|
||||
{
|
||||
{
|
||||
(void)formatBundle;
|
||||
UChar result[UPRINTF_BUFFER_SIZE];
|
||||
int32_t len = UPRINTF_BUFFER_SIZE;
|
||||
|
||||
|
|
@ -751,6 +759,7 @@ u_printf_ustring_handler(const u_printf_stream_handler *handler,
|
|||
const u_printf_spec_info *info,
|
||||
const ufmt_args *args)
|
||||
{
|
||||
(void)formatBundle;
|
||||
int32_t len, written;
|
||||
const UChar *arg = (const UChar*)(args[0].ptrValue);
|
||||
|
||||
|
|
@ -779,6 +788,7 @@ u_printf_uchar_handler(const u_printf_stream_handler *handler,
|
|||
const u_printf_spec_info *info,
|
||||
const ufmt_args *args)
|
||||
{
|
||||
(void)formatBundle;
|
||||
int32_t written = 0;
|
||||
UChar arg = (UChar)(args[0].int64Value);
|
||||
|
||||
|
|
@ -858,6 +868,9 @@ u_printf_count_handler(const u_printf_stream_handler *handler,
|
|||
const u_printf_spec_info *info,
|
||||
const ufmt_args *args)
|
||||
{
|
||||
(void)handler;
|
||||
(void)context;
|
||||
(void)formatBundle;
|
||||
int32_t *count = (int32_t*)(args[0].ptrValue);
|
||||
|
||||
/* in the special case of count, the u_printf_spec_info's width */
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
*******************************************************************************
|
||||
|
|
@ -380,6 +380,11 @@ u_scanf_simple_percent_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)info;
|
||||
(void)args;
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
/* make sure the next character in the input is a percent */
|
||||
*argConverted = 0;
|
||||
if(u_fgetc(input) != 0x0025) {
|
||||
|
|
@ -396,6 +401,10 @@ u_scanf_count_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)input;
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
/* in the special case of count, the u_scanf_spec_info's width */
|
||||
/* will contain the # of items converted thus far */
|
||||
if (!info->fSkipArg) {
|
||||
|
|
@ -420,6 +429,9 @@ u_scanf_double_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
int32_t len;
|
||||
double num;
|
||||
UNumberFormat *format;
|
||||
|
|
@ -485,6 +497,9 @@ u_scanf_scientific_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
int32_t len;
|
||||
double num;
|
||||
UNumberFormat *format;
|
||||
|
|
@ -582,6 +597,9 @@ u_scanf_scidbl_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
int32_t len;
|
||||
double num;
|
||||
UNumberFormat *scientificFormat, *genericFormat;
|
||||
|
|
@ -672,6 +690,9 @@ u_scanf_integer_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
int32_t len;
|
||||
void *num = (void*) (args[0].ptrValue);
|
||||
UNumberFormat *format;
|
||||
|
|
@ -745,6 +766,9 @@ u_scanf_percent_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
int32_t len;
|
||||
double num;
|
||||
UNumberFormat *format;
|
||||
|
|
@ -802,6 +826,9 @@ u_scanf_string_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
const UChar *source;
|
||||
UConverter *conv;
|
||||
char *arg = (char*)(args[0].ptrValue);
|
||||
|
|
@ -900,6 +927,9 @@ u_scanf_ustring_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
UChar *arg = (UChar*)(args[0].ptrValue);
|
||||
UChar *alias = arg;
|
||||
int32_t count;
|
||||
|
|
@ -969,6 +999,9 @@ u_scanf_spellout_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
int32_t len;
|
||||
double num;
|
||||
UNumberFormat *format;
|
||||
|
|
@ -1028,6 +1061,9 @@ u_scanf_hex_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
int32_t len;
|
||||
int32_t skipped;
|
||||
void *num = (void*) (args[0].ptrValue);
|
||||
|
|
@ -1084,6 +1120,9 @@ u_scanf_octal_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
int32_t len;
|
||||
int32_t skipped;
|
||||
void *num = (void*) (args[0].ptrValue);
|
||||
|
|
@ -1131,6 +1170,9 @@ u_scanf_pointer_handler(UFILE *input,
|
|||
int32_t *fmtConsumed,
|
||||
int32_t *argConverted)
|
||||
{
|
||||
(void)fmt;
|
||||
(void)fmtConsumed;
|
||||
|
||||
int32_t len;
|
||||
int32_t skipped;
|
||||
void *result;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
******************************************************************************
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
**********************************************************************
|
||||
|
|
@ -29,8 +29,6 @@
|
|||
|
||||
// console IO
|
||||
|
||||
#if U_IOSTREAM_SOURCE >= 199711
|
||||
|
||||
#define STD_NAMESPACE std::
|
||||
|
||||
#define STD_OSTREAM STD_NAMESPACE ostream
|
||||
|
|
@ -125,7 +123,7 @@ operator>>(STD_ISTREAM& stream, UnicodeString& str)
|
|||
/* Was the character consumed? */
|
||||
if (us != uBuffer) {
|
||||
/* Reminder: ibm-1390 & JISX0213 can output 2 Unicode code points */
|
||||
int32_t uBuffSize = us-uBuffer;
|
||||
int32_t uBuffSize = static_cast<int32_t>(us-uBuffer);
|
||||
int32_t uBuffIdx = 0;
|
||||
while (uBuffIdx < uBuffSize) {
|
||||
U16_NEXT(uBuffer, uBuffIdx, uBuffSize, ch32);
|
||||
|
|
@ -170,4 +168,3 @@ STOP_READING:
|
|||
U_NAMESPACE_END
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue