diff options
author | Karl Berry <karl@freefriends.org> | 2019-12-12 18:25:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-12-12 18:25:29 +0000 |
commit | 826971da3ef29f6034fc6a4786f88878a56c58e3 (patch) | |
tree | 023539b0120ff775316abf6a86f03c6f1f54b973 /Build/source/libs/icu/icu-src/source/io | |
parent | 15a740f0c75d97855e67ba5bf83612e7b29a1319 (diff) |
icu-65.1, including linking upmendex with -lpthread if available
git-svn-id: svn://tug.org/texlive/trunk@53103 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/io')
5 files changed, 48 insertions, 103 deletions
diff --git a/Build/source/libs/icu/icu-src/source/io/io.vcxproj b/Build/source/libs/icu/icu-src/source/io/io.vcxproj index 7e7b5cd9b8a..3fca55fb0fd 100644 --- a/Build/source/libs/icu/icu-src/source/io/io.vcxproj +++ b/Build/source/libs/icu/icu-src/source/io/io.vcxproj @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <!-- 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 Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <!-- 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" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -35,126 +35,64 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\lib\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\x86\Release\</IntDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\lib\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\x86\Debug\</IntDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\Release\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\Release\</IntDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</IntDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> + <OutDir>.\$(Platform)\$(Configuration)\</OutDir> + <IntDir>.\$(Platform)\$(Configuration)\</IntDir> + <!-- The ICU projects use "Win32" to mean "x86", so we need to special case it. --> + <OutDir Condition="'$(Platform)'=='Win32'">.\x86\$(Configuration)\</OutDir> + <IntDir Condition="'$(Platform)'=='Win32'">.\x86\$(Configuration)\</IntDir> + <!-- Disable Incremental Linking for Release builds as it prevents Link-time Code Generation --> + <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental> </PropertyGroup> <!-- Options that are common to *all* project configurations --> <ItemDefinitionGroup> + <Midl> + <TypeLibraryName>$(OutDir)\icuio.tlb</TypeLibraryName> + </Midl> <ClCompile> <AdditionalIncludeDirectories>..\..\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>U_IO_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DisableLanguageExtensions>false</DisableLanguageExtensions> <WarningLevel>Level3</WarningLevel> + <CompileAs>Default</CompileAs> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderOutputFile>$(OutDir)/icuio.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>$(OutDir)/</AssemblerListingLocation> + <ObjectFileName>$(OutDir)/</ObjectFileName> + <ProgramDataBaseFileName>$(OutDir)/icuio.pdb</ProgramDataBaseFileName> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <BaseAddress>0x4ab00000</BaseAddress> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Midl> - <TypeLibraryName>.\..\..\lib\icuio.tlb</TypeLibraryName> - </Midl> - <ClCompile> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>.\x86\Release/icuio.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>.\x86\Release/</AssemblerListingLocation> - <ObjectFileName>.\x86\Release/</ObjectFileName> - <ProgramDataBaseFileName>.\x86\Release/</ProgramDataBaseFileName> - <CompileAs>Default</CompileAs> - </ClCompile> - <Link> - <OutputFile>..\..\bin\icuio63.dll</OutputFile> - <AdditionalDependencies>icuuc.lib;icuin.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ProgramDatabaseFile>.\..\..\lib\icuio.pdb</ProgramDatabaseFile> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <ImportLibrary>..\..\lib\icuio.lib</ImportLibrary> + <AdditionalLibraryDirectories>..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Midl> - <TypeLibraryName>.\..\..\lib\icuio.tlb</TypeLibraryName> - </Midl> + <!-- Options that are common to all 'Debug' project configurations --> + <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'"> <ClCompile> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeaderOutputFile>.\x86\Debug/icuio.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>.\x86\Debug/</AssemblerListingLocation> - <ObjectFileName>.\x86\Debug/</ObjectFileName> - <ProgramDataBaseFileName>.\x86\Debug/</ProgramDataBaseFileName> <BrowseInformation>true</BrowseInformation> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <CompileAs>Default</CompileAs> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> <Link> - <OutputFile>..\..\bin\icuio63d.dll</OutputFile> - <AdditionalDependencies>icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>.\..\..\lib\icuiod.pdb</ProgramDatabaseFile> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <ImportLibrary>..\..\lib\icuiod.lib</ImportLibrary> + <OutputFile>..\..\$(IcuBinOutputDir)\icuio65d.dll</OutputFile> + <ProgramDatabaseFile>..\..\$(IcuLibOutputDir)\icuiod.pdb</ProgramDatabaseFile> + <ImportLibrary>..\..\$(IcuLibOutputDir)\icuiod.lib</ImportLibrary> + <AdditionalDependencies>icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Midl> - <TypeLibraryName>.\..\..\lib64\icuio.tlb</TypeLibraryName> - </Midl> + <!-- Options that are common to all 'Release' project configurations --> + <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'"> <ClCompile> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>.\x64\Release/icuio.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>.\x64\Release/</AssemblerListingLocation> - <ObjectFileName>.\x64\Release/</ObjectFileName> - <ProgramDataBaseFileName>.\x64\Release/</ProgramDataBaseFileName> - <CompileAs>Default</CompileAs> </ClCompile> <Link> - <OutputFile>..\..\bin64\icuio63.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icuio65.dll</OutputFile> + <ProgramDatabaseFile>..\..\$(IcuLibOutputDir)\icuio.pdb</ProgramDatabaseFile> + <ImportLibrary>..\..\$(IcuLibOutputDir)\icuio.lib</ImportLibrary> <AdditionalDependencies>icuuc.lib;icuin.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ProgramDatabaseFile>.\..\..\lib64\icuio.pdb</ProgramDatabaseFile> - <ImportLibrary>..\..\lib64\icuio.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Midl> - <TypeLibraryName>.\..\..\lib64\icuio.tlb</TypeLibraryName> - </Midl> - <ClCompile> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeaderOutputFile>.\x64\Debug/icuio.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>.\x64\Debug/</AssemblerListingLocation> - <ObjectFileName>.\x64\Debug/</ObjectFileName> - <ProgramDataBaseFileName>.\x64\Debug/</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>Default</CompileAs> - </ClCompile> - <Link> - <OutputFile>..\..\bin64\icuio63d.dll</OutputFile> - <AdditionalDependencies>icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>.\..\..\lib64\icuiod.pdb</ProgramDatabaseFile> - <ImportLibrary>..\..\lib64\icuiod.lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/Build/source/libs/icu/icu-src/source/io/locbund.cpp b/Build/source/libs/icu/icu-src/source/io/locbund.cpp index 8e880b17cf2..46c97bc043e 100644 --- a/Build/source/libs/icu/icu-src/source/io/locbund.cpp +++ b/Build/source/libs/icu/icu-src/source/io/locbund.cpp @@ -45,9 +45,9 @@ static UBool U_CALLCONV locbund_cleanup(void) { } U_CDECL_END -static UMutex gLock = U_MUTEX_INITIALIZER; static inline UNumberFormat * copyInvariantFormatter(ULocaleBundle *result, UNumberFormatStyle style) { U_NAMESPACE_USE + static UMutex gLock; Mutex lock(&gLock); if (result->fNumberFormat[style-1] == NULL) { if (gPosixNumberFormat[style-1] == NULL) { diff --git a/Build/source/libs/icu/icu-src/source/io/ucln_io.cpp b/Build/source/libs/icu/icu-src/source/io/ucln_io.cpp index 7a7216b7543..5cd367cfadb 100644 --- a/Build/source/libs/icu/icu-src/source/io/ucln_io.cpp +++ b/Build/source/libs/icu/icu-src/source/io/ucln_io.cpp @@ -16,6 +16,7 @@ * created by: George Rhoten */ +#include "unicode/utypes.h" #include "mutex.h" #include "ucln.h" #include "ucln_io.h" diff --git a/Build/source/libs/icu/icu-src/source/io/unicode/ustream.h b/Build/source/libs/icu/icu-src/source/io/unicode/ustream.h index c10ce6a2de5..927342cb031 100644 --- a/Build/source/libs/icu/icu-src/source/io/unicode/ustream.h +++ b/Build/source/libs/icu/icu-src/source/io/unicode/ustream.h @@ -17,6 +17,10 @@ #ifndef USTREAM_H #define USTREAM_H +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/unistr.h" #if !UCONFIG_NO_CONVERSION // not available without conversion @@ -60,4 +64,6 @@ U_NAMESPACE_END /* No operator for UChar because it can conflict with wchar_t */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/Build/source/libs/icu/icu-src/source/io/uscanf_p.cpp b/Build/source/libs/icu/icu-src/source/io/uscanf_p.cpp index 4deac3544ec..6dc1c09dee7 100644 --- a/Build/source/libs/icu/icu-src/source/io/uscanf_p.cpp +++ b/Build/source/libs/icu/icu-src/source/io/uscanf_p.cpp @@ -323,7 +323,7 @@ u_scanf_skip_leading_ws(UFILE *input, UBool isNotEOF; /* skip all leading ws in the input */ - while( (isNotEOF = ufile_getch(input, &c)) && (c == pad || u_isWhitespace(c)) ) + while( ((isNotEOF = ufile_getch(input, &c)) == TRUE) && (c == pad || u_isWhitespace(c)) ) { count++; } @@ -357,7 +357,7 @@ u_scanf_skip_leading_positive_sign(UFILE *input, if (U_SUCCESS(localStatus)) { /* skip all leading ws in the input */ - while( (isNotEOF = ufile_getch(input, &c)) && (count < symbolLen && c == plusSymbol[count]) ) + while( ((isNotEOF = ufile_getch(input, &c)) == TRUE) && (count < symbolLen && c == plusSymbol[count]) ) { count++; } @@ -855,7 +855,7 @@ u_scanf_string_handler(UFILE *input, return -1; while( (info->fWidth == -1 || count < info->fWidth) - && (isNotEOF = ufile_getch(input, &c)) + && ((isNotEOF = ufile_getch(input, &c)) == TRUE) && (!info->fIsString || (c != info->fPadChar && !u_isWhitespace(c)))) { @@ -946,7 +946,7 @@ u_scanf_ustring_handler(UFILE *input, count = 0; while( (info->fWidth == -1 || count < info->fWidth) - && (isNotEOF = ufile_getch(input, &c)) + && ((isNotEOF = ufile_getch(input, &c)) == TRUE) && (!info->fIsString || (c != info->fPadChar && !u_isWhitespace(c)))) { @@ -1249,7 +1249,7 @@ u_scanf_scanset_handler(UFILE *input, /* grab characters one at a time and make sure they are in the scanset */ while(chLeft > 0) { - if ((isNotEOF = ufile_getch32(input, &c)) && uset_contains(scanset, c)) { + if ( ((isNotEOF = ufile_getch32(input, &c)) == TRUE) && uset_contains(scanset, c) ) { readCharacter = TRUE; if (!info->fSkipArg) { int32_t idx = 0; |