organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 15:05:53 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-5117 Fixes for Windows

Browse source 
X-SVN-Rev: 19409
This commit is contained in:
George Rhoten 2006-03-23 01:35:21 +00:00
parent 490cb834fa
commit 92a50f8a73
4 changed files with 195 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
icu4c/source/allinone/allinone.sln
View file

@ -144,6 +144,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedata", "..\data\makedat
{86829694-A375-4C58-B4EA-96EF514E3225} = {86829694-A375-4C58-B4EA-96EF514E3225}
{631C23CE-6C1D-4875-88F0-85E0A42B36EA} = {631C23CE-6C1D-4875-88F0-85E0A42B36EA}
{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547} = {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}
{9D4211F7-2C77-439C-82F0-30A4E43BA569} = {9D4211F7-2C77-439C-82F0-30A4E43BA569}
{4C8454FE-81D3-4CA3-9927-29BA96F03DAC} = {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}
EndProjectSection
EndProject
@ -211,6 +212,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icupkg", "..\tools\icupkg\i
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} = {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genctd", "..\tools\genctd\genctd.vcproj", "{9D4211F7-2C77-439C-82F0-30A4E43BA569}"
ProjectSection(ProjectDependencies) = postProject
{6B231032-3CB5-4EED-9210-810D666A23A0} = {6B231032-3CB5-4EED-9210-810D666A23A0}
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} = {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@ -341,6 +348,10 @@ Global
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug.Build.0 = Debug|Win32
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release.ActiveCfg = Release|Win32
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release.Build.0 = Release|Win32
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug.ActiveCfg = Debug|Win32
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug.Build.0 = Debug|Win32
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release.ActiveCfg = Release|Win32
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection

22
icu4c/source/common/common.vcproj
View file

@ -215,6 +215,12 @@
<File
RelativePath=".\brkdict.h">
</File>
<File
RelativePath=".\brkeng.cpp">
</File>
<File
RelativePath=".\brkeng.h">
</File>
<File
RelativePath=".\brkiter.cpp">
</File>
@ -237,9 +243,6 @@
Outputs="..\..\include\unicode\$(InputFileName)"/>
</FileConfiguration>
</File>
<File
RelativePath=".\dbbi.cpp">
</File>
<File
RelativePath=".\unicode\dbbi.h">
<FileConfiguration
@ -260,10 +263,10 @@
</FileConfiguration>
</File>
<File
RelativePath=".\dbbi_tbl.cpp">
RelativePath=".\dictbe.cpp">
</File>
<File
RelativePath=".\dbbi_tbl.h">
RelativePath=".\dictbe.h">
</File>
<File
RelativePath=".\rbbi.cpp">
@ -329,6 +332,12 @@
<File
RelativePath=".\rbbitblb.h">
</File>
<File
RelativePath=".\triedict.cpp">
</File>
<File
RelativePath=".\triedict.h">
</File>
<File
RelativePath=".\ubrk.cpp">
</File>
@ -351,6 +360,9 @@
Outputs="..\..\include\unicode\$(InputFileName)"/>
</FileConfiguration>
</File>
<File
RelativePath=".\ubrkimpl.h">
</File>
</Filter>
<Filter
Name="collation"

10
icu4c/source/common/triedict.cpp
View file

@ -356,7 +356,7 @@ struct CompactTrieHeader {
uint32_t magic; // Magic number (including version)
uint16_t nodeCount; // Number of entries in offsets[]
uint16_t root; // Node number of the root node
uint32_t offsets[]; // Offsets to nodes from start of data
uint32_t offsets[1]; // Offsets to nodes from start of data
};
// Note that to avoid platform-specific alignment issues, all members of the node
@ -390,13 +390,13 @@ struct CompactTrieHorizontalEntry {
struct CompactTrieHorizontalNode {
uint16_t flagscount; // Count of sub-entries, plus flags
CompactTrieHorizontalEntry entries[];
CompactTrieHorizontalEntry entries[1];
};
struct CompactTrieVerticalNode {
uint16_t flagscount; // Count of sub-entries, plus flags
uint16_t equal; // Equal link node index
uint16_t chars[]; // Code units
uint16_t chars[1]; // Code units
};
// {'Dic', 1}, version 1
@ -576,7 +576,7 @@ public:
const CompactTrieVerticalNode *vnode = (const CompactTrieVerticalNode *)node;
if (where == 0) {
// Going down
unistr.append(vnode->chars, (int32_t) nodeCount);
unistr.append((const UChar *)vnode->chars, (int32_t) nodeCount);
fIndexStack.setElementAt(1, fIndexStack.size()-1);
node = getCompactNode(fHeader, fNodeStack.push(vnode->equal, status));
where = fIndexStack.push(0, status);
@ -748,7 +748,7 @@ class BuildCompactTrieVerticalNode: public BuildCompactTrieNode {
fEqual->fNodeID);
}
#endif
fChars.extract(0, fChars.length(), &node->chars[0]);
fChars.extract(0, fChars.length(), (UChar *)node->chars);
offset += sizeof(uint16_t)*fChars.length();
}

162
icu4c/source/tools/genctd/genctd.vcproj Normal file
View file

@ -0,0 +1,162 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="genctd"
ProjectGUID="{9D4211F7-2C77-439C-82F0-30A4E43BA569}"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories="..\..\common;..\toolutil"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
DisableLanguageExtensions="TRUE"
TreatWChar_tAsBuiltInType="TRUE"
PrecompiledHeaderFile=".\Release/genctd.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
"
Outputs="..\..\..\bin\$(TargetFileName)"/>
<Tool
Name="VCLinkerTool"
OutputFile=".\Release/genctd.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\Release/genctd.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/genctd.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories="..\..\common;..\toolutil"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE"
TreatWChar_tAsBuiltInType="TRUE"
PrecompiledHeaderFile=".\Debug/genctd.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
"
Outputs="..\..\..\bin\$(TargetFileName)"/>
<Tool
Name="VCLinkerTool"
OutputFile=".\Debug/genctd.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/genctd.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug/genctd.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath=".\genctd.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>