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

ICU-13052 Update ICU4C branch to current trunk, again

Browse Source 
X-SVN-Rev: 39900
This commit is contained in:
Peter Edberg 2017-03-22 20:10:43 +00:00
commit 1106009706
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/readme.html
View File

@ -943,9 +943,11 @@
"HowToBuildWindowsCommandLine"><strong>Using MSDEV At The Command Line "HowToBuildWindowsCommandLine"><strong>Using MSDEV At The Command Line
Note:</strong></a> You can build ICU from the command line. Assuming that you Note:</strong></a> You can build ICU from the command line. Assuming that you
have properly installed Microsoft Visual C++ to support command line have properly installed Microsoft Visual C++ to support command line
execution, you can run the following command, 'devenv.com execution, you can run the following command to build the 32-bit Release version:
<i>&lt;ICU&gt;</i>\source\allinone\allinone.sln /build "Win32|Release"'. You can also <code>'devenv.com <i>&lt;ICU&gt;</i>\source\allinone\allinone.sln /build "Release|Win32"'</code>.
use Cygwin with this compiler to build ICU, and you can refer to the <a href= Or to build the 64-bit Release version from the command line:
<code>'devenv.com <i>&lt;ICU&gt;</i>\source\allinone\allinone.sln /build "Release|x64"'</code>.
<br />You can also use Cygwin with this compiler to build ICU, and you can refer to the <a href=
"#HowToBuildCygwin">How To Build And Install On Windows with Cygwin</a> "#HowToBuildCygwin">How To Build And Install On Windows with Cygwin</a>
section for more details.</p> section for more details.</p>

8
icu4c/source/common/unicode/uloc.h
View File

@ -61,7 +61,7 @@
* http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</a> * http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</a>
* *
* <P> * <P>
* The second option includes an additonal <STRONG>ISO Country * The second option includes an additional <STRONG>ISO Country
* Code.</STRONG> These codes are the upper-case two-letter codes * Code.</STRONG> These codes are the upper-case two-letter codes
* as defined by ISO-3166. * as defined by ISO-3166.
* You can find a full list of these codes at a number of sites, such as: * You can find a full list of these codes at a number of sites, such as:
@ -69,7 +69,7 @@
* http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</a> * http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</a>
* *
* <P> * <P>
* The third option requires another additonal information--the * The third option requires another additional information--the
* <STRONG>Variant.</STRONG> * <STRONG>Variant.</STRONG>
* The Variant codes are vendor and browser-specific. * The Variant codes are vendor and browser-specific.
* For example, use WIN for Windows, MAC for Macintosh, and POSIX for POSIX. * For example, use WIN for Windows, MAC for Macintosh, and POSIX for POSIX.
@ -157,7 +157,7 @@
* <STRONG>just</STRONG> a mechanism for identifying these services. * <STRONG>just</STRONG> a mechanism for identifying these services.
* *
* <P> * <P>
* Each international serivce that performs locale-sensitive operations * Each international service that performs locale-sensitive operations
* allows you * allows you
* to get all the available objects of that type. You can sift * to get all the available objects of that type. You can sift
* through these objects by language, country, or variant, * through these objects by language, country, or variant,
@ -580,7 +580,7 @@ uloc_getDisplayLanguage(const char* locale,
* if the locale's language code is "en", passing Locale::getFrench() for * if the locale's language code is "en", passing Locale::getFrench() for
* inLocale would result in "", while passing Locale::getGerman() * inLocale would result in "", while passing Locale::getGerman()
* for inLocale would result in "". NULL may be used to specify the default. * for inLocale would result in "". NULL may be used to specify the default.
* @param script the displayable country code for localeID * @param script the displayable script for the localeID
* @param scriptCapacity the size of the script buffer to store the * @param scriptCapacity the size of the script buffer to store the
* displayable script code with * displayable script code with
* @param status error information if retrieving the displayable script code failed * @param status error information if retrieving the displayable script code failed